iobroker.agent-dvr 0.6.0 → 0.7.0

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.
@@ -41,6 +41,9 @@
41
41
  "cfgEnableEventDps_tt": "Отражать метаданные последней записи (имя файла, дата, длительность, теги)",
42
42
  "cfgEnableAlertPhotos": "Сохранять фото тревоги",
43
43
  "cfgEnableAlertPhotos_tt": "При вызове вебхука с ?oid={ID} сохранять текущее фото в полном разрешении в файловом хранилище ioBroker (последние 3 на камеру: grab1–grab3, метки времени ts1–ts3)",
44
+ "cfgPhotoWebInstance": "Веб-экземпляр для ссылок на фото",
45
+ "cfgPhotoWebInstance_tt": "На какой веб-экземпляр указывают ссылки в alertPhotos.url1–3. Автоматически предпочитается http.",
46
+ "cfgPhotoWebAuto": "Автоматически",
44
47
  "cfgEnableOverview": "Виджет обзора (все камеры)",
45
48
  "cfgEnableOverview_tt": "HTML-состояние со всеми камерами в виде сетки (для визуализаций, панелей и т.д.)",
46
49
  "cfgEnablePtz": "Кнопки управления PTZ",
@@ -41,6 +41,9 @@
41
41
  "cfgEnableEventDps_tt": "Відображати метадані останнього запису (ім'я файлу, дата, тривалість, теги)",
42
42
  "cfgEnableAlertPhotos": "Зберігати фото тривоги",
43
43
  "cfgEnableAlertPhotos_tt": "Під час виклику вебхука з ?oid={ID} зберігати поточне фото в повній роздільній здатності у файловому сховищі ioBroker (останні 3 на камеру: grab1–grab3, мітки часу ts1–ts3)",
44
+ "cfgPhotoWebInstance": "Веб-екземпляр для посилань на фото",
45
+ "cfgPhotoWebInstance_tt": "На який веб-екземпляр вказують посилання в alertPhotos.url1–3. Автоматично надається перевага http.",
46
+ "cfgPhotoWebAuto": "Автоматично",
44
47
  "cfgEnableOverview": "Віджет огляду (всі камери)",
45
48
  "cfgEnableOverview_tt": "HTML-стан з усіма камерами у вигляді сітки (для візуалізацій, панелей тощо)",
46
49
  "cfgEnablePtz": "Кнопки керування PTZ",
@@ -41,6 +41,9 @@
41
41
  "cfgEnableEventDps_tt": "镜像最近一次录像的元数据(文件名、日期、时长、标签)",
42
42
  "cfgEnableAlertPhotos": "保存报警照片",
43
43
  "cfgEnableAlertPhotos_tt": "当以 ?oid={ID} 调用 Webhook 时,将当前全分辨率照片保存到 ioBroker 文件存储中(每个摄像头保留最近 3 张:grab1–grab3,时间戳 ts1–ts3)",
44
+ "cfgPhotoWebInstance": "照片链接使用的 Web 实例",
45
+ "cfgPhotoWebInstance_tt": "alertPhotos.url1–3 中的链接指向哪个 Web 实例。自动模式优先使用 http。",
46
+ "cfgPhotoWebAuto": "自动",
44
47
  "cfgEnableOverview": "总览小部件(所有摄像头)",
45
48
  "cfgEnableOverview_tt": "所有摄像头的 HTML 瓦片网格状态(用于可视化、仪表盘等)",
46
49
  "cfgEnablePtz": "PTZ 控制按钮",
@@ -18,7 +18,7 @@
18
18
  };
19
19
  document.head.appendChild(script);
20
20
  </script>
21
- <script type="module" crossorigin src="./assets/index-DyH6BvVs.js"></script>
21
+ <script type="module" crossorigin src="./assets/index-CUI5sWkp.js"></script>
22
22
  </head>
23
23
  <body>
24
24
  <noscript>You need to enable JavaScript to run this app.</noscript>
