iobroker.agent-dvr 0.4.0 → 0.4.2

package/admin/i18n/zh-cn.json

@@ -1,142 +1,145 @@
 {
   "agent-dvr adapter settings": "Agent DVR 适配器设置",
-  "tabConnection": "连接",
-  "tabFeatures": "功能",
-  "tabWidget": "小部件",
-  "tabAdvanced": "高级",
-  "cfgIp": "AgentDVR IP 地址",
-  "cfgPort": "端口",
-  "cfgUser": "用户名（可选）",
-  "cfgPass": "密码（可选）",
-  "cfgPollSeconds": "轮询间隔（秒）",
-  "cfgHttpTimeoutMs": "HTTP 超时（毫秒）",
-  "cfgEnableSystemControls": "系统控制按钮",
-  "cfgEnablePtz": "PTZ 控制按钮",
-  "cfgEnableUrls": "生成流 URL",
+  "cfgCameraColumn": "AgentDVR 摄像头",
+  "cfgDashBtnsVisible": "按钮始终可见",
+  "cfgDashBtnsVisible_tt": "始终显示录制和PTZ按钮（否则仅在悬停时显示）",
+  "cfgDashColorAccent": "强调色",
+  "cfgDashColorAccent_tt": "主强调色（按钮、活动元素、边框）",
+  "cfgDashColorBg": "背景",
+  "cfgDashColorBg_tt": "仪表板主背景色",
+  "cfgDashColorBorder": "边框颜色",
+  "cfgDashColorBorder_tt": "分隔线和边框的颜色",
+  "cfgDashColorOffline": "离线颜色",
+  "cfgDashColorOffline_tt": "离线状态指示器的颜色",
+  "cfgDashColorOnline": "在线颜色",
+  "cfgDashColorOnline_tt": "在线状态指示器的颜色",
+  "cfgDashColorSurface": "表面 / 卡片",
+  "cfgDashColorSurface_tt": "磁贴和卡片的背景色",
+  "cfgDashColorText": "文字颜色",
+  "cfgDashColorText_tt": "主文字颜色",
+  "cfgDashDefaultView": "打开时的默认视图",
+  "cfgDashDefaultView_tt": "打开仪表板时哪个选项卡处于活动状态",
+  "cfgDashGridCols": "列数（0 = 自动）",
+  "cfgDashGridCols_tt": "强制设置固定的摄像头列数。0 = 自动计算最优数量。",
+  "cfgDashRefreshSec": "每隔（秒）重新加载摄像头列表",
+  "cfgDashRefreshSec_tt": "从服务器重新加载摄像头列表的频率（0 = 不自动重新加载）",
+  "cfgDashShowOffline": "显示离线摄像头",
+  "cfgDashShowOffline_tt": "在实时网格中显示当前离线的摄像头",
+  "cfgDashStreamReconnect": "自动重新连接流",
+  "cfgDashStreamReconnect_tt": "连接断开后自动重启 MJPEG 流",
+  "cfgDashTagPosition": "标签徽章位置",
+  "cfgDashTagPosition_tt": "录像磁贴上标签徽章显示的角落",
+  "cfgDashViewLive": "实时视图",
+  "cfgDashViewRec": "录像",
   "cfgEnableEventDps": "事件数据点",
-  "cfgEnablePush": "实时推送触发器",
+  "cfgEnableEventDps_tt": "镜像最近一次录像的元数据（文件名、日期、时长、标签）",
   "cfgEnableOverview": "总览小部件（所有摄像头）",
-  "cfgStoreRawJson": "存储原始 API JSON",
-  "cfgEnableWidget": "每个摄像头的图库小部件",
-  "cfgWidgetMode": "小部件模式",
-  "cfgWidgetModeNojs": "纯 HTML/CSS（无 JavaScript，到处兼容）",
-  "cfgWidgetModeJs": "完整 JS（搜索 + 标签过滤，需要执行脚本）",
-  "cfgWidgetAnzahl": "图库中最大录像数",
-  "cfgWidgetMinCol": "最小列宽（像素）",
-  "cfgWidgetShowTags": "显示事件标签",
-  "cfgWidgetLiveAspect": "实时磁贴宽高比（例如 16/9，留空为自动）",
-  "cfgWidgetTagPosition": "标签徽章位置",
-  "cfgTagPosTopLeft": "左上",
-  "cfgTagPosTopRight": "右上",
-  "cfgTagPosBotLeft": "左下",
-  "cfgTagPosBotRight": "右下",
-  "cfgWidgetMaxModalWidth": "播放器最大宽度（像素）",
-  "cfgWidgetPlayerUrl": "外部播放器 URL（留空使用内置播放器）",
-  "cfgMaxDepth": "对象展平最大深度",
-  "cfgMaxArray": "要展开的最大数组长度",
-  "cfgEventTagsDynamic": "从录像中自动检测事件标签",
-  "cfgEventTagsIgnore": "要忽略的事件标签（逗号分隔）",
-  "cfgEventTags": "始终创建的固定事件标签（逗号分隔）",
+  "cfgEnableOverview_tt": "所有摄像头的 HTML 瓦片网格状态（用于可视化、仪表盘等）",
+  "cfgEnablePtz": "PTZ 控制按钮",
+  "cfgEnablePtz_tt": "每个摄像头的 PTZ 保持开关（左/右/上/下/变焦）",
+  "cfgEnablePush": "实时推送触发器",
+  "cfgEnablePush_tt": "当 AgentDVR 报告新录像时，push 触发状态立即更新",
   "cfgEnableSnapshotB64": "快照为 Base64",
-  "hdrControls": "控制按钮",
-  "hdrEvents": "事件与 Push",
-  "hdrDisplay": "显示",
-  "hdrDebug": "调试",
-  "hdrWidgetGeneral": "图库小部件",
-  "hdrWidgetLayout": "布局",
-  "hdrWidgetTags": "标签",
-  "hdrWidgetPlayer": "直播流与播放器",
+  "cfgEnableSnapshotB64_tt": "每次轮询时将摄像头图像保存为 Base64（photo.jpg，全分辨率）。刷新按钮始终存在。",
+  "cfgEnableStreamProxy": "MJPEG 代理",
+  "cfgEnableStreamProxy_tt": "通过 ioBroker 路由 MJPEG 和快照（仅 MJPEG 模式需要 — FLV 和 go2rtc 始终通过代理）",
+  "cfgEnableSystemControls": "系统控制按钮",
   "cfgEnableSystemControls_tt": "布防/撤防/重启按钮、配置文件选择器及所有系统控制命令",
-  "cfgEnablePtz_tt": "每个摄像头的 PTZ 保持开关（左/右/上/下/变焦）",
+  "cfgEnableUrls": "生成流 URL",
   "cfgEnableUrls_tt": "每个摄像头的快照、MJPEG 和 MP4 流 URL 状态",
-  "cfgEnableSnapshotB64_tt": "每次轮询时将摄像头图像保存为 Base64（photo.jpg，全分辨率）。刷新按钮始终存在。",
-  "cfgEnableEventDps_tt": "镜像最近一次录像的元数据（文件名、日期、时长、标签）",
-  "cfgEnablePush_tt": "当 AgentDVR 报告新录像时，push 触发状态立即更新",
-  "cfgEnableOverview_tt": "所有摄像头的 HTML 瓦片网格状态（用于可视化、仪表盘等）",
-  "cfgStoreRawJson_tt": "将完整的 getObjects 响应写入 system.raw_getObjects（用于调试）",
+  "cfgEnableWidget": "每个摄像头的图库小部件",
   "cfgEnableWidget_tt": "每个摄像头的 HTML 录像库（用于可视化、仪表盘等）",
-  "cfgWidgetMode_tt": "纯 HTML/CSS，到处兼容。完整 JS 含搜索框和标签过滤器（需要执行脚本）。",
+  "cfgEventTags": "始终创建的固定事件标签（逗号分隔）",
+  "cfgEventTagsDynamic": "从录像中自动检测事件标签",
+  "cfgEventTagsIgnore": "要忽略的事件标签（逗号分隔）",
+  "cfgGo2rtcEnabled": "启用 go2rtc WebRTC 流",
+  "cfgGo2rtcEnabled_tt": "集成 go2rtc 服务器。保存后可为每个摄像头选择 go2rtc 流。",
+  "cfgGo2rtcMapping_tt": "为每个摄像头选择流来源：MJPEG、MP4/FLV（通过AgentDVR）或go2rtc流。",
+  "cfgGo2rtcUrl": "go2rtc URL",
+  "cfgGo2rtcUrl_tt": "go2rtc 服务器的基础 URL，例如 http://192.168.1.1:1984",
+  "cfgHttpTimeoutMs": "HTTP 超时（毫秒）",
+  "cfgIp": "AgentDVR IP 地址",
+  "cfgIpMissing": "AgentDVR IP地址为必填项",
+  "cfgMaxArray": "要展开的最大数组长度",
+  "cfgMaxDepth": "对象展平最大深度",
+  "cfgNoCamerasFound": "未找到摄像头 — 适配器是否已配置并至少轮询过一次？",
+  "cfgPass": "密码（可选）",
+  "cfgPollSeconds": "轮询间隔（秒）",
+  "cfgPort": "端口",
+  "cfgStoreRawJson": "存储原始 API JSON",
+  "cfgStoreRawJson_tt": "将完整的 getObjects 响应写入 system.raw_getObjects（用于调试）",
+  "cfgStreamSourceColumn": "流来源",
+  "cfgTagPosBotLeft": "左下",
+  "cfgTagPosBotRight": "右下",
+  "cfgTagPosTopLeft": "左上",
+  "cfgTagPosTopRight": "右上",
+  "cfgUser": "用户名（可选）",
+  "cfgWidgetAnzahl": "图库中最大录像数",
   "cfgWidgetAnzahl_tt": "每个摄像头在图库中的最大录像数",
-  "cfgWidgetMinCol_tt": "图库网格的最小列宽（像素）",
-  "cfgWidgetMaxModalWidth_tt": "模态对话框中视频播放器的最大宽度（像素）",
-  "cfgWidgetShowTags_tt": "在图库磁贴上将事件标签显示为彩色徽章",
-  "cfgWidgetTagPosition_tt": "图像上标签徽章显示的角落",
-  "cfgWidgetLiveAspect_tt": "直播流磁贴的宽高比，例如 16/9。留空则自动。",
-  "cfgWidgetPlayerUrl_tt": "外部视频播放器的 URL。留空使用内置播放器。",
-  "hdrWidgetFilter": "过滤与排序",
-  "cfgWidgetSortNewest": "最新在前",
-  "cfgWidgetSortNewest_tt": "按日期排序录像，最新在前",
-  "cfgWidgetShowSearch": "显示搜索框（仅 JS 模式）",
-  "cfgWidgetShowSearch_tt": "在 JS 模式下显示按日期、标签和文件名的文本搜索",
+  "cfgWidgetBorderRadius": "边框半径（px）",
+  "cfgWidgetBorderRadius_tt": "缩略图磁贴的圆角半径（像素，0 = 方形）",
+  "cfgWidgetColorAccent": "强调色",
+  "cfgWidgetColorAccent_tt": "小部件中链接和按钮的强调色",
+  "cfgWidgetColorCardBg": "磁贴背景",
+  "cfgWidgetColorCardBg_tt": "缩略图磁贴的背景色 – rgba(r,g,b,a) 或 #hex",
+  "cfgWidgetColorModalBg": "模态背景",
+  "cfgWidgetColorModalBg_tt": "视频播放器对话框的背景色",
+  "cfgWidgetColorTagBg": "标签徽章背景",
+  "cfgWidgetColorTagBg_tt": "标签徽章的背景色",
+  "cfgWidgetColorTagText": "标签徽章文字颜色",
+  "cfgWidgetColorTagText_tt": "标签徽章的文字颜色",
   "cfgWidgetCompact": "紧凑布局",
   "cfgWidgetCompact_tt": "更小的间距和字体 – 一眼看到更多条目（两种模式均可使用）",
   "cfgWidgetDefaultTag": "默认标签过滤器（空 = 全部）",
   "cfgWidgetDefaultTag_tt": "首次加载时预选此标签（仅 JS 模式）",
+  "cfgWidgetLiveAspect": "实时磁贴宽高比（例如 16/9，留空为自动）",
+  "cfgWidgetLiveAspect_tt": "直播流磁贴的宽高比，例如 16/9。留空则自动。",
+  "cfgWidgetMaxModalWidth": "播放器最大宽度（像素）",
+  "cfgWidgetMaxModalWidth_tt": "模态对话框中视频播放器的最大宽度（像素）",
+  "cfgWidgetMinCol": "最小列宽（像素）",
+  "cfgWidgetMinCol_tt": "图库网格的最小列宽（像素）",
+  "cfgWidgetMode": "小部件模式",
+  "cfgWidgetModeJs": "完整 JS（搜索 + 标签过滤，需要执行脚本）",
+  "cfgWidgetModeNojs": "纯 HTML/CSS（无 JavaScript，到处兼容）",
+  "cfgWidgetMode_tt": "纯 HTML/CSS，到处兼容。完整 JS 含搜索框和标签过滤器（需要执行脚本）。",
+  "cfgWidgetPlayerUrl": "外部播放器 URL（留空使用内置播放器）",
+  "cfgWidgetPlayerUrl_tt": "外部视频播放器的 URL。留空使用内置播放器。",
+  "cfgWidgetShowSearch": "显示搜索框（仅 JS 模式）",
+  "cfgWidgetShowSearch_tt": "在 JS 模式下显示按日期、标签和文件名的文本搜索",
+  "cfgWidgetShowTags": "显示事件标签",
+  "cfgWidgetShowTags_tt": "在图库磁贴上将事件标签显示为彩色徽章",
+  "cfgWidgetSortNewest": "最新在前",
+  "cfgWidgetSortNewest_tt": "按日期排序录像，最新在前",
+  "cfgWidgetTagPosition": "标签徽章位置",
+  "cfgWidgetTagPosition_tt": "图像上标签徽章显示的角落",
+  "cfgWidgetThumbLarge": "大（240 px）",
+  "cfgWidgetThumbMedium": "中（180 px）",
   "cfgWidgetThumbSize": "缩略图大小",
   "cfgWidgetThumbSize_tt": "图库中预览图像的宽度（覆盖最小列宽）",
   "cfgWidgetThumbSmall": "小（120 px）",
-  "cfgWidgetThumbMedium": "中（180 px）",
-  "cfgWidgetThumbLarge": "大（240 px）",
-  "tabDashboard": "实时仪表板",
-  "hdrDashView": "视图",
-  "cfgDashDefaultView": "打开时的默认视图",
-  "cfgDashDefaultView_tt": "打开仪表板时哪个选项卡处于活动状态",
-  "cfgDashViewLive": "实时视图",
-  "cfgDashViewRec": "录像",
-  "cfgDashShowOffline": "显示离线摄像头",
-  "cfgDashShowOffline_tt": "在实时网格中显示当前离线的摄像头",
+  "hdrCameraStreams": "流分配",
+  "hdrControls": "控制按钮",
   "hdrDashGrid": "摄像头网格",
-  "cfgDashGridCols": "列数（0 = 自动）",
-  "cfgDashGridCols_tt": "强制设置固定的摄像头列数。0 = 自动计算最优数量。",
   "hdrDashStream": "流与刷新",
-  "cfgDashRefreshSec": "每隔（秒）重新加载摄像头列表",
-  "cfgDashRefreshSec_tt": "从服务器重新加载摄像头列表的频率（0 = 不自动重新加载）",
-  "cfgDashStreamReconnect": "自动重新连接流",
-  "cfgDashStreamReconnect_tt": "连接断开后自动重启 MJPEG 流",
-  "hdrWidgetTheme": "颜色与设计",
-  "cfgWidgetColorCardBg": "磁贴背景",
-  "cfgWidgetColorCardBg_tt": "缩略图磁贴的背景色 – rgba(r,g,b,a) 或 #hex",
-  "cfgWidgetColorTagBg": "标签徽章背景",
-  "cfgWidgetColorTagBg_tt": "标签徽章的背景色",
-  "cfgWidgetColorTagText": "标签徽章文字颜色",
-  "cfgWidgetColorTagText_tt": "标签徽章的文字颜色",
-  "cfgWidgetColorAccent": "强调色",
-  "cfgWidgetColorAccent_tt": "小部件中链接和按钮的强调色",
-  "cfgWidgetColorModalBg": "模态背景",
-  "cfgWidgetColorModalBg_tt": "视频播放器对话框的背景色",
-  "cfgWidgetBorderRadius": "边框半径（px）",
-  "cfgWidgetBorderRadius_tt": "缩略图磁贴的圆角半径（像素，0 = 方形）",
   "hdrDashTheme": "颜色与设计",
-  "cfgDashColorBg": "背景",
-  "cfgDashColorBg_tt": "仪表板主背景色",
-  "cfgDashColorSurface": "表面 / 卡片",
-  "cfgDashColorSurface_tt": "磁贴和卡片的背景色",
-  "cfgDashColorAccent": "强调色",
-  "cfgDashColorAccent_tt": "主强调色（按钮、活动元素、边框）",
-  "cfgDashColorText": "文字颜色",
-  "cfgDashColorText_tt": "主文字颜色",
-  "cfgDashColorBorder": "边框颜色",
-  "cfgDashColorBorder_tt": "分隔线和边框的颜色",
-  "cfgDashColorOnline": "在线颜色",
-  "cfgDashColorOnline_tt": "在线状态指示器的颜色",
-  "cfgDashColorOffline": "离线颜色",
-  "cfgDashColorOffline_tt": "离线状态指示器的颜色",
-  "cfgDashTagPosition": "标签徽章位置",
-  "cfgDashTagPosition_tt": "录像磁贴上标签徽章显示的角落",
-  "cfgDashBtnsVisible": "按钮始终可见",
-  "cfgDashBtnsVisible_tt": "始终显示录制和PTZ按钮（否则仅在悬停时显示）",
-  "hdrCameraStreams": "流分配",
+  "hdrDashView": "视图",
+  "hdrDebug": "调试",
+  "hdrDisplay": "显示",
+  "hdrEvents": "事件与 Push",
   "hdrGo2rtc": "go2rtc WebRTC 流",
-  "cfgGo2rtcUrl": "go2rtc URL",
-  "cfgGo2rtcUrl_tt": "go2rtc 服务器的基础 URL，例如 http://192.168.1.1:1984",
-  "cfgGo2rtcMapping_tt": "为每个摄像头选择流来源：MJPEG、MP4/FLV（通过AgentDVR）或go2rtc流。",
-  "cfgIpMissing": "AgentDVR IP地址为必填项",
-  "cfgNoCamerasFound": "未找到摄像头 — 适配器是否已配置并至少轮询过一次？",
+  "hdrProxy": "代理",
+  "hdrWidgetFilter": "过滤与排序",
+  "hdrWidgetGeneral": "图库小部件",
+  "hdrWidgetLayout": "布局",
+  "hdrWidgetPlayer": "直播流与播放器",
+  "hdrWidgetTags": "标签",
+  "hdrWidgetTheme": "颜色与设计",
   "loadingCamerasAndStreams": "正在加载摄像头和流…",
-  "cfgCameraColumn": "AgentDVR 摄像头",
-  "cfgStreamSourceColumn": "流来源",
   "reload": "重新加载",
-  "hdrProxy": "代理",
-  "cfgEnableStreamProxy": "MJPEG 代理",
-  "cfgEnableStreamProxy_tt": "通过 ioBroker 路由 MJPEG 和快照（仅 MJPEG 模式需要 — FLV 和 go2rtc 始终通过代理）"
-}
+  "tabAdvanced": "高级",
+  "tabConnection": "连接",
+  "tabDashboard": "实时仪表板",
+  "tabFeatures": "功能",
+  "tabWidget": "小部件",
+  "cfgDashStreamMp4": "MP4 / FLV（含音频）"
+}

