@camera.ui/server 0.0.16 → 0.0.17
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.BjdVg-TE.0.0.16.js → @tanstack.Y8LHKTFF.0.0.17.js} +1 -1
- package/dist/interface/{@vee-validate.BY4_2lEs.0.0.16.js → @vee-validate.BcG8e5-Z.0.0.17.js} +1 -1
- package/dist/interface/{@vueform.DFvJBWIi.0.0.16.js → @vueform.Cnqje5-g.0.0.17.js} +1 -1
- package/dist/interface/{@vueuse.CGN12qog.0.0.16.js → @vueuse.CxdA24o0.0.0.17.js} +1 -1
- package/dist/interface/Account.K0D29-KE.0.0.17.js +1 -0
- package/dist/interface/{Adminpanel.FTycvGGP.0.0.16.js → Adminpanel.CaLBYPHc.0.0.17.js} +2 -2
- package/dist/interface/{Appearance.DZdFEn29.0.0.16.js → Appearance.-L_mn_-o.0.0.17.js} +1 -1
- package/dist/interface/{Backup.C63DnD6l.0.0.16.js → Backup.DjU1SUNp.0.0.17.js} +1 -1
- package/dist/interface/{Camera.ClZr_XH5.0.0.16.js → Camera.BgoyeEmQ.0.0.17.js} +1 -1
- package/dist/interface/Cameras.CTzvFhZB.0.0.17.js +1 -0
- package/dist/interface/{Camview.Bo4mLtoT.0.0.16.js → Camview.AIHZOcpe.0.0.17.js} +1 -1
- package/dist/interface/Config.Dwreik6Q.0.0.17.js +1 -0
- package/dist/interface/{Console.8oN5H7vV.0.0.16.js → Console.65ILbQYd.0.0.17.js} +1 -1
- package/dist/interface/FirstSteps.CLRJ9qAX.0.0.17.js +1 -0
- package/dist/interface/{NewCamera.0K90OojR.0.0.16.js → NewCamera.C3vbU4C7.0.0.17.js} +1 -1
- package/dist/interface/Plugin.B5hYYBYQ.0.0.17.js +1 -0
- package/dist/interface/{Plugins.49uEjmzr.0.0.16.js → Plugins.CfRQtEq_.0.0.17.js} +1 -1
- package/dist/interface/Recordings.BbFFnSvi.0.0.17.js +1 -0
- package/dist/interface/Recordings.BfuhtdIj.0.0.17.js +1 -0
- package/dist/interface/{Settings.LCEZwyhh.0.0.16.js → Settings.BdOXqaEX.0.0.17.js} +1 -1
- package/dist/interface/System.ysu799BZ.0.0.17.js +4 -0
- package/dist/interface/User.D7asFmwE.0.0.17.js +1 -0
- package/dist/interface/{VConfigEditor.vue_vue_type_script_setup_true_lang.J5gKGR9C.0.0.16.js → VConfigEditor.vue_vue_type_script_setup_true_lang.BAxsYS8n.0.0.17.js} +2 -2
- package/dist/interface/{VConsole.BStq4qh-.0.0.16.js → VConsole.C7xGb1ES.0.0.17.js} +1 -1
- package/dist/interface/VPlayer.Dhm7j4pg.0.0.17.js +1 -0
- package/dist/interface/{VPluginCard.DR63SC8V.0.0.16.js → VPluginCard.Drmi3fPn.0.0.17.js} +1 -1
- package/dist/interface/{ace-builds.BhnhUUTY.0.0.16.js → ace-builds.BwzeyovQ.0.0.17.js} +1 -1
- package/dist/interface/assets/{Account.0.0.16.2KfYXKTQ.css → Account.0.0.17.BCEftDNE.css} +1 -1
- package/dist/interface/assets/{Cameras.0.0.16.D7bnvH42.css → Cameras.0.0.17.Djx0F2MM.css} +1 -1
- package/dist/interface/assets/{Camview.0.0.16.cgjDTjXy.css → Camview.0.0.17.Ce_V-Nxj.css} +1 -1
- package/dist/interface/assets/{Config.0.0.16.BQJF6s_V.css → Config.0.0.17.k4QpWumg.css} +1 -1
- package/dist/interface/assets/FirstSteps.0.0.17.27JF_jaE.css +1 -0
- package/dist/interface/assets/{Plugin.0.0.16.BGZE7hpr.css → Plugin.0.0.17.CY2rlLw0.css} +1 -1
- package/dist/interface/assets/User.0.0.17.DAaNwzw2.css +1 -0
- package/dist/interface/assets/{VPlayer.0.0.16.CzZme_fu.css → VPlayer.0.0.17.CY8lPcC-.css} +1 -1
- package/dist/interface/assets/{main.0.0.16.DYbE3rQA.css → main.0.0.17.CkZIZCwa.css} +1 -1
- package/dist/interface/axios.CpM4fnec.0.0.17.js +6 -0
- package/dist/interface/{dnd-core.B69q2Tfk.0.0.16.js → dnd-core.BE3BG1Ef.0.0.17.js} +1 -1
- package/dist/interface/{draggabilly.DKBJ_DRn.0.0.16.js → draggabilly.lOopoogm.0.0.17.js} +1 -1
- package/dist/interface/{engine.io-client.D47Vn3PY.0.0.16.js → engine.io-client.D9WQML-S.0.0.17.js} +1 -1
- package/dist/interface/{ev-emitter.CO554XzW.0.0.16.js → ev-emitter.DS-zFO5E.0.0.17.js} +1 -1
- package/dist/interface/{fast-deep-equal.CjfEj15C.0.0.16.js → fast-deep-equal.BEv36PJS.0.0.17.js} +1 -1
- package/dist/interface/{highlight.js.CsG_3GKA.0.0.16.js → highlight.js.7wLgKNe8.0.0.17.js} +1 -1
- package/dist/interface/index.html +33 -33
- package/dist/interface/{linkify-it.D-Re04U7.0.0.16.js → linkify-it.D8o-3IGu.0.0.17.js} +1 -1
- package/dist/interface/main.tEGILaMo.0.0.17.js +9 -0
- package/dist/interface/manifest.webmanifest +1 -1
- package/dist/interface/{markdown-it.BSj0kuDJ.0.0.16.js → markdown-it.B4HcXc4c.0.0.17.js} +1 -1
- package/dist/interface/{nprogress.CN7SpneM.0.0.16.js → nprogress.YYjE43ko.0.0.17.js} +1 -1
- package/dist/interface/{pinia.DHXyXuKc.0.0.16.js → pinia.BN10dGtz.0.0.17.js} +1 -1
- package/dist/interface/{plugins.FSy44vXn.0.0.16.js → plugins.DGem6WnK.0.0.17.js} +1 -1
- package/dist/interface/{qrcode.DjqZuH8F.0.0.16.js → qrcode.D-tn4nkj.0.0.17.js} +1 -1
- package/dist/interface/{react-dnd-touch-backend.Cecw_0Kl.0.0.16.js → react-dnd-touch-backend.BYa4rNzf.0.0.17.js} +1 -1
- package/dist/interface/{rxjs.tqVqva9T.0.0.16.js → rxjs.DfibtzOq.0.0.17.js} +1 -1
- package/dist/interface/{socket.io-client.BFAMFJUC.0.0.16.js → socket.io-client.C_uPgwFs.0.0.17.js} +1 -1
- package/dist/interface/{socket.io-parser.B5BeMqb6.0.0.16.js → socket.io-parser.BCv62i4g.0.0.17.js} +1 -1
- package/dist/interface/sw.js +1 -1
- package/dist/interface/system.QcA_yDW7.0.0.17.js +1 -0
- package/dist/interface/{ui.CcXHo2vy.0.0.16.js → ui.CsoNsn0g.0.0.17.js} +1 -1
- package/dist/interface/{unidragger.B3Aj7lJB.0.0.16.js → unidragger.CE1ihPjj.0.0.17.js} +1 -1
- package/dist/interface/{v-calendar.y5PNpUm6.0.0.16.js → v-calendar.uhLzWnBK.0.0.17.js} +1 -1
- package/dist/interface/{vee-validate.VFk2ifr-.0.0.16.js → vee-validate.Dks-nw4k.0.0.17.js} +1 -1
- package/dist/interface/{vue-i18n.BRzZ63Xi.0.0.16.js → vue-i18n.C41_xexi.0.0.17.js} +1 -1
- package/dist/interface/{vue-inline-svg.De0HvU9m.0.0.16.js → vue-inline-svg.BKM1fqUr.0.0.17.js} +1 -1
- package/dist/interface/{vue-router.Cr6qPC8Y.0.0.16.js → vue-router.BPduPoYE.0.0.17.js} +1 -1
- package/dist/interface/{vue3-apexcharts.BMb8nnby.0.0.16.js → vue3-apexcharts.CUMFs3zS.0.0.17.js} +1 -1
- package/dist/interface/{vue3-dnd.SEoyozNj.0.0.16.js → vue3-dnd.BNLgSXFo.0.0.17.js} +1 -1
- package/dist/interface/{vue3-toastify.DUisHb3e.0.0.16.js → vue3-toastify.D4rGDrYT.0.0.17.js} +1 -1
- package/dist/interface/{vuetify.DByERR9S.0.0.16.js → vuetify.C_gaTn8T.0.0.17.js} +1 -1
- package/dist/server/bin/cameraui.d.ts +4 -0
- package/dist/server/bin/cameraui.js +47 -33
- package/dist/server/bin/cameraui.js.map +1 -1
- package/dist/server/bin/installer/darwin.d.ts +4 -0
- package/dist/server/bin/installer/darwin.js +37 -29
- package/dist/server/bin/installer/darwin.js.map +1 -1
- package/dist/server/bin/installer/freebsd.d.ts +4 -5
- package/dist/server/bin/installer/freebsd.js +23 -33
- package/dist/server/bin/installer/freebsd.js.map +1 -1
- package/dist/server/bin/installer/linux.d.ts +7 -0
- package/dist/server/bin/installer/linux.js +53 -27
- package/dist/server/bin/installer/linux.js.map +1 -1
- package/dist/server/bin/installer/win32.d.ts +4 -0
- package/dist/server/bin/installer/win32.js +21 -14
- package/dist/server/bin/installer/win32.js.map +1 -1
- package/dist/server/package.json +4 -4
- package/dist/server/src/api/controllers/backup.controller.js +2 -2
- package/dist/server/src/api/controllers/backup.controller.js.map +1 -1
- package/dist/server/src/api/controllers/plugins.controller.js +42 -40
- package/dist/server/src/api/controllers/plugins.controller.js.map +1 -1
- package/dist/server/src/api/controllers/system.controller.d.ts +3 -2
- package/dist/server/src/api/controllers/system.controller.js +19 -21
- package/dist/server/src/api/controllers/system.controller.js.map +1 -1
- package/dist/server/src/api/controllers/users.controller.js +12 -1
- package/dist/server/src/api/controllers/users.controller.js.map +1 -1
- package/dist/server/src/api/database/index.js +5 -4
- package/dist/server/src/api/database/index.js.map +1 -1
- package/dist/server/src/api/database/types.d.ts +7 -2
- package/dist/server/src/api/plugins/system.plugin.js +1 -4
- package/dist/server/src/api/plugins/system.plugin.js.map +1 -1
- package/dist/server/src/api/routes/system.routes.js +2 -2
- package/dist/server/src/api/routes/system.routes.js.map +1 -1
- package/dist/server/src/api/schemas/cameras.schema.d.ts +15 -15
- 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/schemas/go2rtc.schema.d.ts +14 -14
- package/dist/server/src/api/schemas/users.schema.d.ts +2 -2
- package/dist/server/src/api/schemas/users.schema.js +4 -15
- package/dist/server/src/api/schemas/users.schema.js.map +1 -1
- package/dist/server/src/api/services/backup.service.js +16 -15
- package/dist/server/src/api/services/backup.service.js.map +1 -1
- package/dist/server/src/api/services/cameras.service.js +10 -2
- package/dist/server/src/api/services/cameras.service.js.map +1 -1
- package/dist/server/src/api/utils/cert.d.ts +1 -1
- package/dist/server/src/api/utils/cert.js +14 -14
- package/dist/server/src/api/utils/cert.js.map +1 -1
- package/dist/server/src/api/utils/moveFiles.js +6 -5
- package/dist/server/src/api/utils/moveFiles.js.map +1 -1
- package/dist/server/src/api/websocket/nsp/logs.js +5 -4
- package/dist/server/src/api/websocket/nsp/logs.js.map +1 -1
- package/dist/server/src/api/websocket/nsp/server.js +3 -2
- package/dist/server/src/api/websocket/nsp/server.js.map +1 -1
- package/dist/server/src/camera/index.js +2 -0
- package/dist/server/src/camera/index.js.map +1 -1
- package/dist/server/src/camera/iou.d.ts +2 -0
- package/dist/server/src/camera/iou.js +53 -0
- package/dist/server/src/camera/iou.js.map +1 -0
- package/dist/server/src/camera/streaming/peer-connection.d.ts +3 -1
- package/dist/server/src/camera/streaming/peer-connection.js +12 -7
- package/dist/server/src/camera/streaming/peer-connection.js.map +1 -1
- package/dist/server/src/camera/streaming/webrtc-connection.d.ts +2 -0
- package/dist/server/src/camera/streaming/webrtc-connection.js +28 -10
- package/dist/server/src/camera/streaming/webrtc-connection.js.map +1 -1
- package/dist/server/src/camera/types.d.ts +2 -1
- package/dist/server/src/camera/types.js.map +1 -1
- package/dist/server/src/main.js +8 -4
- package/dist/server/src/main.js.map +1 -1
- package/dist/server/src/nats/server.js +4 -3
- package/dist/server/src/nats/server.js.map +1 -1
- package/dist/server/src/plugins/index.js +12 -9
- package/dist/server/src/plugins/index.js.map +1 -1
- package/dist/server/src/plugins/plugin.js +6 -4
- package/dist/server/src/plugins/plugin.js.map +1 -1
- package/dist/server/src/plugins/worker.d.ts +1 -0
- package/dist/server/src/plugins/worker.js +24 -16
- package/dist/server/src/plugins/worker.js.map +1 -1
- package/dist/server/src/polyglot/node/decoder/child.js +16 -10
- package/dist/server/src/polyglot/node/decoder/child.js.map +1 -1
- package/dist/server/src/polyglot/node/decoder/imageUtils.js +2 -2
- package/dist/server/src/polyglot/node/decoder/imageUtils.js.map +1 -1
- package/dist/server/src/polyglot/node/plugins/cameraStorage.d.ts +0 -1
- package/dist/server/src/polyglot/node/plugins/cameraStorage.js +1 -11
- package/dist/server/src/polyglot/node/plugins/cameraStorage.js.map +1 -1
- package/dist/server/src/polyglot/node/plugins/child.js +3 -3
- package/dist/server/src/polyglot/node/plugins/child.js.map +1 -1
- package/dist/server/src/polyglot/node/plugins/configService.d.ts +1 -1
- package/dist/server/src/polyglot/node/plugins/configService.js +5 -5
- package/dist/server/src/polyglot/node/plugins/configService.js.map +1 -1
- package/dist/server/src/polyglot/node/plugins/proxy/cameraDevice.d.ts +4 -4
- package/dist/server/src/polyglot/node/plugins/proxy/cameraDevice.js +55 -46
- package/dist/server/src/polyglot/node/plugins/proxy/cameraDevice.js.map +1 -1
- package/dist/server/src/polyglot/python/camera/iou.py +80 -0
- package/dist/server/src/polyglot/python/camera_ui_types/__init__.py +15 -9
- package/dist/server/src/polyglot/python/decoder/child.py +20 -12
- package/dist/server/src/polyglot/python/plugins/camera_storage.py +7 -27
- package/dist/server/src/polyglot/python/plugins/child.py +32 -20
- package/dist/server/src/polyglot/python/plugins/config_service.py +8 -1
- package/dist/server/src/polyglot/python/plugins/proxy/camera_device.py +88 -53
- package/dist/server/src/polyglot/python/plugins/typings.py +6 -0
- package/dist/server/src/polyglot/python/utilities/subscriptions.py +6 -4
- package/dist/server/src/polyglot/python/utilities/utils.py +49 -36
- package/dist/server/src/services/config/index.js +32 -21
- package/dist/server/src/services/config/index.js.map +1 -1
- package/dist/server/src/utils/npm.js +3 -3
- package/dist/server/src/utils/npm.js.map +1 -1
- package/dist/server/src/utils/pythonInstaller.js +16 -14
- package/dist/server/src/utils/pythonInstaller.js.map +1 -1
- package/package.json +4 -4
- package/dist/interface/Account.CfJ0_AE8.0.0.16.js +0 -1
- package/dist/interface/Cameras.Du8aeeME.0.0.16.js +0 -1
- package/dist/interface/Config.XeCgFEoY.0.0.16.js +0 -1
- package/dist/interface/FirstSteps.mXqKiWM8.0.0.16.js +0 -1
- package/dist/interface/Plugin.BR9zmMja.0.0.16.js +0 -1
- package/dist/interface/Recordings.Bi4EWX-j.0.0.16.js +0 -1
- package/dist/interface/Recordings.Ce60GFcU.0.0.16.js +0 -1
- package/dist/interface/System.BLePSJ80.0.0.16.js +0 -4
- package/dist/interface/User.C2qVrMxN.0.0.16.js +0 -1
- package/dist/interface/VPlayer.B3YorBp_.0.0.16.js +0 -1
- package/dist/interface/assets/FirstSteps.0.0.16.DFSydMqk.css +0 -1
- package/dist/interface/assets/User.0.0.16.CXUSYt8i.css +0 -1
- package/dist/interface/axios.BI2i94Vb.0.0.16.js +0 -6
- package/dist/interface/main.CySWzYoy.0.0.16.js +0 -9
- package/dist/interface/system.DlYVX2qG.0.0.16.js +0 -1
- /package/dist/interface/{@babel.l0sNRNKZ.0.0.16.js → @babel.l0sNRNKZ.0.0.17.js} +0 -0
- /package/dist/interface/{@intlify.YW_pt133.0.0.16.js → @intlify.YW_pt133.0.0.17.js} +0 -0
- /package/dist/interface/{@mdi.jq8isxax.0.0.16.js → @mdi.jq8isxax.0.0.17.js} +0 -0
- /package/dist/interface/{@popperjs.BQBsAJpH.0.0.16.js → @popperjs.BQBsAJpH.0.0.17.js} +0 -0
- /package/dist/interface/{@react-dnd.CcwRs9xb.0.0.16.js → @react-dnd.CcwRs9xb.0.0.17.js} +0 -0
- /package/dist/interface/{@socket.io.Dkula2eQ.0.0.16.js → @socket.io.Dkula2eQ.0.0.17.js} +0 -0
- /package/dist/interface/{@vue.CIFymae3.0.0.16.js → @vue.CIFymae3.0.0.17.js} +0 -0
- /package/dist/interface/{@xterm.UN9r0Y94.0.0.16.js → @xterm.Cq_3w6CG.0.0.17.js} +0 -0
- /package/dist/interface/assets/{@vueform.0.0.16.h7tNX9p6.css → @vueform.0.0.17.h7tNX9p6.css} +0 -0
- /package/dist/interface/assets/{@xterm.0.0.16.CGrrDQr5.css → @xterm.0.0.17.CGrrDQr5.css} +0 -0
- /package/dist/interface/assets/{Adminpanel.0.0.16.A2JXV1Ib.css → Adminpanel.0.0.17.A2JXV1Ib.css} +0 -0
- /package/dist/interface/assets/{Backup.0.0.16.BIwaSlv3.css → Backup.0.0.17.BIwaSlv3.css} +0 -0
- /package/dist/interface/assets/{Camera.0.0.16.BDtUJ-lA.css → Camera.0.0.17.BDtUJ-lA.css} +0 -0
- /package/dist/interface/assets/{Console.0.0.16.DWrfRWs9.css → Console.0.0.17.DWrfRWs9.css} +0 -0
- /package/dist/interface/assets/{NewCamera.0.0.16.CMzSwwHn.css → NewCamera.0.0.17.CMzSwwHn.css} +0 -0
- /package/dist/interface/assets/{Plugins.0.0.16.Cwu0aGUO.css → Plugins.0.0.17.Cwu0aGUO.css} +0 -0
- /package/dist/interface/assets/{Settings.0.0.16.DTxcLhIY.css → Settings.0.0.17.DTxcLhIY.css} +0 -0
- /package/dist/interface/assets/{VConsole.0.0.16.BZT1WyS-.css → VConsole.0.0.17.BZT1WyS-.css} +0 -0
- /package/dist/interface/assets/{VPluginCard.0.0.16.C2OqX7DJ.css → VPluginCard.0.0.17.C2OqX7DJ.css} +0 -0
- /package/dist/interface/assets/{highlight.0.0.16.DgoK_Xib.css → highlight.0.0.17.DgoK_Xib.css} +0 -0
- /package/dist/interface/assets/{logo-256.0.0.16.BCQk9H1-.png → logo-256.0.0.17.BCQk9H1-.png} +0 -0
- /package/dist/interface/assets/{logo-512.0.0.16.DLKVOU2S.png → logo-512.0.0.17.DLKVOU2S.png} +0 -0
- /package/dist/interface/assets/{logo.0.0.16.DmEiRk0z.png → logo.0.0.17.DmEiRk0z.png} +0 -0
- /package/dist/interface/assets/{mode-json.0.0.16.Br7xisR1.js → mode-json.0.0.17.Br7xisR1.js} +0 -0
- /package/dist/interface/assets/{mode-yaml.0.0.16.CIYL8U3d.js → mode-yaml.0.0.17.CIYL8U3d.js} +0 -0
- /package/dist/interface/assets/{v-calendar.0.0.16.CtSuDYZU.css → v-calendar.0.0.17.CtSuDYZU.css} +0 -0
- /package/dist/interface/assets/{vue3-toastify.0.0.16.DTY1DMRs.css → vue3-toastify.0.0.17.DTY1DMRs.css} +0 -0
- /package/dist/interface/assets/{vuetify.0.0.16.DPyVfAPv.css → vuetify.0.0.17.DPyVfAPv.css} +0 -0
- /package/dist/interface/{compare-versions.DqEOhma6.0.0.16.js → compare-versions.DqEOhma6.0.0.17.js} +0 -0
- /package/dist/interface/{dijkstrajs.D_NXgYpA.0.0.16.js → dijkstrajs.D_NXgYpA.0.0.17.js} +0 -0
- /package/dist/interface/{engine.io-parser.BiEtp6m2.0.0.16.js → engine.io-parser.BiEtp6m2.0.0.17.js} +0 -0
- /package/dist/interface/{entities.C20TfXL6.0.0.16.js → entities.C20TfXL6.0.0.17.js} +0 -0
- /package/dist/interface/{get-size.D1dS-IaP.0.0.16.js → get-size.D1dS-IaP.0.0.17.js} +0 -0
- /package/dist/interface/{mdurl.k9Sl0PQj.0.0.16.js → mdurl.k9Sl0PQj.0.0.17.js} +0 -0
- /package/dist/interface/{punycode.js.Dj65hjkv.0.0.16.js → punycode.js.Dj65hjkv.0.0.17.js} +0 -0
- /package/dist/interface/{react-dnd-html5-backend.1HQjlkwI.0.0.16.js → react-dnd-html5-backend.1HQjlkwI.0.0.17.js} +0 -0
- /package/dist/interface/{redux.CuxFRhX_.0.0.16.js → redux.CuxFRhX_.0.0.17.js} +0 -0
- /package/dist/interface/{tslib.9k7AwCpt.0.0.16.js → tslib.9k7AwCpt.0.0.17.js} +0 -0
- /package/dist/interface/{uc.micro.kMc2yuuw.0.0.16.js → uc.micro.kMc2yuuw.0.0.17.js} +0 -0
- /package/dist/interface/{utils.BvINh1mj.0.0.16.js → utils.BvINh1mj.0.0.17.js} +0 -0
- /package/dist/interface/{uuid.DvF23Exx.0.0.16.js → uuid.DvF23Exx.0.0.17.js} +0 -0
- /package/dist/interface/{vue.l0sNRNKZ.0.0.16.js → vue.l0sNRNKZ.0.0.17.js} +0 -0
- /package/dist/interface/{zod.BaF2dDCd.0.0.16.js → zod.BaF2dDCd.0.0.17.js} +0 -0
|
@@ -15,11 +15,6 @@ export class CameraStorage {
|
|
|
15
15
|
this.instance = instance;
|
|
16
16
|
this.cameraId = cameraId;
|
|
17
17
|
this.schema = schema;
|
|
18
|
-
this.api.deviceManager.once('cameraDeselected', (cameraId) => {
|
|
19
|
-
if (cameraId === this.cameraId) {
|
|
20
|
-
this.removeDb();
|
|
21
|
-
}
|
|
22
|
-
});
|
|
23
18
|
this.api.once(API_EVENT.SHUTDOWN, this.close.bind(this));
|
|
24
19
|
}
|
|
25
20
|
/**
|
|
@@ -236,7 +231,7 @@ export class CameraStorage {
|
|
|
236
231
|
if (!isEqual(oldValue, newValue, true)) {
|
|
237
232
|
const schemaPath = configPathToSchemaPath(newPath);
|
|
238
233
|
const schemaItem = getValueByPath(this.schema, schemaPath);
|
|
239
|
-
if (schemaItem && typeof schemaItem.onSet === 'function') {
|
|
234
|
+
if (schemaItem && schemaItem.type !== 'button' && typeof schemaItem.onSet === 'function') {
|
|
240
235
|
await schemaItem.onSet.call(this.instance, newValue, oldValue);
|
|
241
236
|
}
|
|
242
237
|
}
|
|
@@ -285,11 +280,6 @@ export class CameraStorage {
|
|
|
285
280
|
config[this.cameraId] = storableConfig;
|
|
286
281
|
this.pluginDb.putSync('config', config);
|
|
287
282
|
}
|
|
288
|
-
removeDb() {
|
|
289
|
-
const config = this.pluginDb.get('config') || {};
|
|
290
|
-
delete config[this.cameraId];
|
|
291
|
-
this.pluginDb.putSync('config', config);
|
|
292
|
-
}
|
|
293
283
|
async close() {
|
|
294
284
|
try {
|
|
295
285
|
this.saveDb();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cameraStorage.js","sourceRoot":"","sources":["../../../../../../src/polyglot/node/plugins/cameraStorage.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EACL,sBAAsB,EACtB,0BAA0B,EAC1B,cAAc,EACd,WAAW,EACX,YAAY,EACZ,eAAe,EACf,6BAA6B,EAC7B,sBAAsB,GACvB,MAAM,aAAa,CAAC;AAMrB,MAAM,OAAO,aAAa;IAChB,QAAQ,CAAS;IACjB,QAAQ,CAAM;IACd,GAAG,CAAM;IACT,QAAQ,CAA8C;IAEvD,MAAM,CAAiB;IACvB,MAAM,GAAM,EAAO,CAAC;IAE3B,YAAY,GAAQ,EAAE,QAAqD,EAAE,QAAa,EAAE,QAAgB,EAAE,SAAyB,EAAE;QACvI,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"cameraStorage.js","sourceRoot":"","sources":["../../../../../../src/polyglot/node/plugins/cameraStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,7 @@ export class PluginChild {
|
|
|
57
57
|
const pluginInfo = data.plugin;
|
|
58
58
|
const cameras = data.cameras;
|
|
59
59
|
this.pluginDb = open(`${storagePath}/volume`, {
|
|
60
|
-
name: Database.
|
|
60
|
+
name: Database.PLUGINS_ID,
|
|
61
61
|
});
|
|
62
62
|
const pluginConfig = this.pluginDb.get('config');
|
|
63
63
|
if (!pluginConfig) {
|
|
@@ -86,9 +86,9 @@ export class PluginChild {
|
|
|
86
86
|
return;
|
|
87
87
|
}
|
|
88
88
|
this.stopped = true;
|
|
89
|
+
this.api?.emit(API_EVENT.SHUTDOWN);
|
|
89
90
|
this.messageQueue?.abortQueue();
|
|
90
91
|
await this.publisher?.close();
|
|
91
|
-
this.api?.emit(API_EVENT.SHUTDOWN);
|
|
92
92
|
await sleep(500);
|
|
93
93
|
await this.pluginDb?.close();
|
|
94
94
|
}
|
|
@@ -195,7 +195,7 @@ export class PluginChild {
|
|
|
195
195
|
const shutdown = setTimeout(() => {
|
|
196
196
|
this.logger.warn('Failed to gracefully close before timeout, force quit!');
|
|
197
197
|
process.kill(process.pid, 'SIGKILL');
|
|
198
|
-
},
|
|
198
|
+
}, 2000);
|
|
199
199
|
closePromise = this.stop();
|
|
200
200
|
await closePromise;
|
|
201
201
|
clearTimeout(shutdown);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child.js","sourceRoot":"","sources":["../../../../../../src/polyglot/node/plugins/child.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"child.js","sourceRoot":"","sources":["../../../../../../src/polyglot/node/plugins/child.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
import objectPath
|
|
1
|
+
import { ensureFileSync, readJsonSync, writeJsonSync } from 'fs-extra/esm';
|
|
2
|
+
import objectPath from 'object-path';
|
|
3
3
|
import { structuredClone } from '../../../utils/utils.js';
|
|
4
4
|
export class PluginConfigService {
|
|
5
5
|
config = {};
|
|
@@ -199,15 +199,15 @@ export class PluginConfigService {
|
|
|
199
199
|
this.set(pathSegments[0], this.config[pathSegments[0]], write);
|
|
200
200
|
}
|
|
201
201
|
init() {
|
|
202
|
-
|
|
202
|
+
ensureFileSync(this.configFile);
|
|
203
203
|
this.read();
|
|
204
204
|
}
|
|
205
205
|
read() {
|
|
206
|
-
const config =
|
|
206
|
+
const config = readJsonSync(this.configFile, { throws: false }) || this.config || {};
|
|
207
207
|
this.config = config;
|
|
208
208
|
}
|
|
209
209
|
write() {
|
|
210
|
-
|
|
210
|
+
writeJsonSync(this.configFile, this.config, { spaces: 2 });
|
|
211
211
|
}
|
|
212
212
|
}
|
|
213
213
|
//# sourceMappingURL=configService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configService.js","sourceRoot":"","sources":["../../../../../../src/polyglot/node/plugins/configService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"configService.js","sourceRoot":"","sources":["../../../../../../src/polyglot/node/plugins/configService.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,8 +30,8 @@ export declare class CameraDeviceProxy extends CameraDevice {
|
|
|
30
30
|
private cameraSubscriber?;
|
|
31
31
|
private cameraPluginSubscriber?;
|
|
32
32
|
private signalingSubscriber?;
|
|
33
|
-
private
|
|
34
|
-
private
|
|
33
|
+
private frameSubscribers;
|
|
34
|
+
private motionFrameSubscribers;
|
|
35
35
|
private messageQueue?;
|
|
36
36
|
private activeRequests;
|
|
37
37
|
private activeMotionRequests;
|
|
@@ -59,8 +59,8 @@ export declare class CameraDeviceProxy extends CameraDevice {
|
|
|
59
59
|
private connectToDecoder;
|
|
60
60
|
private getMetadata;
|
|
61
61
|
private disconnectFromDecoder;
|
|
62
|
-
private
|
|
63
|
-
private
|
|
62
|
+
private closeFrameSubscribers;
|
|
63
|
+
private closeMotionFrameSubscibers;
|
|
64
64
|
private requestHandler;
|
|
65
65
|
private onProxyMessage;
|
|
66
66
|
private onSignalingMessage;
|
|
@@ -27,11 +27,11 @@ export class CameraDeviceProxy extends CameraDevice {
|
|
|
27
27
|
cameraSubscriber;
|
|
28
28
|
cameraPluginSubscriber;
|
|
29
29
|
signalingSubscriber;
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
frameSubscribers = [];
|
|
31
|
+
motionFrameSubscribers = [];
|
|
32
32
|
messageQueue;
|
|
33
33
|
activeRequests = new Set();
|
|
34
|
-
activeMotionRequests =
|
|
34
|
+
activeMotionRequests = new Set();
|
|
35
35
|
auth;
|
|
36
36
|
proxyEndpoints;
|
|
37
37
|
plugin;
|
|
@@ -130,13 +130,12 @@ export class CameraDeviceProxy extends CameraDevice {
|
|
|
130
130
|
const requestId = `${uuidv4()}-${requestType}`;
|
|
131
131
|
try {
|
|
132
132
|
const metadata = await this.connectToDecoder(requestId);
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
try {
|
|
133
|
+
const frameSubscriber = this.framePublisher.subscribe(this.frameSubject, true);
|
|
134
|
+
this.frameSubscribers.push({ requestId, subscriber: frameSubscriber });
|
|
135
|
+
try {
|
|
136
|
+
for await (const msg of frameSubscriber.subscriber) {
|
|
138
137
|
if (!this.initialized || this.activeRequests.size === 0 || !this.activeRequests.has(requestId)) {
|
|
139
|
-
|
|
138
|
+
return;
|
|
140
139
|
}
|
|
141
140
|
if (msg.data.length == 0) {
|
|
142
141
|
continue;
|
|
@@ -144,20 +143,21 @@ export class CameraDeviceProxy extends CameraDevice {
|
|
|
144
143
|
const frameData = unpack(msg.data);
|
|
145
144
|
yield new VideoFrame(this.id, this.framePublisher, frameData, metadata, prebufferDuration);
|
|
146
145
|
}
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
else {
|
|
152
|
-
break;
|
|
153
|
-
}
|
|
146
|
+
}
|
|
147
|
+
catch (error) {
|
|
148
|
+
if (error instanceof Error && error.name === 'AbortError') {
|
|
149
|
+
return;
|
|
154
150
|
}
|
|
151
|
+
throw error;
|
|
155
152
|
}
|
|
156
153
|
}
|
|
157
154
|
catch (error) {
|
|
158
155
|
if (this.initialized) {
|
|
159
156
|
this.logger.error('Error while generating frames:', error);
|
|
160
157
|
}
|
|
158
|
+
else {
|
|
159
|
+
throw error;
|
|
160
|
+
}
|
|
161
161
|
}
|
|
162
162
|
finally {
|
|
163
163
|
this.disconnectFromDecoder(requestId);
|
|
@@ -167,14 +167,13 @@ export class CameraDeviceProxy extends CameraDevice {
|
|
|
167
167
|
if (!this.motionFramePublisher) {
|
|
168
168
|
throw new Error('Motion Frame Publisher not initialized');
|
|
169
169
|
}
|
|
170
|
-
|
|
170
|
+
const requestId = `${uuidv4()}-motion`;
|
|
171
171
|
try {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
if (!this.initialized || this.activeMotionRequests <= 0) {
|
|
172
|
+
const motionFrameSubscriber = this.motionFramePublisher.subscribe(this.motionFrameSubject, true);
|
|
173
|
+
this.motionFrameSubscribers.push({ requestId, subscriber: motionFrameSubscriber });
|
|
174
|
+
try {
|
|
175
|
+
for await (const msg of motionFrameSubscriber.subscriber) {
|
|
176
|
+
if (!this.initialized || this.activeMotionRequests.size === 0 || !this.activeMotionRequests.has(requestId)) {
|
|
178
177
|
break;
|
|
179
178
|
}
|
|
180
179
|
if (msg.data.length == 0) {
|
|
@@ -184,25 +183,29 @@ export class CameraDeviceProxy extends CameraDevice {
|
|
|
184
183
|
const { frameData, metadata, ...motionState } = motionFrame;
|
|
185
184
|
yield new MotionFrame(this.id, this.motionFramePublisher, frameData, motionState, metadata);
|
|
186
185
|
}
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
else {
|
|
192
|
-
break;
|
|
193
|
-
}
|
|
186
|
+
}
|
|
187
|
+
catch (error) {
|
|
188
|
+
if (error instanceof Error && error.name === 'AbortError') {
|
|
189
|
+
return;
|
|
194
190
|
}
|
|
191
|
+
throw error;
|
|
195
192
|
}
|
|
196
193
|
}
|
|
197
194
|
catch (error) {
|
|
198
195
|
if (this.initialized) {
|
|
199
196
|
this.logger.error('Error while generating motion frames:', error);
|
|
200
197
|
}
|
|
198
|
+
else {
|
|
199
|
+
throw error;
|
|
200
|
+
}
|
|
201
201
|
}
|
|
202
202
|
finally {
|
|
203
|
-
this.activeMotionRequests
|
|
204
|
-
|
|
205
|
-
|
|
203
|
+
this.activeMotionRequests.delete(requestId);
|
|
204
|
+
const motionFrameSubscribtion = this.motionFrameSubscribers.find((sub) => sub.requestId === requestId);
|
|
205
|
+
motionFrameSubscribtion?.subscriber.close();
|
|
206
|
+
this.motionFrameSubscribers = this.motionFrameSubscribers.filter((sub) => sub.requestId !== requestId);
|
|
207
|
+
if (this.activeMotionRequests.size === 0) {
|
|
208
|
+
this.closeMotionFrameSubscibers();
|
|
206
209
|
}
|
|
207
210
|
}
|
|
208
211
|
}
|
|
@@ -284,25 +287,29 @@ export class CameraDeviceProxy extends CameraDevice {
|
|
|
284
287
|
const metadata = metadataResponse.metadata;
|
|
285
288
|
return metadata;
|
|
286
289
|
}
|
|
287
|
-
catch {
|
|
288
|
-
this.logger.error('Failed to get metadata! Frame Worker FFmpeg process might not be running');
|
|
290
|
+
catch (e) {
|
|
291
|
+
this.logger.error('Failed to get metadata! Frame Worker FFmpeg process might not be running', e);
|
|
289
292
|
}
|
|
290
293
|
}
|
|
291
294
|
async disconnectFromDecoder(requestId) {
|
|
292
295
|
this.activeRequests.delete(requestId);
|
|
293
|
-
|
|
294
|
-
|
|
296
|
+
const frameSubscription = this.frameSubscribers.find((sub) => sub.requestId === requestId);
|
|
297
|
+
frameSubscription?.subscriber.close();
|
|
298
|
+
this.frameSubscribers = this.frameSubscribers.filter((sub) => sub.requestId !== requestId);
|
|
299
|
+
if (this.signalingPublisher) {
|
|
300
|
+
const message = { type: 'disconnect', requestId, cameraId: this.id, pluginId: this.plugin.id };
|
|
301
|
+
this.signalingPublisher.publish(this.signalingTargetSubject, message);
|
|
295
302
|
}
|
|
296
|
-
const message = { type: 'disconnect', requestId, cameraId: this.id, pluginId: this.plugin.id };
|
|
297
|
-
this.signalingPublisher.publish(this.signalingTargetSubject, message);
|
|
298
303
|
}
|
|
299
|
-
|
|
300
|
-
this.
|
|
301
|
-
this.
|
|
304
|
+
closeFrameSubscribers() {
|
|
305
|
+
this.activeRequests.clear();
|
|
306
|
+
this.frameSubscribers.forEach((sub) => sub.subscriber.close());
|
|
307
|
+
this.frameSubscribers = [];
|
|
302
308
|
}
|
|
303
|
-
|
|
304
|
-
this.
|
|
305
|
-
this.
|
|
309
|
+
closeMotionFrameSubscibers() {
|
|
310
|
+
this.activeMotionRequests.clear();
|
|
311
|
+
this.motionFrameSubscribers.forEach((sub) => sub.subscriber.close());
|
|
312
|
+
this.motionFrameSubscribers = [];
|
|
306
313
|
}
|
|
307
314
|
async requestHandler(message) {
|
|
308
315
|
if (!this.messageQueue) {
|
|
@@ -391,8 +398,10 @@ export class CameraDeviceProxy extends CameraDevice {
|
|
|
391
398
|
break;
|
|
392
399
|
case 'disconnect':
|
|
393
400
|
this.activeRequests.delete(message.requestId);
|
|
401
|
+
const frameSubscription = this.frameSubscribers.find((sub) => sub.requestId === message.requestId);
|
|
402
|
+
frameSubscription?.subscriber.close();
|
|
394
403
|
if (this.activeRequests.size === 0) {
|
|
395
|
-
this.
|
|
404
|
+
this.closeFrameSubscribers();
|
|
396
405
|
}
|
|
397
406
|
break;
|
|
398
407
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cameraDevice.js","sourceRoot":"","sources":["../../../../../../../src/polyglot/node/plugins/proxy/cameraDevice.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cameraDevice.js","sourceRoot":"","sources":["../../../../../../../src/polyglot/node/plugins/proxy/cameraDevice.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
from typing import Any, cast
|
|
2
|
+
|
|
3
|
+
import numpy as np
|
|
4
|
+
from camera_ui_types import Detection
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
def calculate_iou(boxes1: np.ndarray[Any, Any], boxes2: np.ndarray[Any, Any]) -> np.ndarray[Any, Any]:
|
|
8
|
+
x11, y11, x12, y12 = np.split(boxes1, 4, axis=1)
|
|
9
|
+
x21, y21, x22, y22 = np.split(boxes2, 4, axis=1)
|
|
10
|
+
|
|
11
|
+
xA = np.maximum(x11, np.transpose(x21))
|
|
12
|
+
yA = np.maximum(y11, np.transpose(y21))
|
|
13
|
+
xB = np.minimum(x12, np.transpose(x22))
|
|
14
|
+
yB = np.minimum(y12, np.transpose(y22))
|
|
15
|
+
|
|
16
|
+
interArea = np.maximum((xB - xA), 0) * np.maximum((yB - yA), 0)
|
|
17
|
+
|
|
18
|
+
boxAArea = (x12 - x11) * (y12 - y11)
|
|
19
|
+
boxBArea = (x22 - x21) * (y22 - y21)
|
|
20
|
+
|
|
21
|
+
iou = interArea / (boxAArea + np.transpose(boxBArea) - interArea)
|
|
22
|
+
|
|
23
|
+
return iou
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
def merge_detections(detections: list[Detection], iou_threshold: float = 0.2) -> list[Detection]:
|
|
27
|
+
if not detections:
|
|
28
|
+
return []
|
|
29
|
+
|
|
30
|
+
boxes = np.array([d["boundingBox"] for d in detections])
|
|
31
|
+
confidences = np.array([d["confidence"] for d in detections])
|
|
32
|
+
|
|
33
|
+
areas = (boxes[:, 2] - boxes[:, 0]) * (boxes[:, 3] - boxes[:, 1])
|
|
34
|
+
order = areas.argsort()[::-1]
|
|
35
|
+
|
|
36
|
+
merged_detections: list[Detection] = []
|
|
37
|
+
|
|
38
|
+
while order.size > 0:
|
|
39
|
+
i = order[0]
|
|
40
|
+
current_detection = cast(Detection, detections[i].copy())
|
|
41
|
+
|
|
42
|
+
if order.size == 1:
|
|
43
|
+
merged_detections.append(current_detection)
|
|
44
|
+
break
|
|
45
|
+
|
|
46
|
+
ious = calculate_iou(boxes[i : i + 1], boxes[order[1:]])
|
|
47
|
+
overlaps = ious > iou_threshold
|
|
48
|
+
|
|
49
|
+
to_merge = np.where(overlaps)[0]
|
|
50
|
+
|
|
51
|
+
if to_merge.size > 0:
|
|
52
|
+
merge_indices = np.concatenate(([i], order[to_merge + 1]))
|
|
53
|
+
merged_box = np.array(
|
|
54
|
+
[
|
|
55
|
+
float(np.min(boxes[merge_indices, 0])),
|
|
56
|
+
float(np.min(boxes[merge_indices, 1])),
|
|
57
|
+
float(np.max(boxes[merge_indices, 2])),
|
|
58
|
+
float(np.max(boxes[merge_indices, 3])),
|
|
59
|
+
]
|
|
60
|
+
)
|
|
61
|
+
|
|
62
|
+
# Find detection with highest confidence
|
|
63
|
+
highest_conf_idx = merge_indices[np.argmax(confidences[merge_indices])]
|
|
64
|
+
highest_conf_detection = detections[highest_conf_idx]
|
|
65
|
+
|
|
66
|
+
current_detection.update(
|
|
67
|
+
{
|
|
68
|
+
"boundingBox": tuple(merged_box),
|
|
69
|
+
"confidence": float(np.max(confidences[merge_indices])),
|
|
70
|
+
"id": highest_conf_detection.get("id", current_detection.get("id")),
|
|
71
|
+
}
|
|
72
|
+
)
|
|
73
|
+
|
|
74
|
+
order = order[~np.isin(order, merge_indices)]
|
|
75
|
+
else:
|
|
76
|
+
order = order[1:]
|
|
77
|
+
|
|
78
|
+
merged_detections.append(current_detection)
|
|
79
|
+
|
|
80
|
+
return merged_detections
|