package/build/main.js CHANGED
@@ -331,6 +331,8 @@ class AgentDvr extends utils.Adapter {
331
331
  eventTagsSeen = {};
332
332
  // last webhook alert pulse per camera — AgentDVR often calls the action twice per motion
333
333
  webhookLast = {};
334
+ webBaseUrl = void 0;
335
+ webBaseTimer = void 0;
334
336
  camAspect = {};
335
337
  devById = /* @__PURE__ */ new Map();
336
338
  eventBusy = {};
@@ -340,6 +342,7 @@ class AgentDvr extends utils.Adapter {
340
342
  this.on("stateChange", this.onStateChange.bind(this));
341
343
  this.on("message", this.onMessage.bind(this));
342
344
  this.on("unload", this.onUnload.bind(this));
345
+ this.on("objectChange", this.onObjectChange.bind(this));
343
346
  }
344
347
  // ---- lifecycle ----
345
348
  async ensureWebInstance() {
@@ -371,6 +374,9 @@ class AgentDvr extends utils.Adapter {
371
374
  }
372
375
  this.schedulePoll(pollSeconds * 1e3);
373
376
  this.subscribeStates("*");
377
+ this.subscribeForeignObjects("system.adapter.web.*");
378
+ this.subscribeForeignObjects("system.host.*");
379
+ this.refreshPhotoUrls().catch((e) => this.log.warn(`Photo URL refresh: ${e.message}`));
374
380
  this.log.info(`Agent DVR adapter ready. Polling ${this.baseUrl} every ${pollSeconds}s.`);
375
381
  }
376
382
  onUnload(callback) {
@@ -823,6 +829,23 @@ class AgentDvr extends utils.Adapter {
823
829
  if (dev) {
824
830
  const fid = this.deviceFolder(dev);
825
831
  const key = `${ot}_${oid}`;
832
+ const paramsId = `${fid}.events.webhookParams`;
833
+ if (!this.ensuredFolders.has(paramsId)) {
834
+ await this.ensurePath(paramsId);
835
+ await this.setObjectNotExistsAsync(paramsId, {
836
+ type: "state",
837
+ common: {
838
+ name: "Webhook parameters (JSON)",
839
+ type: "string",
840
+ role: "json",
841
+ read: true,
842
+ write: false
843
+ },
844
+ native: {}
845
+ });
846
+ this.ensuredFolders.add(paramsId);
847
+ }
848
+ await this.setStateAsync(paramsId, { val: JSON.stringify(q), ack: true });
826
849
  const cooldownMs = 2e4;
827
850
  if (Date.now() - ((_c = this.webhookLast[key]) != null ? _c : 0) >= cooldownMs) {
828
851
  this.webhookLast[key] = Date.now();
@@ -848,6 +871,59 @@ class AgentDvr extends utils.Adapter {
848
871
  }
849
872
  // Keeps the last 3 alert photos per camera in the file storage (<namespace>/<fid>/grab1..3.jpg,
850
873
  // grab1 = newest). ts1 is written last, so it is a safe trigger: the file is complete by then.
874
+ async ensureAlertPhotoObjects(ch) {
875
+ if (this.ensuredFolders.has(ch)) {
876
+ return;
877
+ }
878
+ await this.ensureFolder(ch, "Alert photos", "channel");
879
+ for (let i = 1; i <= 3; i++) {
880
+ await this.setObjectNotExistsAsync(`${ch}.grab${i}`, {
881
+ type: "state",
882
+ common: {
883
+ name: `Alert photo ${i} (file path)`,
884
+ type: "string",
885
+ role: "text",
886
+ read: true,
887
+ write: false
888
+ },
889
+ native: {}
890
+ });
891
+ await this.setObjectNotExistsAsync(`${ch}.uri${i}`, {
892
+ type: "state",
893
+ common: {
894
+ name: `Alert photo ${i} (iobfile URI)`,
895
+ type: "string",
896
+ role: "text",
897
+ read: true,
898
+ write: false
899
+ },
900
+ native: {}
901
+ });
902
+ await this.setObjectNotExistsAsync(`${ch}.url${i}`, {
903
+ type: "state",
904
+ common: {
905
+ name: `Alert photo ${i} (http URL)`,
906
+ type: "string",
907
+ role: "text.url",
908
+ read: true,
909
+ write: false
910
+ },
911
+ native: {}
912
+ });
913
+ await this.setObjectNotExistsAsync(`${ch}.ts${i}`, {
914
+ type: "state",
915
+ common: {
916
+ name: `Alert photo ${i} (time)`,
917
+ type: "number",
918
+ role: "value.time",
919
+ read: true,
920
+ write: false
921
+ },
922
+ native: {}
923
+ });
924
+ }
925
+ this.ensuredFolders.add(ch);
926
+ }
851
927
  async saveAlertPhoto(oid, fid) {
852
928
  var _a, _b;
853
929
  const img = await this.apiGetBuffer(`/photo.jpg?oid=${oid}`);
@@ -864,45 +940,7 @@ class AgentDvr extends utils.Adapter {
864
940
  });
865
941
  this.ensuredFolders.add(this.namespace);
866
942
  }
867
- if (!this.ensuredFolders.has(ch)) {
868
- await this.ensureFolder(ch, "Alert photos", "channel");
869
- for (let i = 1; i <= 3; i++) {
870
- await this.setObjectNotExistsAsync(`${ch}.grab${i}`, {
871
- type: "state",
872
- common: {
873
- name: `Alert photo ${i} (file path)`,
874
- type: "string",
875
- role: "text",
876
- read: true,
877
- write: false
878
- },
879
- native: {}
880
- });
881
- await this.setObjectNotExistsAsync(`${ch}.uri${i}`, {
882
- type: "state",
883
- common: {
884
- name: `Alert photo ${i} (iobfile URI)`,
885
- type: "string",
886
- role: "text",
887
- read: true,
888
- write: false
889
- },
890
- native: {}
891
- });
892
- await this.setObjectNotExistsAsync(`${ch}.ts${i}`, {
893
- type: "state",
894
- common: {
895
- name: `Alert photo ${i} (time)`,
896
- type: "number",
897
- role: "value.time",
898
- read: true,
899
- write: false
900
- },
901
- native: {}
902
- });
903
- }
904
- this.ensuredFolders.add(ch);
905
- }
943
+ await this.ensureAlertPhotoObjects(ch);
906
944
  for (let i = 2; i >= 1; i--) {
907
945
  try {
908
946
  const prev = await this.readFileAsync(this.namespace, `${fid}/grab${i}.jpg`);
@@ -911,15 +949,99 @@ class AgentDvr extends utils.Adapter {
911
949
  await this.setStateAsync(`${ch}.ts${i + 1}`, { val: (_b = ts == null ? void 0 : ts.val) != null ? _b : null, ack: true });
912
950
  await this.setStateAsync(`${ch}.grab${i + 1}`, { val: this.alertPhotoPath(fid, i + 1), ack: true });
913
951
  await this.setStateAsync(`${ch}.uri${i + 1}`, { val: this.alertPhotoUri(fid, i + 1), ack: true });
952
+ await this.setStateAsync(`${ch}.url${i + 1}`, { val: await this.alertPhotoUrl(fid, i + 1), ack: true });
914
953
  } catch {
915
954
  }
916
955
  }
917
956
  await this.writeFileAsync(this.namespace, `${fid}/grab1.jpg`, img.data);
918
957
  await this.setStateAsync(`${ch}.grab1`, { val: this.alertPhotoPath(fid, 1), ack: true });
919
958
  await this.setStateAsync(`${ch}.uri1`, { val: this.alertPhotoUri(fid, 1), ack: true });
959
+ await this.setStateAsync(`${ch}.url1`, { val: await this.alertPhotoUrl(fid, 1), ack: true });
920
960
  await this.setStateAsync(`${ch}.ts1`, { val: Date.now(), ack: true });
921
961
  this.log.debug(`Alert photo cam ${oid} saved (${img.data.length} bytes)`);
922
962
  }
963
+ onObjectChange(id) {
964
+ if (!/^system\.adapter\.web\.\d+$/.test(id) && !id.startsWith("system.host.")) {
965
+ return;
966
+ }
967
+ if (this.webBaseTimer !== void 0) {
968
+ this.clearTimeout(this.webBaseTimer);
969
+ }
970
+ this.webBaseTimer = this.setTimeout(() => {
971
+ this.webBaseTimer = void 0;
972
+ this.refreshPhotoUrls().catch((e) => this.log.warn(`Photo URL refresh: ${e.message}`));
973
+ }, 2e3);
974
+ }
975
+ // Recomputes the web base URL and rewrites url1..3 of every camera that already has alert photos.
976
+ async refreshPhotoUrls() {
977
+ const base = await this.findWebBaseUrl();
978
+ if (base === this.webBaseUrl) {
979
+ return;
980
+ }
981
+ this.log.info(`Alert photo links now use ${base || "(no web instance)"}`);
982
+ this.webBaseUrl = base;
983
+ for (const dev of this.devById.values()) {
984
+ const fid = this.deviceFolder(dev);
985
+ if (!await this.getObjectAsync(`${fid}.alertPhotos`)) {
986
+ continue;
987
+ }
988
+ await this.ensureAlertPhotoObjects(`${fid}.alertPhotos`);
989
+ for (let n = 1; n <= 3; n++) {
990
+ await this.setStateAsync(`${fid}.alertPhotos.url${n}`, {
991
+ val: await this.alertPhotoUrl(fid, n),
992
+ ack: true
993
+ });
994
+ }
995
+ }
996
+ }
997
+ // http(s) URL of a stored alert photo via the web extension, for apps that only accept web links
998
+ async alertPhotoUrl(fid, n) {
999
+ if (this.webBaseUrl === void 0) {
1000
+ this.webBaseUrl = await this.findWebBaseUrl();
1001
+ }
1002
+ return this.webBaseUrl ? `${this.webBaseUrl}/${this.namespace}/photos/${fid}/grab${n}.jpg` : "";
1003
+ }
1004
+ // Base URL of the web instance that serves this adapter's extension — prefers plain http,
1005
+ // since TV and kiosk apps often reject self-signed certificates.
1006
+ async findWebBaseUrl() {
1007
+ var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
1008
+ try {
1009
+ const view = await this.getObjectViewAsync("system", "instance", {
1010
+ startkey: "system.adapter.web.",
1011
+ endkey: "system.adapter.web.\u9999"
1012
+ });
1013
+ const own = await this.getForeignObjectAsync(`system.adapter.${this.namespace}`);
1014
+ const loadedBy = String((_b = (_a = own == null ? void 0 : own.native) == null ? void 0 : _a.webInstance) != null ? _b : "*");
1015
+ const chosen = this.config.photoWebInstance || "";
1016
+ const webs = view.rows.map((r) => r.value).filter((o) => {
1017
+ var _a2;
1018
+ return ((_a2 = o == null ? void 0 : o.common) == null ? void 0 : _a2.enabled) && (loadedBy === "*" || o._id === `system.adapter.${loadedBy}`);
1019
+ }).filter((o) => !chosen || o._id === `system.adapter.${chosen}`).sort((a, b) => {
1020
+ var _a2, _b2;
1021
+ return Number(!!((_a2 = a.native) == null ? void 0 : _a2.secure)) - Number(!!((_b2 = b.native) == null ? void 0 : _b2.secure));
1022
+ });
1023
+ const web = webs[0];
1024
+ if (!web) {
1025
+ return "";
1026
+ }
1027
+ let host = String((_d = (_c = web.native) == null ? void 0 : _c.bind) != null ? _d : "");
1028
+ if (!host || host === "0.0.0.0" || host === "::") {
1029
+ const hostObj = await this.getForeignObjectAsync(`system.host.${web.common.host}`);
1030
+ const addrs = ((_f = (_e = hostObj == null ? void 0 : hostObj.common) == null ? void 0 : _e.address) != null ? _f : []).filter(
1031
+ (a) => /^\d+\.\d+\.\d+\.\d+$/.test(a) && !a.startsWith("127.")
1032
+ );
1033
+ host = (_g = addrs[0]) != null ? _g : "";
1034
+ }
1035
+ if (!host) {
1036
+ return "";
1037
+ }
1038
+ const proto = ((_h = web.native) == null ? void 0 : _h.secure) ? "https" : "http";
1039
+ return `${proto}://${host}:${(_j = (_i = web.native) == null ? void 0 : _i.port) != null ? _j : 8082}`;
1040
+ } catch (e) {
1041
+ this.log.debug(`Web base URL not found: ${e.message}`);
1042
+ return "";
1043
+ }
1044
+ }
923
1045
  // ioBroker file URI of a stored alert photo — resolved by telegram >= 6 directly from the file storage
924
1046
  alertPhotoUri(fid, n) {
925
1047
  return `iobfile://${this.namespace}/${fid}/grab${n}.jpg`;