package/admin/index_m.html

@@ -18,7 +18,7 @@
       };
       document.head.appendChild(script);
     </script>
-    <script type="module" crossorigin src="./assets/index-B13Ujb6j.js"></script>
+    <script type="module" crossorigin src="./assets/index-_IaWp3oU.js"></script>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

package/build/main.js

@@ -326,7 +326,7 @@ class AgentDvr extends utils.Adapter {
     const rawLang = (_a = sysConfig == null ? void 0 : sysConfig.common) == null ? void 0 : _a.language;
     this.wt = (0, import_widget_i18n.getWidgetLabels)(rawLang != null ? rawLang : "en");
     const pollSeconds = Math.max(5, Math.min(3600, this.config.pollSeconds || 30));
-    this.baseUrl = `http://${this.config.ip}:${this.config.port || 8090}`;
+    this.baseUrl = `http://${this.config.serverIp}:${this.config.port || 8090}`;
     if (this.config.user || this.config.pass) {
       this.authHeader = `Basic ${Buffer.from(`${this.config.user}:${this.config.pass}`).toString("base64")}`;
     }
@@ -460,7 +460,7 @@ class AgentDvr extends utils.Adapter {
     return new Promise((resolve) => {
       const timeout = Math.max(1e3, Math.min(3e4, this.config.httpTimeoutMs || 8e3));
       const opts = {
-        hostname: this.config.ip,
+        hostname: this.config.serverIp,
         port: this.config.port || 8090,
         path,
         method: "GET",
@@ -499,7 +499,7 @@ class AgentDvr extends utils.Adapter {
     return new Promise((resolve) => {
       const timeout = Math.max(1e3, Math.min(3e4, this.config.httpTimeoutMs || 8e3));
       const opts = {
-        hostname: this.config.ip,
+        hostname: this.config.serverIp,
         port: this.config.port || 8090,
         path,
         method: "GET",
@@ -550,12 +550,6 @@ class AgentDvr extends utils.Adapter {
       }
     }
   }
-  guessRole(id, val) {
-    if (typeof val === "string" && /^https?:\/\//i.test(val)) {
-      return "string";
-    }
-    return "string";
-  }
   async writeLeaf(id, val) {
     const t = typeof val;
     let common;
@@ -754,11 +748,14 @@ class AgentDvr extends utils.Adapter {
         continue;
       }
       const id = `${sfid}.${dp.key}`;
-      await this.setObjectNotExistsAsync(id, {
-        type: "state",
-        common: { name: dp.name, type: "boolean", role: dp.role, read: true, write: false, def: false },
-        native: {}
-      });
+      if (!this.ensuredFolders.has(id)) {
+        await this.setObjectNotExistsAsync(id, {
+          type: "state",
+          common: { name: dp.name, type: "boolean", role: dp.role, read: true, write: false, def: false },
+          native: {}
+        });
+        this.ensuredFolders.add(id);
+      }
       await this.setStateAsync(id, { val: !!data[dp.key], ack: true });
     }
   }