@camera.ui/server 2.1.5 → 2.1.6
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/assets/{404-C0XhilKM.js → 404-EUyzR8Cu.js} +1 -1
- package/dist/interface/assets/{About-DZsTev1Z.js → About-BmfMwt66.js} +1 -1
- package/dist/interface/assets/{Automation-DftZGCt6.js → Automation-DtTMxMlL.js} +3 -3
- package/dist/interface/assets/{AutomationImport-CWz3wK45.js → AutomationImport-Cxrhgzer.js} +2 -2
- package/dist/interface/assets/{AutomationStore-BDgJ0e1s.js → AutomationStore-aTGlzTcI.js} +2 -2
- package/dist/interface/assets/{AutomationStoreDetail-BxjQz384.js → AutomationStoreDetail-BtmSvtyE.js} +2 -2
- package/dist/interface/assets/{Automations-CYK5CbkM.js → Automations-CBeEWCad.js} +2 -2
- package/dist/interface/assets/Camera-9tFj730F.js +2 -0
- package/dist/interface/assets/{CameraConsole-CNULG_YE.js → CameraConsole-rCJr-qfx.js} +1 -1
- package/dist/interface/assets/Cameras-BZkbEN1q.css +1 -0
- package/dist/interface/assets/{Cameras-CXWCJWzR.js → Cameras-DFuh9jxK.js} +2 -2
- package/dist/interface/assets/{Camview-C09leXh7.js → Camview-C2byPDDS.js} +1 -1
- package/dist/interface/assets/{Camview-UCj_OW0s.css → Camview-DxxONfeK.css} +1 -1
- package/dist/interface/assets/{Config-DNOXV5ek.js → Config-C_IAFeWx.js} +1 -1
- package/dist/interface/assets/{ConfigActionCameraControl-BPfBxvxr.js → ConfigActionCameraControl-Caqlckcz.js} +1 -1
- package/dist/interface/assets/{ConfigActionHttp-ipkZdIWF.js → ConfigActionHttp-DcQCJ4zV.js} +1 -1
- package/dist/interface/assets/{ConfigActionImageInput-CvETCNjG.js → ConfigActionImageInput-DkgxdP2U.js} +1 -1
- package/dist/interface/assets/{ConfigActionMqtt-B8ZNU0UW.js → ConfigActionMqtt-Dp2-YpS9.js} +1 -1
- package/dist/interface/assets/{ConfigActionNotification-B-nC2J6v.js → ConfigActionNotification-DDbDqLLs.js} +1 -1
- package/dist/interface/assets/{ConfigActionNotificationControl-DjxS7_ID.js → ConfigActionNotificationControl-CX83znhY.js} +1 -1
- package/dist/interface/assets/{ConfigActionOutput-QG12dzwm.js → ConfigActionOutput-kMcDrgsm.js} +1 -1
- package/dist/interface/assets/{ConfigActionPlugin-Q2Tcpdgm.js → ConfigActionPlugin-Bv2Ke9_L.js} +1 -1
- package/dist/interface/assets/{ConfigActionSensor-BTFyt4ER.js → ConfigActionSensor-CogS-K7S.js} +1 -1
- package/dist/interface/assets/{ConfigActionSnapshot-DfnAex92.js → ConfigActionSnapshot-CdIciF5F.js} +1 -1
- package/dist/interface/assets/{ConfigActionVariable-COrJ-lFp.js → ConfigActionVariable-DS-nQLns.js} +1 -1
- package/dist/interface/assets/{ConfigConditionIfElse-Dpc6Cwpf.js → ConfigConditionIfElse-BWYzHNnH.js} +1 -1
- package/dist/interface/assets/{ConfigConditionSensorState-BQXY2c2t.js → ConfigConditionSensorState-CxiaJpOs.js} +1 -1
- package/dist/interface/assets/{ConfigConditionSwitch-BuI8_3Bp.js → ConfigConditionSwitch-l01kWXVF.js} +1 -1
- package/dist/interface/assets/{ConfigSensorValueInput-vY0DCyRn.js → ConfigSensorValueInput-Dm9r6m8t.js} +1 -1
- package/dist/interface/assets/{ConfigTriggerDetection-ChUtfRtm.js → ConfigTriggerDetection-CvK9Hvcd.js} +1 -1
- package/dist/interface/assets/{ConfigTriggerGeofence-fHTNHtGp.js → ConfigTriggerGeofence-DQcdG6av.js} +1 -1
- package/dist/interface/assets/{ConfigTriggerMqtt-ZeRfexN1.js → ConfigTriggerMqtt-16hSjN-I.js} +1 -1
- package/dist/interface/assets/{ConfigTriggerSensor-BJkKOmTg.js → ConfigTriggerSensor-DkVWre58.js} +1 -1
- package/dist/interface/assets/{ConfigTriggerSystem-DedCuH2F.js → ConfigTriggerSystem-BAd9IeRa.js} +1 -1
- package/dist/interface/assets/{ConfigTriggerWebhook-DPz9NPdp.js → ConfigTriggerWebhook-EmrFSoiV.js} +1 -1
- package/dist/interface/assets/{Console-D5hGnmUg.js → Console-C7lP5TMv.js} +1 -1
- package/dist/interface/assets/{CuiAutomationRunsDialog-BP-FYYXr.js → CuiAutomationRunsDialog-BoGUmS-Q.js} +1 -1
- package/dist/interface/assets/{CuiBottomSheet-B25DDhsj.js → CuiBottomSheet-DxrKqjWh.js} +1 -1
- package/dist/interface/assets/CuiBottomSheet-II-Ajj4k.js +1 -0
- package/dist/interface/assets/{CuiCameraPipCard-CeY7Gy9_.js → CuiCameraPipCard-C2nZsnPM.js} +1 -1
- package/dist/interface/assets/{CuiCameraRecordings-CqwUqjAU.js → CuiCameraRecordings-B4pJPGOQ.js} +1 -1
- package/dist/interface/assets/{CuiCameraShares-B5pdZrh3.js → CuiCameraShares-DBZ01JcG.js} +1 -1
- package/dist/interface/assets/{CuiCameraTable-BhUWRnwr.js → CuiCameraTable-BlJHb3gX.js} +2 -2
- package/dist/interface/assets/CuiCameraTable-WOrw4_LR.js +1 -0
- package/dist/interface/assets/{CuiConsole-CAHUWadU.js → CuiConsole-D56cxVKE.js} +1 -1
- package/dist/interface/assets/CuiDataTable-Ca51CpsO.js +1 -0
- package/dist/interface/assets/{CuiLightControl-8aZiuOCv.js → CuiLightControl-DP4pbkjr.js} +1 -1
- package/dist/interface/assets/CuiMarkdownContent-DIycyLeP.js +1 -0
- package/dist/interface/assets/{CuiMarkdownContent-BfJOBp3S.js → CuiMarkdownContent-PSq4kE1G.js} +1 -1
- package/dist/interface/assets/{CuiPluginCard-BZPiou4m.js → CuiPluginCard-DSQ7w6Nl.js} +2 -2
- package/dist/interface/assets/{CuiPluginCategoryChip-1h2moEVm.js → CuiPluginCategoryChip-DiUXddOe.js} +1 -1
- package/dist/interface/assets/{CuiPluginOAuthButton-CI5gdHHd.js → CuiPluginOAuthButton-ZRJJct-f.js} +2 -2
- package/dist/interface/assets/{CuiPluginTrustBadge-CqkEF6GV.js → CuiPluginTrustBadge-DNjUDEtv.js} +1 -1
- package/dist/interface/assets/{CuiQRCode-CQGx_k0S.js → CuiQRCode-wxEwM1Sh.js} +1 -1
- package/dist/interface/assets/{CuiRecordingsGrid-CLNQoUbw.js → CuiRecordingsGrid-DM5XDEMU.js} +1 -1
- package/dist/interface/assets/CuiSchema-BJE7vHFH.js +1 -0
- package/dist/interface/assets/{CuiTopNavbarItem-BekRyj7O.js → CuiTopNavbarItem-DdFdvKkq.js} +1 -1
- package/dist/interface/assets/{Faces-BEqO99qz.js → Faces-D4_QXhaT.js} +1 -1
- package/dist/interface/assets/{FirstSteps-BTDj1olc.js → FirstSteps-CfKHB_uc.js} +1 -1
- package/dist/interface/assets/{Instances-DTqwb5FF.js → Instances-DvAMsOPZ.js} +1 -1
- package/dist/interface/assets/{Logs-D8LlWlQ2.js → Logs-e3y9zMPD.js} +2 -2
- package/dist/interface/assets/{Menu-Cb5cBA-q.js → Menu-DMLqFO8c.js} +1 -1
- package/dist/interface/assets/Metrics-C3RI973t.js +1 -0
- package/dist/interface/assets/Metrics-DqBC-wEo.css +1 -0
- package/dist/interface/assets/{OAuthDeviceFlow-CExQxxt6.js → OAuthDeviceFlow-C51WkjaT.js} +1 -1
- package/dist/interface/assets/{Plugin-DtkmtFL6.js → Plugin-DcdVF_OG.js} +1 -1
- package/dist/interface/assets/{PluginConsole-CktnZFCJ.js → PluginConsole-D0n-Jf_E.js} +1 -1
- package/dist/interface/assets/{PluginDetail-t5V-ATem.js → PluginDetail-NOJPSqIS.js} +2 -2
- package/dist/interface/assets/{PluginSchema-DgXUaGQ2.js → PluginSchema-aG4DGAcH.js} +1 -1
- package/dist/interface/assets/PluginSearch-JGQTNibA.js +1 -0
- package/dist/interface/assets/{PluginSearch-D8qXgkEP.js → PluginSearch-w9vvKCTP.js} +2 -2
- package/dist/interface/assets/{PluginUpdateProgress-B9GSD9wl.js → PluginUpdateProgress-DkdoTjZY.js} +1 -1
- package/dist/interface/assets/{Plugins-CMjhJaUC.js → Plugins-BzQvLNj7.js} +1 -1
- package/dist/interface/assets/{Recordings-BP3-OD7P.js → Recordings-_2r3gD4E.js} +1 -1
- package/dist/interface/assets/{SensorEdit-B-64Y4xT.js → SensorEdit-qcv6KAap.js} +1 -1
- package/dist/interface/assets/{SensorHistory-D8xQKiuE.js → SensorHistory-C8vryAe_.js} +1 -1
- package/dist/interface/assets/{Sensors-D5VXCQ6N.js → Sensors-DnWG7VfR.js} +2 -2
- package/dist/interface/assets/{Settings-D8L1oiQx.css → Settings-B1MnGPuf.css} +1 -1
- package/dist/interface/assets/{Settings-B3INZjRu.js → Settings-BqcsLKll.js} +1 -1
- package/dist/interface/assets/SettingsAccount-BrYKAfPE.js +1 -0
- package/dist/interface/assets/SettingsAccount-CNfGFQuq.js +1 -0
- package/dist/interface/assets/{SettingsAppearance-CCf7QwkP.js → SettingsAppearance-B-smgzKL.js} +1 -1
- package/dist/interface/assets/SettingsAppearance-eeRSh42a.js +1 -0
- package/dist/interface/assets/{SettingsBackup-DSARU1qG.js → SettingsBackup-C0ekmlJy.js} +1 -1
- package/dist/interface/assets/{SettingsList-imzWFgaD.js → SettingsList-DeP1LOjz.js} +1 -1
- package/dist/interface/assets/{SettingsMqtt-DkEqSLI4.js → SettingsMqtt-Bo4jZHMl.js} +1 -1
- package/dist/interface/assets/{SettingsNotifications-CE5byZci.js → SettingsNotifications-Dx3me91s.js} +1 -1
- package/dist/interface/assets/SettingsRecordings-Dh-BqEba.js +1 -0
- package/dist/interface/assets/{SettingsRemote-DXw6kYER.js → SettingsRemote-W3skn8qk.js} +1 -1
- package/dist/interface/assets/{SettingsSystem-BctqXTc5.js → SettingsSystem-DnQSlgu0.js} +2 -2
- package/dist/interface/assets/SettingsUsers-CFBTzA0j.js +1 -0
- package/dist/interface/assets/{Terminal-CPOkeiZ5.js → Terminal-C7lDL745.js} +1 -1
- package/dist/interface/assets/{VariableInput-DfDRe6bt.js → VariableInput-DKmWb9RP.js} +1 -1
- package/dist/interface/assets/{VersionsHandler-BEWveXqP.js → VersionsHandler-CrHCAiKn.js} +1 -1
- package/dist/interface/assets/{VirtualSensorCreate-CUTyLWv-.js → VirtualSensorCreate-DHhbE5iD.js} +1 -1
- package/dist/interface/assets/{Workers-B_G_FZls.js → Workers-CY-3Ah4u.js} +2 -2
- package/dist/interface/assets/api-Bj4QRftG.css +2 -0
- package/dist/interface/assets/api-CvO7u24f.js +2 -0
- package/dist/interface/assets/{api-BrAt3E8w.js → api-DwU_RUzW.js} +1 -1
- package/dist/interface/assets/auth-BhT4BtBc.js +1 -0
- package/dist/interface/assets/{automations-C1EJke-z.js → automations-ya-5P8Jc.js} +1 -1
- package/dist/interface/assets/cloudHandoff-BPjQsq7k.js +1 -0
- package/dist/interface/assets/{config-Bq4jYnKb.js → config-CgGpshGm.js} +1 -1
- package/dist/interface/assets/{flowSchema-okQoWkh6.js → flowSchema-OrM5E_3R.js} +1 -1
- package/dist/interface/assets/{main-6B8o-buJ.css → main-Dd71JT_o.css} +1 -1
- package/dist/interface/assets/main-rlz9T4Ug.js +3 -0
- package/dist/interface/assets/{mqtt-DtPGnb1K.js → mqtt-CO84Q9sE.js} +1 -1
- package/dist/interface/assets/{notifications-CtZcAwQu.js → notifications-DxDFtZSo.js} +1 -1
- package/dist/interface/assets/{plugins-BK7kZLJw.js → plugins-g-qkx8GX.js} +1 -1
- package/dist/interface/assets/round-restart-alt-CmrjVFat.css +1 -0
- package/dist/interface/assets/round-restart-alt-YiDa63x6.js +1 -0
- package/dist/interface/assets/{sensorIcons-C9h8rHR6.js → sensorIcons-4dvSmrEv.js} +1 -1
- package/dist/interface/assets/{sensors-Bj4drsO3.js → sensors-BFCE7rbx.js} +1 -1
- package/dist/interface/assets/{server-D-ogiovS.js → server-arWVymo1.js} +1 -1
- package/dist/interface/assets/{theme-DGxZC_Ti.js → theme-Dw9-CwMe.js} +1 -1
- package/dist/interface/assets/{types-B1G3t3XJ.js → types-D5c17URv.js} +1 -1
- package/dist/interface/assets/{useAppVersion-Ceg42BEw.js → useAppVersion-Cp6mZ-ge.js} +1 -1
- package/dist/interface/assets/{useBackupRestore-BwnYTBUM.js → useBackupRestore-Drc-2VXy.js} +1 -1
- package/dist/interface/assets/{useCameraOptions-BxVd91Ew.js → useCameraOptions-BF3ASvVM.js} +1 -1
- package/dist/interface/assets/{useLogsSocket-0JucMhVY.js → useLogsSocket-hJ9xUUtr.js} +1 -1
- package/dist/interface/assets/{useNavLayout-CTTy15kG.js → useNavLayout-CcDIO9RG.js} +1 -1
- package/dist/interface/assets/{usePluginUpdates-B9k-vTcT.js → usePluginUpdates-BJwtwD9v.js} +1 -1
- package/dist/interface/assets/{useServerRestart-D7dAWdQ6.js → useServerRestart-DwpQyv5H.js} +1 -1
- package/dist/interface/assets/{useStreamStatus-BlV_fFBy.js → useStreamStatus-C5dH33U5.js} +1 -1
- package/dist/interface/assets/{useUpdateChannel-BeP49Gm-.js → useUpdateChannel-D7hnlzd5.js} +1 -1
- package/dist/interface/assets/{useUserOptions-B8UiLDx4.js → useUserOptions-DFgkIDv8.js} +1 -1
- package/dist/interface/assets/vendor-core-BNfYBWH3.js +1 -0
- package/dist/interface/assets/{vendor-markdown-BDjboykr.js → vendor-markdown-Bw_90xkF.js} +2 -2
- package/dist/interface/index.html +19 -20
- package/dist/interface/sw.js +1 -1
- package/dist/server/package.json +3 -3
- package/dist/server/requirements.txt +1 -1
- package/dist/server/src/_camera_ui_tools/camera_ui_sdk/plugin/notifier.py +6 -0
- package/dist/server/src/api/controllers/notifications.controller.d.ts +5 -0
- package/dist/server/src/api/controllers/notifications.controller.js +27 -0
- package/dist/server/src/api/controllers/notifications.controller.js.map +1 -1
- package/dist/server/src/api/database/types.d.ts +1 -0
- package/dist/server/src/api/routes/notifications.routes.js +11 -0
- package/dist/server/src/api/routes/notifications.routes.js.map +1 -1
- package/dist/server/src/api/services/notifications.service.d.ts +1 -0
- package/dist/server/src/api/services/notifications.service.js +3 -0
- package/dist/server/src/api/services/notifications.service.js.map +1 -1
- package/dist/server/src/api/websocket/nsp/metrics.d.ts +4 -0
- package/dist/server/src/api/websocket/nsp/metrics.js +50 -1
- package/dist/server/src/api/websocket/nsp/metrics.js.map +1 -1
- package/dist/server/src/api/websocket/nsp/server.d.ts +3 -0
- package/dist/server/src/api/websocket/nsp/server.js +17 -0
- package/dist/server/src/api/websocket/nsp/server.js.map +1 -1
- package/dist/server/src/api/websocket/types.d.ts +17 -0
- package/dist/server/src/camera/decoder/child.d.ts +2 -0
- package/dist/server/src/camera/decoder/child.js +9 -0
- package/dist/server/src/camera/decoder/child.js.map +1 -1
- package/dist/server/src/camera/decoder/detection-coordinator.d.ts +2 -1
- package/dist/server/src/camera/decoder/detection-coordinator.js +12 -2
- package/dist/server/src/camera/decoder/detection-coordinator.js.map +1 -1
- package/dist/server/src/camera/decoder/{debug/perf-tracker.d.ts → perf-tracker.d.ts} +9 -1
- package/dist/server/src/camera/decoder/{debug/perf-tracker.js → perf-tracker.js} +43 -17
- package/dist/server/src/camera/decoder/perf-tracker.js.map +1 -0
- package/dist/server/src/camera/decoder/types.d.ts +20 -0
- package/dist/server/src/camera/decoder/worker.d.ts +2 -0
- package/dist/server/src/camera/decoder/worker.js +11 -0
- package/dist/server/src/camera/decoder/worker.js.map +1 -1
- package/dist/server/src/manager/notificationManager.d.ts +2 -0
- package/dist/server/src/manager/notificationManager.js +23 -1
- package/dist/server/src/manager/notificationManager.js.map +1 -1
- package/dist/server/src/rpc/interfaces/frameworker.d.ts +2 -0
- package/dist/server/src/workers/manager.js +2 -0
- package/dist/server/src/workers/manager.js.map +1 -1
- package/package.json +3 -3
- package/dist/interface/assets/Adminpanel-BFKj4r-J.js +0 -1
- package/dist/interface/assets/Camera-C7TRw5N0.js +0 -2
- package/dist/interface/assets/Cameras-DIY20Wlh.css +0 -1
- package/dist/interface/assets/CuiBottomSheet-de-zDc6R.js +0 -1
- package/dist/interface/assets/CuiDataTable-DcyMAPBx.js +0 -1
- package/dist/interface/assets/CuiMarkdownContent-73RAjkHa.js +0 -1
- package/dist/interface/assets/CuiSchema-U31deYpX.js +0 -1
- package/dist/interface/assets/PluginSearch-DDa1Jt8s.js +0 -1
- package/dist/interface/assets/SettingsAccount-BEMYyovd.js +0 -1
- package/dist/interface/assets/SettingsAccount-CcPLFq2z.js +0 -1
- package/dist/interface/assets/SettingsAppearance-BSVGF67s.js +0 -1
- package/dist/interface/assets/SettingsRecordings-CSCgcxrS.js +0 -1
- package/dist/interface/assets/SettingsUsers-DoPPk6w5.js +0 -1
- package/dist/interface/assets/api-DIm7LItL.css +0 -2
- package/dist/interface/assets/api-Da98l_Y7.js +0 -2
- package/dist/interface/assets/arrow-right-outline-C24f5mwe.js +0 -1
- package/dist/interface/assets/auth-BdsJrXmQ.js +0 -1
- package/dist/interface/assets/cloudHandoff-1DPEACLE.js +0 -1
- package/dist/interface/assets/main-W_rUAd4i.js +0 -3
- package/dist/interface/assets/round-restart-alt-SpAgbSYJ.css +0 -1
- package/dist/interface/assets/round-restart-alt-ctiUuhp8.js +0 -1
- package/dist/interface/assets/vendor-core-DNm82LOv.js +0 -1
- package/dist/server/src/camera/decoder/debug/perf-tracker.js.map +0 -1
|
@@ -79,6 +79,33 @@ export class NotificationsController {
|
|
|
79
79
|
return reply.code(404).send({ statusCode: 404, message: 'No image for this notification' });
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
+
async historyVideo(req, reply) {
|
|
83
|
+
const path = this.service.getHistoryVideoPath(req.locals.user._id, req.params.id);
|
|
84
|
+
if (!path) {
|
|
85
|
+
return reply.code(404).send({ statusCode: 404, message: 'No video for this notification' });
|
|
86
|
+
}
|
|
87
|
+
try {
|
|
88
|
+
const data = await readFile(path);
|
|
89
|
+
reply.header('accept-ranges', 'bytes').header('cache-control', 'private, max-age=31536000, immutable').type('video/mp4');
|
|
90
|
+
// Safari refuses to play <video> without range responses
|
|
91
|
+
const range = /^bytes=(\d*)-(\d*)$/.exec(req.headers.range ?? '');
|
|
92
|
+
if (range && (range[1] || range[2])) {
|
|
93
|
+
const start = range[1] ? Number(range[1]) : Math.max(0, data.length - Number(range[2]));
|
|
94
|
+
const end = range[1] && range[2] ? Math.min(Number(range[2]), data.length - 1) : data.length - 1;
|
|
95
|
+
if (start >= data.length || start > end) {
|
|
96
|
+
return reply.code(416).header('content-range', `bytes */${data.length}`).send();
|
|
97
|
+
}
|
|
98
|
+
return reply
|
|
99
|
+
.code(206)
|
|
100
|
+
.header('content-range', `bytes ${start}-${end}/${data.length}`)
|
|
101
|
+
.send(data.subarray(start, end + 1));
|
|
102
|
+
}
|
|
103
|
+
return reply.code(200).send(data);
|
|
104
|
+
}
|
|
105
|
+
catch {
|
|
106
|
+
return reply.code(404).send({ statusCode: 404, message: 'No video for this notification' });
|
|
107
|
+
}
|
|
108
|
+
}
|
|
82
109
|
async markSeen(req, reply) {
|
|
83
110
|
try {
|
|
84
111
|
await this.service.markSeen(req.locals.user._id, req.params.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifications.controller.js","sourceRoot":"","sources":["../../../../../src/api/controllers/notifications.controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"notifications.controller.js","sourceRoot":"","sources":["../../../../../src/api/controllers/notifications.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,5 +130,16 @@ export const NotificationsRoute = async (app) => {
|
|
|
130
130
|
params: deviceParamsSchema,
|
|
131
131
|
},
|
|
132
132
|
});
|
|
133
|
+
app.withTypeProvider().route({
|
|
134
|
+
url: '/history/:id/video',
|
|
135
|
+
method: 'GET',
|
|
136
|
+
preValidation: [validJWTNeeded],
|
|
137
|
+
handler: controller.historyVideo.bind(controller),
|
|
138
|
+
schema: {
|
|
139
|
+
tags: ['Notifications'],
|
|
140
|
+
summary: 'Get the stored clip of a notification',
|
|
141
|
+
params: deviceParamsSchema,
|
|
142
|
+
},
|
|
143
|
+
});
|
|
133
144
|
};
|
|
134
145
|
//# sourceMappingURL=notifications.routes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifications.routes.js","sourceRoot":"","sources":["../../../../../src/api/routes/notifications.routes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"notifications.routes.js","sourceRoot":"","sources":["../../../../../src/api/routes/notifications.routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export declare class NotificationsService {
|
|
|
16
16
|
listSources(userRole: DBRoles): SourcesListing;
|
|
17
17
|
getHistory(userId: string): StoredNotification[];
|
|
18
18
|
getHistoryImagePath(userId: string, id: string): string | null;
|
|
19
|
+
getHistoryVideoPath(userId: string, id: string): string | null;
|
|
19
20
|
clearHistory(userId: string): Promise<void>;
|
|
20
21
|
markSeen(userId: string, id: string): Promise<void>;
|
|
21
22
|
markAllSeen(userId: string): Promise<void>;
|
|
@@ -38,6 +38,9 @@ export class NotificationsService {
|
|
|
38
38
|
getHistoryImagePath(userId, id) {
|
|
39
39
|
return this.proxyServer.notificationManager.getImagePath(userId, id);
|
|
40
40
|
}
|
|
41
|
+
getHistoryVideoPath(userId, id) {
|
|
42
|
+
return this.proxyServer.notificationManager.getVideoPath(userId, id);
|
|
43
|
+
}
|
|
41
44
|
async clearHistory(userId) {
|
|
42
45
|
await this.proxyServer.notificationManager.clearHistory(userId);
|
|
43
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifications.service.js","sourceRoot":"","sources":["../../../../../src/api/services/notifications.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"notifications.service.js","sourceRoot":"","sources":["../../../../../src/api/services/notifications.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,8 +12,12 @@ export declare class MetricsNamespace {
|
|
|
12
12
|
private natsServer;
|
|
13
13
|
private history;
|
|
14
14
|
private realtimeData;
|
|
15
|
+
private workerPerf;
|
|
15
16
|
constructor(io: Server);
|
|
16
17
|
private setupIntervals;
|
|
18
|
+
private refreshWorkerPerf;
|
|
19
|
+
private derivePerfStats;
|
|
20
|
+
private withWorkerPerf;
|
|
17
21
|
private collectInitialData;
|
|
18
22
|
private collectProcessData;
|
|
19
23
|
private getSystemLoad;
|
|
@@ -25,6 +25,7 @@ export class MetricsNamespace {
|
|
|
25
25
|
system: null,
|
|
26
26
|
processes: null,
|
|
27
27
|
};
|
|
28
|
+
workerPerf = {};
|
|
28
29
|
constructor(io) {
|
|
29
30
|
this.api = container.resolve('api');
|
|
30
31
|
this.pluginManager = container.resolve('pluginManager');
|
|
@@ -51,11 +52,15 @@ export class MetricsNamespace {
|
|
|
51
52
|
}
|
|
52
53
|
setupIntervals() {
|
|
53
54
|
setInterval(async () => {
|
|
55
|
+
await this.refreshWorkerPerf();
|
|
54
56
|
let processData = this.realtimeData.processes;
|
|
55
57
|
let systemData = this.realtimeData.system;
|
|
56
58
|
if (!processData || !systemData) {
|
|
57
59
|
[processData, systemData] = await Promise.all([this.collectProcessData(), this.getSystemLoad()]);
|
|
58
60
|
}
|
|
61
|
+
else {
|
|
62
|
+
processData = this.withWorkerPerf(processData);
|
|
63
|
+
}
|
|
59
64
|
this.updateHistory(processData, systemData);
|
|
60
65
|
this.emitHistoryUpdates(processData, systemData);
|
|
61
66
|
}, this.HISTORY_INTERVAL);
|
|
@@ -72,7 +77,45 @@ export class MetricsNamespace {
|
|
|
72
77
|
}, this.REALTIME_INTERVAL);
|
|
73
78
|
this.collectInitialData();
|
|
74
79
|
}
|
|
80
|
+
async refreshWorkerPerf() {
|
|
81
|
+
const controllers = this.api.getCameras();
|
|
82
|
+
const next = {};
|
|
83
|
+
await Promise.all(controllers.map(async (controller) => {
|
|
84
|
+
const snapshot = await controller.frameWorker.getPerfSnapshot();
|
|
85
|
+
if (snapshot && snapshot.elapsedMs > 0) {
|
|
86
|
+
next[controller.frameWorker.name] = this.derivePerfStats(snapshot);
|
|
87
|
+
}
|
|
88
|
+
}));
|
|
89
|
+
this.workerPerf = next;
|
|
90
|
+
}
|
|
91
|
+
derivePerfStats(snapshot) {
|
|
92
|
+
const seconds = snapshot.elapsedMs / 1000;
|
|
93
|
+
const perUnit = (total, count) => (count > 0 ? Math.round((total / count) * 10) / 10 : 0);
|
|
94
|
+
const perSecond = (count) => Math.round((count / seconds) * 10) / 10;
|
|
95
|
+
const activeSeconds = snapshot.ticks > 0 ? seconds * (snapshot.activeTicks / snapshot.ticks) : 0;
|
|
96
|
+
return {
|
|
97
|
+
lowFps: perSecond(snapshot.ticks),
|
|
98
|
+
mainFps: activeSeconds > 0 ? Math.round((snapshot.mainFrames / activeSeconds) * 10) / 10 : 0,
|
|
99
|
+
mainStreamEnabled: snapshot.mainStreamEnabled,
|
|
100
|
+
frameAnalysis: snapshot.frameAnalysis,
|
|
101
|
+
activePercent: snapshot.ticks > 0 ? Math.round((snapshot.activeTicks / snapshot.ticks) * 100) : 0,
|
|
102
|
+
decodeMs: perUnit(snapshot.decodeMs, snapshot.mainFrames),
|
|
103
|
+
scaleMs: perUnit(snapshot.scaleMs, snapshot.ticks),
|
|
104
|
+
jpegMs: perUnit(snapshot.jpegMs, snapshot.activeTicks),
|
|
105
|
+
inferMs: perUnit(snapshot.inferMs, snapshot.inferCount),
|
|
106
|
+
secondaryMs: perUnit(snapshot.secondaryMs, snapshot.activeTicks),
|
|
107
|
+
objects: snapshot.objects,
|
|
108
|
+
faces: snapshot.faces,
|
|
109
|
+
plates: snapshot.plates,
|
|
110
|
+
switches: snapshot.switches,
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
withWorkerPerf(processData) {
|
|
114
|
+
const workers = Object.fromEntries(Object.entries(processData.workers).map(([name, info]) => [name, this.workerPerf[name] ? { ...info, perf: this.workerPerf[name] } : info]));
|
|
115
|
+
return { ...processData, workers };
|
|
116
|
+
}
|
|
75
117
|
async collectInitialData() {
|
|
118
|
+
await this.refreshWorkerPerf();
|
|
76
119
|
const [processData, systemData] = await Promise.all([this.collectProcessData(), this.getSystemLoad()]);
|
|
77
120
|
this.updateHistory(processData, systemData);
|
|
78
121
|
this.realtimeData = {
|
|
@@ -106,7 +149,13 @@ export class MetricsNamespace {
|
|
|
106
149
|
const frameWorkerProcesses = Object.fromEntries(cameraControllers
|
|
107
150
|
.map((controller) => {
|
|
108
151
|
const proc = processList.find((p) => p.pid === controller.frameWorker.getPID());
|
|
109
|
-
|
|
152
|
+
if (!proc)
|
|
153
|
+
return null;
|
|
154
|
+
const name = controller.frameWorker.name;
|
|
155
|
+
const info = createProcessInfo(proc, name, 'frameworker');
|
|
156
|
+
if (this.workerPerf[name])
|
|
157
|
+
info.perf = this.workerPerf[name];
|
|
158
|
+
return [name, info];
|
|
110
159
|
})
|
|
111
160
|
.filter((entry) => entry !== null));
|
|
112
161
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/metrics.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ export declare class ServerNamespace {
|
|
|
10
10
|
private configService;
|
|
11
11
|
private serverUpdate;
|
|
12
12
|
private pluginUpdates;
|
|
13
|
+
private workerUpdateAvailable;
|
|
13
14
|
private checkPluginUpdateInterval;
|
|
14
15
|
private checkServerUpdateInterval;
|
|
15
16
|
private lastNotifiedServerVersion;
|
|
@@ -18,7 +19,9 @@ export declare class ServerNamespace {
|
|
|
18
19
|
getUpdates(_payload?: any, callback?: Function): {
|
|
19
20
|
server?: INpmPluginState;
|
|
20
21
|
plugins: INpmPluginState[];
|
|
22
|
+
workerUpdateAvailable: boolean;
|
|
21
23
|
};
|
|
24
|
+
refreshWorkerUpdateAvailable(): void;
|
|
22
25
|
getMqttStatus(_payload?: any, callback?: Function): MqttStatus | undefined;
|
|
23
26
|
checkPlugins(interval?: boolean): Promise<void>;
|
|
24
27
|
checkServer(interval?: boolean): Promise<void>;
|
|
@@ -16,6 +16,7 @@ export class ServerNamespace {
|
|
|
16
16
|
betaUpdateAvailable: false,
|
|
17
17
|
};
|
|
18
18
|
pluginUpdates = [];
|
|
19
|
+
workerUpdateAvailable = false;
|
|
19
20
|
checkPluginUpdateInterval;
|
|
20
21
|
checkServerUpdateInterval;
|
|
21
22
|
lastNotifiedServerVersion;
|
|
@@ -38,13 +39,29 @@ export class ServerNamespace {
|
|
|
38
39
|
}
|
|
39
40
|
}
|
|
40
41
|
getUpdates(_payload, callback) {
|
|
42
|
+
this.refreshWorkerUpdateAvailable();
|
|
41
43
|
const data = {
|
|
42
44
|
server: this.serverUpdate,
|
|
43
45
|
plugins: this.pluginUpdates,
|
|
46
|
+
workerUpdateAvailable: this.workerUpdateAvailable,
|
|
44
47
|
};
|
|
45
48
|
callback?.(data);
|
|
46
49
|
return data;
|
|
47
50
|
}
|
|
51
|
+
refreshWorkerUpdateAvailable() {
|
|
52
|
+
let available = false;
|
|
53
|
+
try {
|
|
54
|
+
const workerManager = container.resolve('workerManager');
|
|
55
|
+
available = workerManager.getWorkers().some((worker) => worker.online && worker.versionMismatch);
|
|
56
|
+
}
|
|
57
|
+
catch {
|
|
58
|
+
// manager not constructed (worker mode)
|
|
59
|
+
}
|
|
60
|
+
if (available !== this.workerUpdateAvailable) {
|
|
61
|
+
this.workerUpdateAvailable = available;
|
|
62
|
+
this.nsp.emit('worker-updates', { updateAvailable: available });
|
|
63
|
+
}
|
|
64
|
+
}
|
|
48
65
|
getMqttStatus(_payload, callback) {
|
|
49
66
|
let status;
|
|
50
67
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,22 @@ export interface SocketNspMap {
|
|
|
7
7
|
[key: string]: any;
|
|
8
8
|
}
|
|
9
9
|
export type ProcessType = 'system' | 'core' | 'frameworker' | 'plugin';
|
|
10
|
+
export interface WorkerPerfStats {
|
|
11
|
+
lowFps: number;
|
|
12
|
+
mainFps: number;
|
|
13
|
+
mainStreamEnabled: boolean;
|
|
14
|
+
frameAnalysis: boolean;
|
|
15
|
+
activePercent: number;
|
|
16
|
+
decodeMs: number;
|
|
17
|
+
scaleMs: number;
|
|
18
|
+
jpegMs: number;
|
|
19
|
+
inferMs: number;
|
|
20
|
+
secondaryMs: number;
|
|
21
|
+
objects: number;
|
|
22
|
+
faces: number;
|
|
23
|
+
plates: number;
|
|
24
|
+
switches: number;
|
|
25
|
+
}
|
|
10
26
|
export interface ProcessInfo {
|
|
11
27
|
name: string;
|
|
12
28
|
pid?: number;
|
|
@@ -14,6 +30,7 @@ export interface ProcessInfo {
|
|
|
14
30
|
memLoad: string;
|
|
15
31
|
type: ProcessType;
|
|
16
32
|
timestamp: number;
|
|
33
|
+
perf?: WorkerPerfStats;
|
|
17
34
|
}
|
|
18
35
|
export interface ServerProcessInfo {
|
|
19
36
|
'camera.ui': ProcessInfo;
|
|
@@ -3,6 +3,7 @@ import type { RPCClient } from '@camera.ui/rpc';
|
|
|
3
3
|
import type { CameraDetectionSettings, CameraFrameWorkerSettings, CameraUiSettings, DetectionLine, DetectionZone, PtzAutotrackSettings } from '@camera.ui/sdk';
|
|
4
4
|
import type { CoreManagerNamespaces, FrameWorkerNamespaces } from '../../rpc/namespaces.js';
|
|
5
5
|
import type { DetectionCoordinatorConfig } from './detection-coordinator.js';
|
|
6
|
+
import type { FrameWorkerPerfSnapshot } from './types.js';
|
|
6
7
|
export declare class FrameWorkerChild {
|
|
7
8
|
readonly proxy: RPCClient;
|
|
8
9
|
readonly namespaces: FrameWorkerNamespaces & CoreManagerNamespaces;
|
|
@@ -23,6 +24,7 @@ export declare class FrameWorkerChild {
|
|
|
23
24
|
updateInterfaceSettings(settings: CameraUiSettings): void;
|
|
24
25
|
updateNvrRpc(namespace?: string): void;
|
|
25
26
|
updateCameraName(name: string): void;
|
|
27
|
+
getPerfSnapshot(): FrameWorkerPerfSnapshot | null;
|
|
26
28
|
private onStart;
|
|
27
29
|
private sendMessage;
|
|
28
30
|
private close;
|
|
@@ -116,6 +116,9 @@ let FrameWorkerChild = class FrameWorkerChild {
|
|
|
116
116
|
this.logger.suffix = name;
|
|
117
117
|
process.title = `camera.ui - Frame Worker [${name}]${REMOTE_SUFFIX}`;
|
|
118
118
|
}
|
|
119
|
+
getPerfSnapshot() {
|
|
120
|
+
return this.detectionCoordinator?.getPerfSnapshot() ?? null;
|
|
121
|
+
}
|
|
119
122
|
async onStart() {
|
|
120
123
|
this.channel = await this.proxy.privateChannel('frameworker-communication', 'camera.ui');
|
|
121
124
|
this.closeChildHandler = await this.proxy.registerHandler(this.namespaces.frameWorkerChildRpc, this, {
|
|
@@ -188,6 +191,12 @@ __decorate([
|
|
|
188
191
|
__metadata("design:paramtypes", [String]),
|
|
189
192
|
__metadata("design:returntype", void 0)
|
|
190
193
|
], FrameWorkerChild.prototype, "updateCameraName", null);
|
|
194
|
+
__decorate([
|
|
195
|
+
RPCMethod,
|
|
196
|
+
__metadata("design:type", Function),
|
|
197
|
+
__metadata("design:paramtypes", []),
|
|
198
|
+
__metadata("design:returntype", Object)
|
|
199
|
+
], FrameWorkerChild.prototype, "getPerfSnapshot", null);
|
|
191
200
|
FrameWorkerChild = __decorate([
|
|
192
201
|
RPCClass,
|
|
193
202
|
__metadata("design:paramtypes", [])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child.js","sourceRoot":"","sources":["../../../../../src/camera/decoder/child.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"child.js","sourceRoot":"","sources":["../../../../../src/camera/decoder/child.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import type { Logger } from '@camera.ui/common/logger';
|
|
|
3
3
|
import type { RPCClient } from '@camera.ui/rpc';
|
|
4
4
|
import type { CameraDetectionSettings, CameraFrameWorkerSettings, CameraUiSettings, DetectionLine, DetectionZone, PtzAutotrackSettings } from '@camera.ui/sdk';
|
|
5
5
|
import type { CoordinatorSensorInfo } from '../../rpc/interfaces/detection.js';
|
|
6
|
-
import type { CoordinatorSourceUrl } from './types.js';
|
|
6
|
+
import type { CoordinatorSourceUrl, FrameWorkerPerfSnapshot } from './types.js';
|
|
7
7
|
export interface DetectionCoordinatorConfig {
|
|
8
8
|
cameraId: string;
|
|
9
9
|
streamUrl: string;
|
|
@@ -62,6 +62,7 @@ export declare class DetectionCoordinator {
|
|
|
62
62
|
constructor(config: DetectionCoordinatorConfig, proxy: RPCClient, logger: Logger);
|
|
63
63
|
get running(): boolean;
|
|
64
64
|
get detectionSettings(): CameraDetectionSettings;
|
|
65
|
+
getPerfSnapshot(): FrameWorkerPerfSnapshot;
|
|
65
66
|
updateZones(zones: DetectionZone[]): void;
|
|
66
67
|
updateLines(lines: DetectionLine[]): void;
|
|
67
68
|
updateDetectionSettings(settings: CameraDetectionSettings): void;
|
|
@@ -16,7 +16,7 @@ import { normalizeZone } from '../utils/filter.js';
|
|
|
16
16
|
import { AudioDetectionLoop } from './audio-loop.js';
|
|
17
17
|
import { CascadeManager } from './cascade-manager.js';
|
|
18
18
|
import { detectionRecord } from './debug/detection-record.js';
|
|
19
|
-
import { PerfTracker } from './
|
|
19
|
+
import { PerfTracker } from './perf-tracker.js';
|
|
20
20
|
import { DetectionPipeline } from './detection-pipeline.js';
|
|
21
21
|
import { DwellManager } from './dwell-manager.js';
|
|
22
22
|
import { DetectionEventManager, MOMENT_RANK_ATTRIBUTE, MOMENT_RANK_OBJECT } from './event-manager.js';
|
|
@@ -193,6 +193,9 @@ let DetectionCoordinator = class DetectionCoordinator {
|
|
|
193
193
|
get detectionSettings() {
|
|
194
194
|
return this.config.detectionSettings;
|
|
195
195
|
}
|
|
196
|
+
getPerfSnapshot() {
|
|
197
|
+
return { ...this.perf.snapshot(), mainStreamEnabled: this.mainStreamAvailable, frameAnalysis: this.plugins.shouldVideoBeActive() };
|
|
198
|
+
}
|
|
196
199
|
updateZones(zones) {
|
|
197
200
|
this.config.zones = zones;
|
|
198
201
|
this.pipeline.updateZones(zones);
|
|
@@ -904,7 +907,8 @@ let DetectionCoordinator = class DetectionCoordinator {
|
|
|
904
907
|
}
|
|
905
908
|
}
|
|
906
909
|
this.updateStreamState();
|
|
907
|
-
|
|
910
|
+
// activity, not stream choice: cameras without main-stream analysis still count as active
|
|
911
|
+
if (this.worldSpans.size > 0 || this.eventManager.hasActiveSegment())
|
|
908
912
|
this.perf.activeTicks++;
|
|
909
913
|
else
|
|
910
914
|
this.perf.idleTicks++;
|
|
@@ -1042,6 +1046,7 @@ let DetectionCoordinator = class DetectionCoordinator {
|
|
|
1042
1046
|
const motionInferStart = Date.now();
|
|
1043
1047
|
const result = await motionPlugin.proxy.detectMotion(motionFrame);
|
|
1044
1048
|
this.perf.inferMs += Date.now() - motionInferStart;
|
|
1049
|
+
this.perf.inferCount++;
|
|
1045
1050
|
if (!this.loopRunning)
|
|
1046
1051
|
return;
|
|
1047
1052
|
if (ptzSuppressed) {
|
|
@@ -1093,6 +1098,7 @@ let DetectionCoordinator = class DetectionCoordinator {
|
|
|
1093
1098
|
const inferStart = Date.now();
|
|
1094
1099
|
const result = await PromiseTimeout(objectPlugin.proxy.detectObjects(objectFrame.model), DETECT_TIMEOUT_MS, undefined, `Object detection timed out after ${DETECT_TIMEOUT_MS}ms`);
|
|
1095
1100
|
this.perf.inferMs += Date.now() - inferStart;
|
|
1101
|
+
this.perf.inferCount++;
|
|
1096
1102
|
if (!this.loopRunning)
|
|
1097
1103
|
return;
|
|
1098
1104
|
this.trackDetectionCadence();
|
|
@@ -1556,12 +1562,16 @@ let DetectionCoordinator = class DetectionCoordinator {
|
|
|
1556
1562
|
if (!scaled)
|
|
1557
1563
|
return { detections: reported, assisted: false };
|
|
1558
1564
|
try {
|
|
1565
|
+
const inferStart = Date.now();
|
|
1559
1566
|
const result = await PromiseTimeout(assist.proxy.detectObjects(scaled.model), DETECT_TIMEOUT_MS, undefined, `Object assist timed out after ${DETECT_TIMEOUT_MS}ms`);
|
|
1567
|
+
this.perf.inferMs += Date.now() - inferStart;
|
|
1568
|
+
this.perf.inferCount++;
|
|
1560
1569
|
const reportedLabels = new Set(reported.map((d) => d.label.toLowerCase()));
|
|
1561
1570
|
const boxed = FrameScaler.undoLetterbox(ensureDetectionBoxes(result?.detections ?? []), scaled.geometry);
|
|
1562
1571
|
const found = boxed.filter((d) => reportedLabels.size === 0 || reportedLabels.has(d.label.toLowerCase()));
|
|
1563
1572
|
if (found.length === 0)
|
|
1564
1573
|
return { detections: reported, assisted: false };
|
|
1574
|
+
this.perf.objects += found.length;
|
|
1565
1575
|
return { detections: found, assisted: true };
|
|
1566
1576
|
}
|
|
1567
1577
|
catch (error) {
|