-
-
-
- ${this._spaceDialog?this._renderSpaceDialog():W}
- ${this._toast?L`Пространств пока нет.
- ${this._serverStorage?L`Добавьте первое пространство и загрузите план этажа.
- `:L`Установите интеграцию House Plan и добавьте запись в «Устройства и службы».
`} -${this._toast}
`:W}
-
-
-
-
-
- ${this._markup?this._renderMarkupBar():W}
-
-
-
- ${t.map(t=>L``)}
- ${this._norm?L``:W}
-
- ${s.length} устр.
-
-
-
-
-
-
- ${this._norm?L``:W}
- ${this._norm?L`
- `:W}
-
- this._markupClick(t)}
- @wheel=${t=>this._onWheel(t)}
- @pointerdown=${t=>this._stagePointerDown(t)}
- @pointermove=${t=>this._stagePointerMove(t)}
- @pointerup=${t=>this._stagePointerUp(t)}
- @pointercancel=${t=>this._stagePointerUp(t)}>
-
-
- ${this._roomDialog?this._renderRoomDialog():W}
- ${this._spaceDialog?this._renderSpaceDialog():W}
- ${this._markerDialog?this._renderMarkerDialog():W}
- ${this._infoCard?this._renderInfoCard():W}
- ${this._tip?L`
-
-
- ${this._zoom>1?L`
- ${s.map(t=>this._renderDevice(t,n))}
-
- ${Math.round(100*this._zoom)}%
`:W}
-
- ${this._tip.title}${this._tip.meta?L`${this._tip.meta}`:W}
- ${null!=this._tip.lqi?L`средний сигнал zigbee:
- ${this._tip.lqi}`:W}
-
`:W}
- ${this._toast?L`${this._toast}
`:W}
- this._clickDevice(e,t)}
- @mousemove=${e=>this._showTip(e,t.name,t.model+(null!=n?" · "+n+"°":"")+(null!=r?" · LQI "+r:""))}
- @mouseleave=${()=>this._tip=null}
- @pointerdown=${e=>this._pointerDown(e,t)}
- @pointermove=${e=>this._pointerMove(e,t)}
- @pointerup=${e=>this._pointerUp(e,t)}
- >
-
`}_roomCenter(t){if(t.poly){const e=t.poly.length;return[t.poly.reduce((t,e)=>t+e[0],0)/e,t.poly.reduce((t,e)=>t+e[1],0)/e]}return[t.x+t.w/2,t.y+.1*Math.min(t.w,t.h)]}_renderMarkupDefs(t){const e=this._gridPitch,i=.14*e;return j`t.stopPropagation()}>
-
`}_renderRoomDialog(){const t=this._freeAreas;return L``}}At.properties={hass:{attribute:!1},_config:{state:!0},_space:{state:!0},_layout:{state:!0},_devices:{state:!0},_tip:{state:!0},_selId:{state:!0},_toast:{state:!0},_serverCfg:{state:!0},_markup:{state:!0},_tool:{state:!0},_path:{state:!0},_cursorPt:{state:!0},_areaSel:{state:!0},_nameSel:{state:!0},_roomDialog:{state:!0},_spaceDialog:{state:!0},_infoCard:{state:!0},_markerDialog:{state:!0},_zoom:{state:!0},_view:{state:!0}},At.styles=((t,...e)=>{const s=1===t.length?t[0]:e.reduce((e,i,s)=>e+(t=>{if(!0===t._$cssResult$)return t.cssText;if("number"==typeof t)return t;throw Error("Value passed to 'css' function must be a 'css' function result: "+t+". Use 'unsafeCSS' to pass non-literal values, but take care to ensure page security.")})(i)+t[s+1],t[0]);return new a(s,t,i)})`
+ >`):B}_valueChanged(t){const e={...this._config,...t.detail.value},i=new Event("config-changed",{bubbles:!0,composed:!0});i.detail={config:e},this.dispatchEvent(i)}}At.properties={hass:{attribute:!1},_config:{state:!0},_spaces:{state:!0}},customElements.get("houseplan-card-editor")||customElements.define("houseplan-card-editor",At);const zt=((t,...e)=>{const s=1===t.length?t[0]:e.reduce((e,i,s)=>e+(t=>{if(!0===t._$cssResult$)return t.cssText;if("number"==typeof t)return t;throw Error("Value passed to 'css' function must be a 'css' function result: "+t+". Use 'unsafeCSS' to pass non-literal values, but take care to ensure page security.")})(i)+t[s+1],t[0]);return new a(s,t,i)})`
:host {
--hp-bg: var(--card-background-color, #16212e);
--hp-line: var(--divider-color, #2b3d4f);
@@ -1038,4 +727,315 @@ const t=globalThis,e=t.ShadowRoot&&(void 0===t.ShadyCSS||t.ShadyCSS.nativeShadow
z-index: 120;
max-width: 90vw;
}
- `,customElements.get("houseplan-card")||customElements.define("houseplan-card",At),window.customCards=window.customCards||[],window.customCards.find(t=>"houseplan-card"===t.type)||window.customCards.push({type:"houseplan-card",name:"House Plan Card",description:"Интерактивный план дома: пространства, комнаты, устройства с живыми состояниями и drag-раскладкой."}),console.info("%c HOUSEPLAN-CARD %c v1.9.3 ","background:#3ea6ff;color:#04121f;font-weight:700","");
+ `,Mt="houseplan_card_layout_v1",Dt="houseplan_card_cfg_v1",Pt="houseplan_card_zoom_v1",Et=1e3,Rt=(t,e,i)=>{const s=new Event(e,{bubbles:!0,composed:!0});s.detail=i??{},t.dispatchEvent(s)},Tt=(t,e)=>{let i;return(...s)=>{clearTimeout(i),i=window.setTimeout(()=>t(...s),e)}};class Ot extends rt{constructor(){super(...arguments),this._space="f1",this._layout={},this._serverStorage=!1,this._loadOk=!1,this._loading=!1,this._loadTries=0,this._serverCfg=null,this._cfgRev=0,this._unsubCfg=null,this._devices=[],this._regSignature="",this._defPos={},this._tip=null,this._selId=null,this._toast="",this._markup=!1,this._tool="draw",this._path=[],this._pathSegs=[],this._cursorPt=null,this._areaSel="",this._nameSel="",this._roomDialog=!1,this._zoom=1,this._view=null,this._zoomBySpace={},this._pointers=new Map,this._panStart=null,this._pinchStart=null,this._suppressClick=!1,this._onboardingShown=!1,this._infoCard=null,this._markerDialog=null,this._spaceDialog=null,this._keyHandler=t=>this._onKey(t),this._drag=null,this._dirtyPos=new Set,this._persistLayout=Tt(()=>{if(this._serverStorage){const t=[...this._dirtyPos];this._dirtyPos.clear();for(const e of t){const t=this._layout[e];t&&this.hass.callWS({type:"houseplan/layout/update",device_id:e,pos:t}).catch(t=>this._showToast("Не удалось сохранить позицию: "+(t?.message||t)))}this._cacheSnapshot()}else localStorage.setItem(Mt,JSON.stringify(this._layout))},600),this._saveConfig=Tt(()=>{this._serverCfg&&this.hass.callWS({type:"houseplan/config/set",config:this._serverCfg,expected_rev:this._cfgRev}).then(t=>{this._cfgRev=t?.rev??this._cfgRev+1}).catch(t=>{"conflict"===t?.code?(this._showToast("Конфиг изменён в другом окне — данные обновлены, повторите последнее действие"),this._cancelPath(),this._reloadConfigOnly()):this._showToast("Не удалось сохранить конфиг: "+(t?.message||t))})},500)}connectedCallback(){super.connectedCallback(),window.addEventListener("keydown",this._keyHandler)}disconnectedCallback(){window.removeEventListener("keydown",this._keyHandler),this._roViewport?.disconnect(),this._roViewport=void 0,this._unsubCfg&&(this._unsubCfg(),this._unsubCfg=null),super.disconnectedCallback()}_onKey(t){if("Escape"===t.key){if(this._infoCard)return void(this._infoCard=null);if(this._markerDialog)return void(this._markerDialog=null)}if(!this._markup)return;return"Escape"===t.key||(t.ctrlKey||t.metaKey)&&"z"===t.key.toLowerCase()?this._roomDialog?(t.preventDefault(),void this._roomDialogCancel()):void("draw"===this._tool&&this._path.length&&(t.preventDefault(),this._undoPoint())):void 0}_undoPoint(){if(!this._path.length)return;if(1===this._path.length)return this._path=[],void(this._pathSegs=[]);const t=this._pathSegs[this._pathSegs.length-1];this._pathSegs=this._pathSegs.slice(0,-1),t&&this._removeSegmentByKey(t),this._path=this._path.slice(0,-1)}_removeSegmentByKey(t){const e=this._curSpaceCfg;if(!e?.segments)return;const i=this._segments.findIndex(e=>this._segKey([e[0],e[1]],[e[2],e[3]])===t);i>=0&&(e.segments.splice(i,1),this._saveConfig())}static getConfigElement(){return document.createElement("houseplan-card-editor")}static getStubConfig(){return{type:"custom:houseplan-card",title:"План дома"}}setConfig(t){this._config={icon_size:2.5,show_temperature:!0,live_states:!0,show_signal:!0,...t},t.default_floor&&(this._space=t.default_floor);try{this._zoomBySpace=JSON.parse(localStorage.getItem(Pt)||"{}")||{}}catch{this._zoomBySpace={}}try{const e=JSON.parse(localStorage.getItem(Dt)||"null");e&&e.config&&Array.isArray(e.config.spaces)&&(this._serverCfg=e.config,this._cfgRev=e.rev||0,this._layout=e.layout||{},this._serverStorage=!0,t.default_floor?this._space=t.default_floor:this._model.find(t=>t.id===this._space)||(this._space=this._model[0]?.id||this._space))}catch{}}_cacheSnapshot(){if(this._serverCfg)try{localStorage.setItem(Dt,JSON.stringify({config:this._serverCfg,rev:this._cfgRev,layout:this._layout}))}catch{}}getCardSize(){return 12}get _norm(){return!(!this._serverCfg||!this._serverCfg.spaces.length)}get _model(){return this._serverCfg?this._serverCfg.spaces.map(t=>{const e=Et/t.aspect;return{id:t.id,title:t.title,vb:[t.view_box[0]*Et,t.view_box[1]*e,t.view_box[2]*Et,t.view_box[3]*e],bg:t.plan_url?{href:t.plan_url,x:0,y:0,w:Et,h:e}:null,rooms:t.rooms.map(t=>({id:t.id,name:t.name,area:t.area??null,x:null!=t.x?t.x*Et:void 0,y:null!=t.y?t.y*e:void 0,w:null!=t.w?t.w*Et:void 0,h:null!=t.h?t.h*e:void 0,poly:t.poly?t.poly.map(t=>[t[0]*Et,t[1]*e]):void 0}))}}):[]}_spaceModel(t){const e=this._model;return e.find(e=>e.id===(t??this._space))||e[0]}get _areaToSpace(){const t={};for(const e of this._model)for(const i of e.rooms)i.area&&(t[i.area]={space:e.id,room:i});return t}get _settings(){return this._serverCfg?.settings||{}}get _showAll(){return!!this._settings.show_all}_toggleShowAll(){this._serverCfg&&(this._serverCfg={...this._serverCfg,settings:{...this._serverCfg.settings,show_all:!this._showAll}},this._regSignature="",this._maybeRebuildDevices(),this._saveConfig(),this.requestUpdate())}get _excluded(){const t=this._settings.exclude_integrations;return t?new Set(t):ct}willUpdate(t){t.has("hass")&&this.hass&&(!this._loadOk&&!this._loading&&this._loadTries<8&&this._loadFromServer(),this._maybeRebuildDevices())}updated(){const t=this._stageEl;t&&!this._roViewport&&(this._roViewport=new ResizeObserver(()=>this._refitView()),this._roViewport.observe(t)),t&&!this._view&&this._refitView(),this._serverStorage&&this._loadOk&&0===this._model.length&&!this._spaceDialog&&!this._onboardingShown&&(this._onboardingShown=!0,this._openSpaceDialog("create"))}async _loadFromServer(){this._loading=!0,this._loadTries++;try{const[t,e]=await Promise.all([this.hass.callWS({type:"houseplan/config/get"}),this.hass.callWS({type:"houseplan/layout/get"})]);this._loadOk=!0,this._serverStorage=!0;const i=t?.config;this._serverCfg=i&&Array.isArray(i.spaces)?i:null,this._cfgRev=t?.rev||0,this._layout=e?.layout||{},this._unsubCfg||(this._unsubCfg=await this.hass.connection.subscribeEvents(t=>{(t?.data?.rev??-1)!==this._cfgRev&&this._reloadConfigOnly()},"houseplan_config_updated")),this._norm&&!this._model.find(t=>t.id===this._space)&&(this._space=this._model[0]?.id||this._space),this._cacheSnapshot(),this._restoreZoom()}catch(t){if(this._loadTries>=8){this._serverStorage=!1,this._serverCfg=null;try{this._layout=JSON.parse(localStorage.getItem(Mt)||"{}")||{}}catch{this._layout={}}}}finally{this._loading=!1}this._regSignature="",this.requestUpdate()}async _reloadConfigOnly(){try{const t=await this.hass.callWS({type:"houseplan/config/get"}),e=t?.config;this._serverCfg=e&&Array.isArray(e.spaces)?e:null,this._cfgRev=t?.rev||0,this._cacheSnapshot(),this._regSignature="",this._maybeRebuildDevices(),this.requestUpdate()}catch{}}_maybeRebuildDevices(){const t=this.hass;if(!t?.devices||!t?.entities||!t?.areas)return;const e=Object.keys(t.devices).length+":"+Object.keys(t.entities).length+":"+Object.keys(t.areas).length+":"+(this._norm?"n":"l");e===this._regSignature&&this._devices.length||(this._regSignature=e,this._devices=St({hass:t,areaToSpace:Object.fromEntries(Object.entries(this._areaToSpace).map(([t,e])=>[t,e.space])),markers:this._markers,settings:this._settings,excluded:this._excluded,showAll:this._showAll,firstSpaceId:this._model[0]?.id||""}),this._defPos=this._defaultPositions())}get _markers(){return this._serverCfg?.markers||[]}_roomLqi(t){if(!t)return null;const e=[];for(const i of this._devices){if(i.area!==t||i.virtual)continue;const s=$t(this.hass,i.entities);null!=s&&e.push(s)}return gt(e)}_roomBounds(t){if(t.poly&&t.poly.length){const e=t.poly.map(t=>t[0]),i=t.poly.map(t=>t[1]),s=Math.min(...e),a=Math.min(...i);return{x:s,y:a,w:Math.max(...e)-s,h:Math.max(...i)-a}}return{x:t.x??0,y:t.y??0,w:t.w??0,h:t.h??0}}_defaultPositions(){const t={},e=(this._config?.icon_size??2.5)/100*Et*1.3;for(const i of this._model)for(const s of i.rooms){if(!s.area)continue;const a=this._devices.filter(t=>t.area===s.area&&t.space===i.id);if(!a.length)continue;const o=this._roomBounds(s),n=.1*Math.min(o.w,o.h),r=o.w-2*n,l=o.h-2*n,c=Math.max(1,Math.round(Math.sqrt(a.length*r/Math.max(l,1)))),h=Math.ceil(a.length/c),d=r/c,p=l/Math.max(h,1),u=a.map((t,e)=>({x:o.x+n+d*(e%c+.5),y:o.y+n+p*(Math.floor(e/c)+.5)}));ft(u,o,e,.5*n),a.forEach((e,i)=>t[e.id]=u[i])}return t}_pos(t){const e=this._spaceModel(t.space),i=this._layout[t.id];if(i)if(this._norm){if(i.s===t.space){const e=this._serverCfg.spaces.find(e=>e.id===t.space)?.aspect||1;return{x:i.x*Et,y:i.y*(Et/e)}}}else if(void 0===i.s)return{x:i.x,y:i.y};if(this._defPos[t.id])return this._defPos[t.id];const s=e.vb;return{x:s[0]+s[2]/2,y:s[1]+s[3]/2}}_savePos(t,e,i){if(this._norm){const s=this._gridPitch,a=Math.round(e/s)*s,o=Math.round(i/s)*s,n=this._serverCfg.spaces.find(e=>e.id===t.space)?.aspect||1;this._layout={...this._layout,[t.id]:{s:t.space,x:a/Et,y:o/(Et/n)}}}else this._layout={...this._layout,[t.id]:{x:Math.round(e),y:Math.round(i)}};this._dirtyPos.add(t.id),this._persistLayout()}_stateClass(t){if(!this._config?.live_states)return"";const e=t.primary?this.hass.states[t.primary]:void 0;if(!e)return"";if("unavailable"===e.state)return"unavail";const i=e.entity_id.split(".")[0];if(["light","switch","fan","humidifier"].includes(i))return"on"===e.state?"on":"";if("cover"===i||"valve"===i)return["open","opening"].includes(e.state)?"open":"";if("lock"===i)return["unlocked","open"].includes(e.state)?"open":"";if("binary_sensor"===i){const t=e.attributes?.device_class;if(["door","window","garage_door","opening","gas","smoke","moisture","problem"].includes(t))return"on"===e.state?"open":""}return"media_player"===i?["playing","on"].includes(e.state)?"on":"":"vacuum"===i&&["cleaning","returning"].includes(e.state)?"on":""}_liveTemp(t){return this._config?.show_temperature?"mdi:thermometer"!==t.icon&&"mdi:air-filter"!==t.icon?null:wt(this.hass,t.entities):null}_openMoreInfo(t){t?Rt(this,"hass-more-info",{entityId:t}):this._showToast("У устройства нет подходящей сущности")}_clickDevice(t,e){t.stopPropagation(),this._drag?.moved||this._suppressClick||this._markup||(this._infoCard=e)}get _stageEl(){return this.renderRoot.querySelector(".stage")}_stageAspect(){const t=this._stageEl,e=this._spaceModel().vb;return t&&t.clientHeight?t.clientWidth/t.clientHeight:e[2]/e[3]}_viewOr(t){return this._view&&this._view.w?this._view:mt(t,this._stageAspect())}_screenToVb(t,e){const i=this._stageEl,s=this._viewOr(this._spaceModel().vb),a=i?.clientWidth||1,o=i?.clientHeight||1;return[s.x+t/a*s.w,s.y+e/o*s.h]}_clampView(t,e){return{w:t.w,h:t.h,x:Math.max(e.x,Math.min(e.x+e.w-t.w,t.x)),y:Math.max(e.y,Math.min(e.y+e.h-t.h,t.y))}}_applyView(t,e,i){const s=this._spaceModel().vb,a=mt(s,this._stageAspect()),o=Math.min(8,Math.max(1,t)),n=a.w/o,r=a.h/o,l=this._viewOr(s),c=e??l.x+l.w/2,h=i??l.y+l.h/2;this._zoom=o,this._view=this._clampView({x:c-n/2,y:h-r/2,w:n,h:r},a)}_refitView(){if(!this._stageEl)return;const t=this._view;this._applyView(this._zoom,t?t.x+t.w/2:void 0,t?t.y+t.h/2:void 0),this.requestUpdate()}_zoomAt(t,e,i){const s=this._stageEl;if(!s)return;const a=mt(this._spaceModel().vb,this._stageAspect()),o=Math.min(8,Math.max(1,i)),n=s.clientWidth,r=s.clientHeight,l=this._screenToVb(t,e),c=a.w/o,h=a.h/o;this._zoom=o,this._view=this._clampView({x:l[0]-t/n*c,y:l[1]-e/r*h,w:c,h:h},a)}_onWheel(t){const e=this._stageEl;if(!e)return;t.preventDefault();const i=e.getBoundingClientRect(),s=t.deltaY<0?1.15:1/1.15;this._zoomAt(t.clientX-i.left,t.clientY-i.top,this._zoom*s),this._saveZoom()}_stepZoom(t){const e=this._stageEl;e&&(this._zoomAt(e.clientWidth/2,e.clientHeight/2,this._zoom*(t>0?1.4:1/1.4)),this._saveZoom())}_resetZoom(){const t=this._spaceModel().vb;this._zoom=1,this._view=mt(t,this._stageAspect()),this._saveZoom()}_saveZoom(){this._zoomBySpace={...this._zoomBySpace,[this._space]:this._zoom};try{localStorage.setItem(Pt,JSON.stringify(this._zoomBySpace))}catch{}}_restoreZoom(){const t=this._zoomBySpace[this._space]||1;this._zoom=t,this._view=null,requestAnimationFrame(()=>{if(!this._stageEl)return;const e=this._spaceModel().vb;this._applyView(t,e[0]+e[2]/2,e[1]+e[3]/2),this.requestUpdate()})}_stagePointerDown(t){if(this._drag||this._markup)return;if(t.target.closest(".dev"))return;this._pointers.set(t.pointerId,{x:t.clientX,y:t.clientY});const e=this._viewOr(this._spaceModel().vb);if(1===this._pointers.size)this._panStart={sx:t.clientX,sy:t.clientY,vx:e.x,vy:e.y},this._suppressClick=!1;else if(2===this._pointers.size){const t=[...this._pointers.values()],e=Math.hypot(t[0].x-t[1].x,t[0].y-t[1].y);this._pinchStart={dist:e,zoom:this._zoom},this._panStart=null}}_stagePointerMove(t){if(this._pointers.has(t.pointerId)){if(this._pointers.set(t.pointerId,{x:t.clientX,y:t.clientY}),this._pinchStart&&this._pointers.size>=2){const t=[...this._pointers.values()],e=Math.hypot(t[0].x-t[1].x,t[0].y-t[1].y)/(this._pinchStart.dist||1),i=this._stageEl.getBoundingClientRect(),s=(t[0].x+t[1].x)/2-i.left,a=(t[0].y+t[1].y)/2-i.top;this._zoomAt(s,a,this._pinchStart.zoom*e),this._suppressClick=!0,this._saveZoom()}else if(this._panStart){const e=t.clientX-this._panStart.sx,i=t.clientY-this._panStart.sy;if(Math.abs(e)+Math.abs(i)>4&&(this._suppressClick=!0),this._zoom>1&&this._view){const t=this._stageEl,s=this._view,a=mt(this._spaceModel().vb,this._stageAspect());this._view=this._clampView({x:this._panStart.vx-e/t.clientWidth*s.w,y:this._panStart.vy-i/t.clientHeight*s.h,w:s.w,h:s.h},a)}}}else this._markupMove(t)}_stagePointerUp(t){this._pointers.delete(t.pointerId),this._pointers.size<2&&(this._pinchStart=null),0===this._pointers.size&&(this._panStart=null,setTimeout(()=>this._suppressClick=!1,0))}_clickRoom(t){var e;!this._suppressClick&&t.area&&(e="/config/areas/area/"+t.area,history.pushState(null,"",e),Rt(window,"location-changed",{replace:!1}))}_pointerDown(t,e){if(this._markup)return;t.preventDefault();const i=this._pos(e);this._drag={id:e.id,sx:t.clientX,sy:t.clientY,ox:i.x,oy:i.y,moved:!1},t.target.setPointerCapture(t.pointerId),this._tip=null}_pointerMove(t,e){if(!this._drag||this._drag.id!==e.id)return;const i=this.renderRoot.querySelector(".stage");if(!i)return;const s=this._spaceModel().vb,a=i.getBoundingClientRect(),o=this._viewOr(s),n=(t.clientX-this._drag.sx)/a.width*o.w,r=(t.clientY-this._drag.sy)/a.height*o.h;Math.abs(t.clientX-this._drag.sx)+Math.abs(t.clientY-this._drag.sy)>3&&(this._drag.moved=!0);const l=.008*Math.min(s[2],s[3]),c=Math.max(s[0]+l,Math.min(s[0]+s[2]-l,this._drag.ox+n)),h=Math.max(s[1]+l,Math.min(s[1]+s[3]-l,this._drag.oy+r));this._savePos(e,c,h)}_pointerUp(t,e){if(!this._drag||this._drag.id!==e.id)return;const i=this._drag.moved;this._drag=i?this._drag:null,i&&(this._selId=e.id,window.setTimeout(()=>this._drag=null,0))}_resetLayout(){confirm("Сбросить позиции всех иконок к авто-раскладке?")&&(this._layout={},this._persistLayout())}_showToast(t){this._toast=t,clearTimeout(this._toastTimer),this._toastTimer=window.setTimeout(()=>{this._toast=""},3500)}_showTip(t,e,i,s){this._drag||(this._tip={x:t.clientX,y:t.clientY,title:e,meta:i,lqi:s})}get _gridPitch(){return Et/240}get _curSpaceCfg(){return this._serverCfg?.spaces.find(t=>t.id===this._space)}get _spaceH(){const t=this._curSpaceCfg;return t?Et/t.aspect:Et}get _segments(){const t=this._curSpaceCfg,e=this._spaceH;return(t?.segments||[]).map(t=>[t[0]*Et,t[1]*e,t[2]*Et,t[3]*e])}_toggleMarkup(){this._norm?(this._markup=!this._markup,this._path=[],this._cursorPt=null,this._tool="draw"):this._showToast("Разметка доступна после переноса конфига на сервер (режим правки → «На сервер»)")}_svgPoint(t){const e=this.renderRoot.querySelector(".stage").getBoundingClientRect();return this._screenToVb(t.clientX-e.left,t.clientY-e.top)}_snap(t){const e=this._gridPitch;return[_t(t[0],e),_t(t[1],e)]}_samePt(t,e){return function(t,e,i=.001){return Math.abs(t[0]-e[0])t.stopPropagation()}>
-
-
-
- this._spaceDialog={...t,title:e.target.value}} />
-
-
-
- ${t.planFile?L`${t.planFile.name}`:t.planUrl?L`
`:L`нет подложки`}
-
-
-
- ${"edit"===t.mode?L``:W}
-
-
-
-
-
+
+
+
+ ${this._spaceDialog?this._renderSpaceDialog():B}
+ ${this._toast?j`Пространств пока нет.
+ ${this._serverStorage?j`Добавьте первое пространство и загрузите план этажа.
+ `:j`Установите интеграцию House Plan и добавьте запись в «Устройства и службы».
`} +${this._toast}
`:B}
+
+
+
+
+
+ ${this._markup?this._renderMarkupBar():B}
+
+
+
+ ${t.map(t=>j``)}
+ ${this._norm?j``:B}
+
+ ${s.length} устр.
+
+
+
+
+
+
+ ${this._norm?j``:B}
+ ${this._norm?j`
+ `:B}
+
+ this._markupClick(t)}
+ @wheel=${t=>this._onWheel(t)}
+ @pointerdown=${t=>this._stagePointerDown(t)}
+ @pointermove=${t=>this._stagePointerMove(t)}
+ @pointerup=${t=>this._stagePointerUp(t)}
+ @pointercancel=${t=>this._stagePointerUp(t)}>
+
+
+ ${this._roomDialog?this._renderRoomDialog():B}
+ ${this._spaceDialog?this._renderSpaceDialog():B}
+ ${this._markerDialog?this._renderMarkerDialog():B}
+ ${this._infoCard?this._renderInfoCard():B}
+ ${this._tip?j`
+
+
+ ${this._zoom>1?j`
+ ${s.map(t=>this._renderDevice(t,n))}
+
+ ${Math.round(100*this._zoom)}%
`:B}
+
+ ${this._tip.title}${this._tip.meta?j`${this._tip.meta}`:B}
+ ${null!=this._tip.lqi?j`средний сигнал zigbee:
+ ${this._tip.lqi}`:B}
+
`:B}
+ ${this._toast?j`${this._toast}
`:B}
+ this._clickDevice(e,t)}
+ @mousemove=${e=>this._showTip(e,t.name,t.model+(null!=n?" · "+n+"°":"")+(null!=r?" · LQI "+r:""))}
+ @mouseleave=${()=>this._tip=null}
+ @pointerdown=${e=>this._pointerDown(e,t)}
+ @pointermove=${e=>this._pointerMove(e,t)}
+ @pointerup=${e=>this._pointerUp(e,t)}
+ >
+
`}_roomCenter(t){if(t.poly){const e=t.poly.length;return[t.poly.reduce((t,e)=>t+e[0],0)/e,t.poly.reduce((t,e)=>t+e[1],0)/e]}return[t.x+t.w/2,t.y+.1*Math.min(t.w,t.h)]}_renderMarkupDefs(t){const e=this._gridPitch,i=.14*e;return F`t.stopPropagation()}>
+
`}_renderRoomDialog(){const t=this._freeAreas;return j``}}Ot.properties={hass:{attribute:!1},_config:{state:!0},_space:{state:!0},_layout:{state:!0},_devices:{state:!0},_tip:{state:!0},_selId:{state:!0},_toast:{state:!0},_serverCfg:{state:!0},_markup:{state:!0},_tool:{state:!0},_path:{state:!0},_cursorPt:{state:!0},_areaSel:{state:!0},_nameSel:{state:!0},_roomDialog:{state:!0},_spaceDialog:{state:!0},_infoCard:{state:!0},_markerDialog:{state:!0},_zoom:{state:!0},_view:{state:!0}},Ot.styles=zt,customElements.get("houseplan-card")||customElements.define("houseplan-card",Ot),window.customCards=window.customCards||[],window.customCards.find(t=>"houseplan-card"===t.type)||window.customCards.push({type:"houseplan-card",name:"House Plan Card",description:"Интерактивный план дома: пространства, комнаты, устройства с живыми состояниями и drag-раскладкой."}),console.info("%c HOUSEPLAN-CARD %c v1.10.0 ","background:#3ea6ff;color:#04121f;font-weight:700","");
diff --git a/custom_components/houseplan/http_api.py b/custom_components/houseplan/http_api.py
index 61a5ec0..8c469bd 100644
--- a/custom_components/houseplan/http_api.py
+++ b/custom_components/houseplan/http_api.py
@@ -11,6 +11,11 @@ from pathlib import Path
from aiohttp import web
from homeassistant.components.http import HomeAssistantView
+
+try: # KEY_HASS — современный доступ к hass из aiohttp-приложения
+ from homeassistant.components.http import KEY_HASS
+except ImportError: # старые версии HA
+ KEY_HASS = "hass" # type: ignore[assignment]
from homeassistant.core import HomeAssistant
from .const import CONF_ADMIN_ONLY, DOMAIN, FILES_DIR, FILES_URL
@@ -24,6 +29,8 @@ from .validation import (
_LOGGER = logging.getLogger(__name__)
+_CHUNK = 64 * 1024
+
class HouseplanUploadView(HomeAssistantView):
"""POST /api/houseplan/upload — сохранить файл маркера, вернуть URL."""
@@ -33,7 +40,7 @@ class HouseplanUploadView(HomeAssistantView):
requires_auth = True
async def post(self, request: web.Request) -> web.Response:
- hass: HomeAssistant = request.app["hass"]
+ hass: HomeAssistant = request.app[KEY_HASS]
entry = hass.data.get(DOMAIN, {}).get("entry")
admin_only = bool(entry and entry.options.get(CONF_ADMIN_ONLY, False))
if admin_only:
@@ -44,6 +51,7 @@ class HouseplanUploadView(HomeAssistantView):
marker_id = "misc"
filename: str | None = None
blob: bytes | None = None
+ too_large = False
try:
reader = await request.multipart()
async for part in reader:
@@ -51,11 +59,26 @@ class HouseplanUploadView(HomeAssistantView):
marker_id = sanitize_marker_id(await part.text())
elif part.name == "file":
filename = part.filename or "file"
- blob = await part.read(decode=False)
+ # читаем чанками с обрывом по лимиту, а не весь файл в память
+ chunks: list[bytes] = []
+ size = 0
+ while chunk := await part.read_chunk(_CHUNK):
+ size += len(chunk)
+ if size > MAX_FILE_BYTES:
+ too_large = True
+ break
+ chunks.append(chunk)
+ if too_large:
+ break
+ blob = b"".join(chunks)
except Exception as err: # noqa: BLE001
_LOGGER.warning("House Plan upload: ошибка чтения multipart: %s", err)
return web.json_response({"error": "bad_request"}, status=400)
+ if too_large:
+ return web.json_response(
+ {"error": "too_large", "max_mb": MAX_FILE_BYTES // 1024 // 1024}, status=413
+ )
if blob is None or not filename:
return web.json_response({"error": "no_file"}, status=400)
ext = file_ext(filename)
@@ -63,21 +86,17 @@ class HouseplanUploadView(HomeAssistantView):
return web.json_response(
{"error": "bad_ext", "allowed": sorted(FILE_EXTENSIONS)}, status=400
)
- if len(blob) > MAX_FILE_BYTES:
- return web.json_response(
- {"error": "too_large", "max_mb": MAX_FILE_BYTES // 1024 // 1024}, status=413
- )
safe_name = sanitize_filename(filename)
target_dir = Path(hass.config.path(FILES_DIR)) / marker_id
path = target_dir / safe_name
- def _write() -> None:
+ def _write() -> int:
target_dir.mkdir(parents=True, exist_ok=True)
path.write_bytes(blob)
+ return int(path.stat().st_mtime)
- await hass.async_add_executor_job(_write)
- mtime = int(path.stat().st_mtime)
+ mtime = await hass.async_add_executor_job(_write)
return web.json_response(
{"ok": True, "url": f"{FILES_URL}/{marker_id}/{safe_name}?v={mtime}", "name": filename}
)
diff --git a/custom_components/houseplan/manifest.json b/custom_components/houseplan/manifest.json
index 170ebb3..62714e6 100755
--- a/custom_components/houseplan/manifest.json
+++ b/custom_components/houseplan/manifest.json
@@ -15,5 +15,5 @@
"iot_class": "local_push",
"issue_tracker": "https://github.com/Matysh/houseplan-card/issues",
"requirements": [],
- "version": "1.9.3"
+ "version": "1.10.0"
}
\ No newline at end of file
diff --git a/custom_components/houseplan/websocket_api.py b/custom_components/houseplan/websocket_api.py
index 060ef48..a2e7fa6 100755
--- a/custom_components/houseplan/websocket_api.py
+++ b/custom_components/houseplan/websocket_api.py
@@ -1,6 +1,7 @@
"""WS-команды House Plan: раскладка, конфигурация пространств, загрузка планов."""
from __future__ import annotations
+import asyncio
import base64
import binascii
from pathlib import Path
@@ -13,25 +14,24 @@ from homeassistant.core import HomeAssistant, callback
from .const import (
CONF_ADMIN_ONLY, DEFAULT_CONFIG, DOMAIN,
- FILES_DIR, FILES_URL, PLANS_DIR, PLANS_URL,
+ PLANS_DIR, PLANS_URL,
)
from .validation import (
- CONFIG_SCHEMA, FILE_EXTENSIONS, LAYOUT_SCHEMA, MAX_FILE_BYTES, MAX_PLAN_BYTES,
- PLAN_EXTENSIONS, POS_SCHEMA, file_ext, sanitize_filename, sanitize_marker_id, valid_space_id,
+ CONFIG_SCHEMA, LAYOUT_SCHEMA, MAX_PLAN_BYTES,
+ PLAN_EXTENSIONS, POS_SCHEMA, valid_space_id,
)
-
@callback
def async_register(hass: HomeAssistant) -> None:
"""Регистрация WS-команд."""
websocket_api.async_register_command(hass, ws_layout_get)
websocket_api.async_register_command(hass, ws_layout_set)
websocket_api.async_register_command(hass, ws_layout_update)
+ websocket_api.async_register_command(hass, ws_layout_delete)
websocket_api.async_register_command(hass, ws_config_get)
websocket_api.async_register_command(hass, ws_config_set)
websocket_api.async_register_command(hass, ws_plan_set)
- websocket_api.async_register_command(hass, ws_file_set)
def _store(hass: HomeAssistant):
@@ -42,6 +42,15 @@ def _config_store(hass: HomeAssistant):
return hass.data[DOMAIN]["config_store"]
+def _write_lock(hass: HomeAssistant) -> asyncio.Lock:
+ """Единый лок на цикл load→modify→save обоих хранилищ.
+
+ Без него параллельные WS-вызовы теряют изменения (last-writer-wins),
+ а проверка expected_rev неатомарна.
+ """
+ return hass.data[DOMAIN].setdefault("write_lock", asyncio.Lock())
+
+
def _check_write(hass: HomeAssistant, connection) -> bool:
entry = hass.data[DOMAIN].get("entry")
admin_only = bool(entry and entry.options.get(CONF_ADMIN_ONLY, False))
@@ -68,7 +77,8 @@ async def ws_layout_set(hass: HomeAssistant, connection, msg: dict[str, Any]) ->
if not _check_write(hass, connection):
connection.send_error(msg["id"], "unauthorized", "Правка раскладки разрешена только администраторам")
return
- await _store(hass).async_save({"layout": msg["layout"]})
+ async with _write_lock(hass):
+ await _store(hass).async_save({"layout": msg["layout"]})
connection.send_result(msg["id"], {"ok": True})
@@ -86,10 +96,33 @@ async def ws_layout_update(hass: HomeAssistant, connection, msg: dict[str, Any])
connection.send_error(msg["id"], "unauthorized", "Правка раскладки разрешена только администраторам")
return
store = _store(hass)
- data = await store.async_load() or {}
- layout = data.get("layout", {})
- layout[msg["device_id"]] = msg["pos"]
- await store.async_save({"layout": layout})
+ async with _write_lock(hass):
+ data = await store.async_load() or {}
+ layout = data.get("layout", {})
+ layout[msg["device_id"]] = msg["pos"]
+ await store.async_save({"layout": layout})
+ connection.send_result(msg["id"], {"ok": True})
+
+
+@websocket_api.websocket_command(
+ {
+ vol.Required("type"): "houseplan/layout/delete",
+ vol.Required("device_id"): str,
+ }
+)
+@websocket_api.async_response
+async def ws_layout_delete(hass: HomeAssistant, connection, msg: dict[str, Any]) -> None:
+ """Удалить позицию одного устройства (чистка при удалении маркера)."""
+ if not _check_write(hass, connection):
+ connection.send_error(msg["id"], "unauthorized", "Правка раскладки разрешена только администраторам")
+ return
+ store = _store(hass)
+ async with _write_lock(hass):
+ data = await store.async_load() or {}
+ layout = data.get("layout", {})
+ if msg["device_id"] in layout:
+ del layout[msg["device_id"]]
+ await store.async_save({"layout": layout})
connection.send_result(msg["id"], {"ok": True})
@@ -124,16 +157,17 @@ async def ws_config_set(hass: HomeAssistant, connection, msg: dict[str, Any]) ->
connection.send_error(msg["id"], "unauthorized", "Правка конфигурации разрешена только администраторам")
return
store = _config_store(hass)
- data = await store.async_load() or {}
- current_rev = data.get("rev", 0)
- if "expected_rev" in msg and msg["expected_rev"] != current_rev:
- connection.send_error(
- msg["id"], "conflict",
- f"Конфигурация изменена в другом окне (rev {current_rev} != {msg['expected_rev']})",
- )
- return
- new_rev = current_rev + 1
- await store.async_save({"config": msg["config"], "rev": new_rev})
+ async with _write_lock(hass):
+ data = await store.async_load() or {}
+ current_rev = data.get("rev", 0)
+ if "expected_rev" in msg and msg["expected_rev"] != current_rev:
+ connection.send_error(
+ msg["id"], "conflict",
+ f"Конфигурация изменена в другом окне (rev {current_rev} != {msg['expected_rev']})",
+ )
+ return
+ new_rev = current_rev + 1
+ await store.async_save({"config": msg["config"], "rev": new_rev})
hass.bus.async_fire("houseplan_config_updated", {"rev": new_rev})
connection.send_result(msg["id"], {"ok": True, "rev": new_rev})
@@ -171,7 +205,7 @@ async def ws_plan_set(hass: HomeAssistant, connection, msg: dict[str, Any]) -> N
plans_dir = Path(hass.config.path(PLANS_DIR))
path = plans_dir / f"{space_id}.{msg['ext']}"
- def _write() -> None:
+ def _write() -> int:
plans_dir.mkdir(parents=True, exist_ok=True)
# убрать старые варианты с другим расширением
for old_ext in PLAN_EXTENSIONS:
@@ -179,52 +213,9 @@ async def ws_plan_set(hass: HomeAssistant, connection, msg: dict[str, Any]) -> N
if old_ext != msg["ext"] and old.exists():
old.unlink()
path.write_bytes(raw)
+ return int(path.stat().st_mtime)
- await hass.async_add_executor_job(_write)
- mtime = int(path.stat().st_mtime)
+ mtime = await hass.async_add_executor_job(_write)
connection.send_result(
msg["id"], {"ok": True, "url": f"{PLANS_URL}/{space_id}.{msg['ext']}?v={mtime}"}
)
-
-
-@websocket_api.websocket_command(
- {
- vol.Required("type"): "houseplan/file/set",
- vol.Required("marker_id"): str,
- vol.Required("filename"): str,
- vol.Required("data"): str, # base64
- }
-)
-@websocket_api.async_response
-async def ws_file_set(hass: HomeAssistant, connection, msg: dict[str, Any]) -> None:
- """Загрузить файл-инструкцию (PDF и т.п.) для маркера; вернуть URL."""
- if not _check_write(hass, connection):
- connection.send_error(msg["id"], "unauthorized", "Загрузка файлов разрешена только администраторам")
- return
- marker_id = sanitize_marker_id(msg["marker_id"])
- raw_name = msg["filename"].rsplit("/", 1)[-1].rsplit("\\", 1)[-1]
- ext = file_ext(raw_name)
- if ext not in FILE_EXTENSIONS:
- connection.send_error(msg["id"], "bad_ext", f"Разрешены: {', '.join(sorted(FILE_EXTENSIONS))}")
- return
- safe_name = sanitize_filename(raw_name)
- try:
- blob = base64.b64decode(msg["data"], validate=True)
- except (binascii.Error, ValueError):
- connection.send_error(msg["id"], "invalid_data", "data должен быть корректным base64")
- return
- if len(blob) > MAX_FILE_BYTES:
- connection.send_error(msg["id"], "too_large", f"Файл больше {MAX_FILE_BYTES // 1024 // 1024} МБ")
- return
- target_dir = Path(hass.config.path(FILES_DIR)) / marker_id
- path = target_dir / safe_name
-
- def _write() -> None:
- target_dir.mkdir(parents=True, exist_ok=True)
- path.write_bytes(blob)
-
- await hass.async_add_executor_job(_write)
- mtime = int(path.stat().st_mtime)
- connection.send_result(
- msg["id"], {"ok": True, "url": f"{FILES_URL}/{marker_id}/{safe_name}?v={mtime}", "name": raw_name}
- )
diff --git a/dist/houseplan-card.js b/dist/houseplan-card.js
index dc54475..5499d40 100755
--- a/dist/houseplan-card.js
+++ b/dist/houseplan-card.js
@@ -1,321 +1,10 @@
-const t=globalThis,e=t.ShadowRoot&&(void 0===t.ShadyCSS||t.ShadyCSS.nativeShadow)&&"adoptedStyleSheets"in Document.prototype&&"replace"in CSSStyleSheet.prototype,i=Symbol(),s=new WeakMap;let a=class{constructor(t,e,s){if(this._$cssResult$=!0,s!==i)throw Error("CSSResult is not constructable. Use `unsafeCSS` or `css` instead.");this.cssText=t,this.t=e}get styleSheet(){let t=this.o;const i=this.t;if(e&&void 0===t){const e=void 0!==i&&1===i.length;e&&(t=s.get(i)),void 0===t&&((this.o=t=new CSSStyleSheet).replaceSync(this.cssText),e&&s.set(i,t))}return t}toString(){return this.cssText}};const o=e?t=>t:t=>t instanceof CSSStyleSheet?(t=>{let e="";for(const i of t.cssRules)e+=i.cssText;return(t=>new a("string"==typeof t?t:t+"",void 0,i))(e)})(t):t,{is:n,defineProperty:r,getOwnPropertyDescriptor:l,getOwnPropertyNames:h,getOwnPropertySymbols:c,getPrototypeOf:d}=Object,p=globalThis,_=p.trustedTypes,u=_?_.emptyScript:"",g=p.reactiveElementPolyfillSupport,m=(t,e)=>t,f={toAttribute(t,e){switch(e){case Boolean:t=t?u:null;break;case Object:case Array:t=null==t?t:JSON.stringify(t)}return t},fromAttribute(t,e){let i=t;switch(e){case Boolean:i=null!==t;break;case Number:i=null===t?null:Number(t);break;case Object:case Array:try{i=JSON.parse(t)}catch(t){i=null}}return i}},v=(t,e)=>!n(t,e),b={attribute:!0,type:String,converter:f,reflect:!1,useDefault:!1,hasChanged:v};Symbol.metadata??=Symbol("metadata"),p.litPropertyMetadata??=new WeakMap;let y=class extends HTMLElement{static addInitializer(t){this._$Ei(),(this.l??=[]).push(t)}static get observedAttributes(){return this.finalize(),this._$Eh&&[...this._$Eh.keys()]}static createProperty(t,e=b){if(e.state&&(e.attribute=!1),this._$Ei(),this.prototype.hasOwnProperty(t)&&((e=Object.create(e)).wrapped=!0),this.elementProperties.set(t,e),!e.noAccessor){const i=Symbol(),s=this.getPropertyDescriptor(t,i,e);void 0!==s&&r(this.prototype,t,s)}}static getPropertyDescriptor(t,e,i){const{get:s,set:a}=l(this.prototype,t)??{get(){return this[e]},set(t){this[e]=t}};return{get:s,set(e){const o=s?.call(this);a?.call(this,e),this.requestUpdate(t,o,i)},configurable:!0,enumerable:!0}}static getPropertyOptions(t){return this.elementProperties.get(t)??b}static _$Ei(){if(this.hasOwnProperty(m("elementProperties")))return;const t=d(this);t.finalize(),void 0!==t.l&&(this.l=[...t.l]),this.elementProperties=new Map(t.elementProperties)}static finalize(){if(this.hasOwnProperty(m("finalized")))return;if(this.finalized=!0,this._$Ei(),this.hasOwnProperty(m("properties"))){const t=this.properties,e=[...h(t),...c(t)];for(const i of e)this.createProperty(i,t[i])}const t=this[Symbol.metadata];if(null!==t){const e=litPropertyMetadata.get(t);if(void 0!==e)for(const[t,i]of e)this.elementProperties.set(t,i)}this._$Eh=new Map;for(const[t,e]of this.elementProperties){const i=this._$Eu(t,e);void 0!==i&&this._$Eh.set(i,t)}this.elementStyles=this.finalizeStyles(this.styles)}static finalizeStyles(t){const e=[];if(Array.isArray(t)){const i=new Set(t.flat(1/0).reverse());for(const t of i)e.unshift(o(t))}else void 0!==t&&e.push(o(t));return e}static _$Eu(t,e){const i=e.attribute;return!1===i?void 0:"string"==typeof i?i:"string"==typeof t?t.toLowerCase():void 0}constructor(){super(),this._$Ep=void 0,this.isUpdatePending=!1,this.hasUpdated=!1,this._$Em=null,this._$Ev()}_$Ev(){this._$ES=new Promise(t=>this.enableUpdating=t),this._$AL=new Map,this._$E_(),this.requestUpdate(),this.constructor.l?.forEach(t=>t(this))}addController(t){(this._$EO??=new Set).add(t),void 0!==this.renderRoot&&this.isConnected&&t.hostConnected?.()}removeController(t){this._$EO?.delete(t)}_$E_(){const t=new Map,e=this.constructor.elementProperties;for(const i of e.keys())this.hasOwnProperty(i)&&(t.set(i,this[i]),delete this[i]);t.size>0&&(this._$Ep=t)}createRenderRoot(){const i=this.shadowRoot??this.attachShadow(this.constructor.shadowRootOptions);return((i,s)=>{if(e)i.adoptedStyleSheets=s.map(t=>t instanceof CSSStyleSheet?t:t.styleSheet);else for(const e of s){const s=document.createElement("style"),a=t.litNonce;void 0!==a&&s.setAttribute("nonce",a),s.textContent=e.cssText,i.appendChild(s)}})(i,this.constructor.elementStyles),i}connectedCallback(){this.renderRoot??=this.createRenderRoot(),this.enableUpdating(!0),this._$EO?.forEach(t=>t.hostConnected?.())}enableUpdating(t){}disconnectedCallback(){this._$EO?.forEach(t=>t.hostDisconnected?.())}attributeChangedCallback(t,e,i){this._$AK(t,i)}_$ET(t,e){const i=this.constructor.elementProperties.get(t),s=this.constructor._$Eu(t,i);if(void 0!==s&&!0===i.reflect){const a=(void 0!==i.converter?.toAttribute?i.converter:f).toAttribute(e,i.type);this._$Em=t,null==a?this.removeAttribute(s):this.setAttribute(s,a),this._$Em=null}}_$AK(t,e){const i=this.constructor,s=i._$Eh.get(t);if(void 0!==s&&this._$Em!==s){const t=i.getPropertyOptions(s),a="function"==typeof t.converter?{fromAttribute:t.converter}:void 0!==t.converter?.fromAttribute?t.converter:f;this._$Em=s;const o=a.fromAttribute(e,t.type);this[s]=o??this._$Ej?.get(s)??o,this._$Em=null}}requestUpdate(t,e,i,s=!1,a){if(void 0!==t){const o=this.constructor;if(!1===s&&(a=this[t]),i??=o.getPropertyOptions(t),!((i.hasChanged??v)(a,e)||i.useDefault&&i.reflect&&a===this._$Ej?.get(t)&&!this.hasAttribute(o._$Eu(t,i))))return;this.C(t,e,i)}!1===this.isUpdatePending&&(this._$ES=this._$EP())}C(t,e,{useDefault:i,reflect:s,wrapped:a},o){i&&!(this._$Ej??=new Map).has(t)&&(this._$Ej.set(t,o??e??this[t]),!0!==a||void 0!==o)||(this._$AL.has(t)||(this.hasUpdated||i||(e=void 0),this._$AL.set(t,e)),!0===s&&this._$Em!==t&&(this._$Eq??=new Set).add(t))}async _$EP(){this.isUpdatePending=!0;try{await this._$ES}catch(t){Promise.reject(t)}const t=this.scheduleUpdate();return null!=t&&await t,!this.isUpdatePending}scheduleUpdate(){return this.performUpdate()}performUpdate(){if(!this.isUpdatePending)return;if(!this.hasUpdated){if(this.renderRoot??=this.createRenderRoot(),this._$Ep){for(const[t,e]of this._$Ep)this[t]=e;this._$Ep=void 0}const t=this.constructor.elementProperties;if(t.size>0)for(const[e,i]of t){const{wrapped:t}=i,s=this[e];!0!==t||this._$AL.has(e)||void 0===s||this.C(e,void 0,i,s)}}let t=!1;const e=this._$AL;try{t=this.shouldUpdate(e),t?(this.willUpdate(e),this._$EO?.forEach(t=>t.hostUpdate?.()),this.update(e)):this._$EM()}catch(e){throw t=!1,this._$EM(),e}t&&this._$AE(e)}willUpdate(t){}_$AE(t){this._$EO?.forEach(t=>t.hostUpdated?.()),this.hasUpdated||(this.hasUpdated=!0,this.firstUpdated(t)),this.updated(t)}_$EM(){this._$AL=new Map,this.isUpdatePending=!1}get updateComplete(){return this.getUpdateComplete()}getUpdateComplete(){return this._$ES}shouldUpdate(t){return!0}update(t){this._$Eq&&=this._$Eq.forEach(t=>this._$ET(t,this[t])),this._$EM()}updated(t){}firstUpdated(t){}};y.elementStyles=[],y.shadowRootOptions={mode:"open"},y[m("elementProperties")]=new Map,y[m("finalized")]=new Map,g?.({ReactiveElement:y}),(p.reactiveElementVersions??=[]).push("2.1.2");const x=globalThis,$=t=>t,w=x.trustedTypes,k=w?w.createPolicy("lit-html",{createHTML:t=>t}):void 0,S="$lit$",C=`lit$${Math.random().toFixed(9).slice(2)}$`,A="?"+C,z=`<${A}>`,D=document,M=()=>D.createComment(""),P=t=>null===t||"object"!=typeof t&&"function"!=typeof t,E=Array.isArray,R="[ \t\n\f\r]",T=/<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g,O=/-->/g,U=/>/g,H=RegExp(`>|${R}(?:([^\\s"'>=/]+)(${R}*=${R}*(?:[^ \t\n\f\r"'\`<>=]|("|')|))|$)`,"g"),N=/'/g,I=/"/g,q=/^(?:script|style|textarea|title)$/i,F=t=>(e,...i)=>({_$litType$:t,strings:e,values:i}),L=F(1),j=F(2),B=Symbol.for("lit-noChange"),W=Symbol.for("lit-nothing"),K=new WeakMap,V=D.createTreeWalker(D,129);function Z(t,e){if(!E(t)||!t.hasOwnProperty("raw"))throw Error("invalid template strings array");return void 0!==k?k.createHTML(e):e}const Y=(t,e)=>{const i=t.length-1,s=[];let a,o=2===e?"":3===e?"":"")),s]};class X{constructor({strings:t,_$litType$:e},i){let s;this.parts=[];let a=0,o=0;const n=t.length-1,r=this.parts,[l,h]=Y(t,e);if(this.el=X.createElement(l,i),V.currentNode=this.el.content,2===e||3===e){const t=this.el.content.firstChild;t.replaceWith(...t.childNodes)}for(;null!==(s=V.nextNode())&&r.lengtht.stopPropagation()}>
+
+
+
+ this._spaceDialog={...t,title:e.target.value}} />
+
+
+
+ ${t.planFile?j`${t.planFile.name}`:t.planUrl?j``:j`нет подложки`}
+
+
+
+ ${"edit"===t.mode?j``:B}
+
+
+
+
+
-
-
-
- ${this._spaceDialog?this._renderSpaceDialog():W}
- ${this._toast?L`Пространств пока нет.
- ${this._serverStorage?L`Добавьте первое пространство и загрузите план этажа.
- `:L`Установите интеграцию House Plan и добавьте запись в «Устройства и службы».
`} -${this._toast}
`:W}
-
-
-
-
-
- ${this._markup?this._renderMarkupBar():W}
-
-
-
- ${t.map(t=>L``)}
- ${this._norm?L``:W}
-
- ${s.length} устр.
-
-
-
-
-
-
- ${this._norm?L``:W}
- ${this._norm?L`
- `:W}
-
- this._markupClick(t)}
- @wheel=${t=>this._onWheel(t)}
- @pointerdown=${t=>this._stagePointerDown(t)}
- @pointermove=${t=>this._stagePointerMove(t)}
- @pointerup=${t=>this._stagePointerUp(t)}
- @pointercancel=${t=>this._stagePointerUp(t)}>
-
-
- ${this._roomDialog?this._renderRoomDialog():W}
- ${this._spaceDialog?this._renderSpaceDialog():W}
- ${this._markerDialog?this._renderMarkerDialog():W}
- ${this._infoCard?this._renderInfoCard():W}
- ${this._tip?L`
-
-
- ${this._zoom>1?L`
- ${s.map(t=>this._renderDevice(t,n))}
-
- ${Math.round(100*this._zoom)}%
`:W}
-
- ${this._tip.title}${this._tip.meta?L`${this._tip.meta}`:W}
- ${null!=this._tip.lqi?L`средний сигнал zigbee:
- ${this._tip.lqi}`:W}
-
`:W}
- ${this._toast?L`${this._toast}
`:W}
- this._clickDevice(e,t)}
- @mousemove=${e=>this._showTip(e,t.name,t.model+(null!=n?" · "+n+"°":"")+(null!=r?" · LQI "+r:""))}
- @mouseleave=${()=>this._tip=null}
- @pointerdown=${e=>this._pointerDown(e,t)}
- @pointermove=${e=>this._pointerMove(e,t)}
- @pointerup=${e=>this._pointerUp(e,t)}
- >
-
`}_roomCenter(t){if(t.poly){const e=t.poly.length;return[t.poly.reduce((t,e)=>t+e[0],0)/e,t.poly.reduce((t,e)=>t+e[1],0)/e]}return[t.x+t.w/2,t.y+.1*Math.min(t.w,t.h)]}_renderMarkupDefs(t){const e=this._gridPitch,i=.14*e;return j`t.stopPropagation()}>
-
`}_renderRoomDialog(){const t=this._freeAreas;return L``}}At.properties={hass:{attribute:!1},_config:{state:!0},_space:{state:!0},_layout:{state:!0},_devices:{state:!0},_tip:{state:!0},_selId:{state:!0},_toast:{state:!0},_serverCfg:{state:!0},_markup:{state:!0},_tool:{state:!0},_path:{state:!0},_cursorPt:{state:!0},_areaSel:{state:!0},_nameSel:{state:!0},_roomDialog:{state:!0},_spaceDialog:{state:!0},_infoCard:{state:!0},_markerDialog:{state:!0},_zoom:{state:!0},_view:{state:!0}},At.styles=((t,...e)=>{const s=1===t.length?t[0]:e.reduce((e,i,s)=>e+(t=>{if(!0===t._$cssResult$)return t.cssText;if("number"==typeof t)return t;throw Error("Value passed to 'css' function must be a 'css' function result: "+t+". Use 'unsafeCSS' to pass non-literal values, but take care to ensure page security.")})(i)+t[s+1],t[0]);return new a(s,t,i)})`
+ >`):B}_valueChanged(t){const e={...this._config,...t.detail.value},i=new Event("config-changed",{bubbles:!0,composed:!0});i.detail={config:e},this.dispatchEvent(i)}}At.properties={hass:{attribute:!1},_config:{state:!0},_spaces:{state:!0}},customElements.get("houseplan-card-editor")||customElements.define("houseplan-card-editor",At);const zt=((t,...e)=>{const s=1===t.length?t[0]:e.reduce((e,i,s)=>e+(t=>{if(!0===t._$cssResult$)return t.cssText;if("number"==typeof t)return t;throw Error("Value passed to 'css' function must be a 'css' function result: "+t+". Use 'unsafeCSS' to pass non-literal values, but take care to ensure page security.")})(i)+t[s+1],t[0]);return new a(s,t,i)})`
:host {
--hp-bg: var(--card-background-color, #16212e);
--hp-line: var(--divider-color, #2b3d4f);
@@ -1038,4 +727,315 @@ const t=globalThis,e=t.ShadowRoot&&(void 0===t.ShadyCSS||t.ShadyCSS.nativeShadow
z-index: 120;
max-width: 90vw;
}
- `,customElements.get("houseplan-card")||customElements.define("houseplan-card",At),window.customCards=window.customCards||[],window.customCards.find(t=>"houseplan-card"===t.type)||window.customCards.push({type:"houseplan-card",name:"House Plan Card",description:"Интерактивный план дома: пространства, комнаты, устройства с живыми состояниями и drag-раскладкой."}),console.info("%c HOUSEPLAN-CARD %c v1.9.3 ","background:#3ea6ff;color:#04121f;font-weight:700","");
+ `,Mt="houseplan_card_layout_v1",Dt="houseplan_card_cfg_v1",Pt="houseplan_card_zoom_v1",Et=1e3,Rt=(t,e,i)=>{const s=new Event(e,{bubbles:!0,composed:!0});s.detail=i??{},t.dispatchEvent(s)},Tt=(t,e)=>{let i;return(...s)=>{clearTimeout(i),i=window.setTimeout(()=>t(...s),e)}};class Ot extends rt{constructor(){super(...arguments),this._space="f1",this._layout={},this._serverStorage=!1,this._loadOk=!1,this._loading=!1,this._loadTries=0,this._serverCfg=null,this._cfgRev=0,this._unsubCfg=null,this._devices=[],this._regSignature="",this._defPos={},this._tip=null,this._selId=null,this._toast="",this._markup=!1,this._tool="draw",this._path=[],this._pathSegs=[],this._cursorPt=null,this._areaSel="",this._nameSel="",this._roomDialog=!1,this._zoom=1,this._view=null,this._zoomBySpace={},this._pointers=new Map,this._panStart=null,this._pinchStart=null,this._suppressClick=!1,this._onboardingShown=!1,this._infoCard=null,this._markerDialog=null,this._spaceDialog=null,this._keyHandler=t=>this._onKey(t),this._drag=null,this._dirtyPos=new Set,this._persistLayout=Tt(()=>{if(this._serverStorage){const t=[...this._dirtyPos];this._dirtyPos.clear();for(const e of t){const t=this._layout[e];t&&this.hass.callWS({type:"houseplan/layout/update",device_id:e,pos:t}).catch(t=>this._showToast("Не удалось сохранить позицию: "+(t?.message||t)))}this._cacheSnapshot()}else localStorage.setItem(Mt,JSON.stringify(this._layout))},600),this._saveConfig=Tt(()=>{this._serverCfg&&this.hass.callWS({type:"houseplan/config/set",config:this._serverCfg,expected_rev:this._cfgRev}).then(t=>{this._cfgRev=t?.rev??this._cfgRev+1}).catch(t=>{"conflict"===t?.code?(this._showToast("Конфиг изменён в другом окне — данные обновлены, повторите последнее действие"),this._cancelPath(),this._reloadConfigOnly()):this._showToast("Не удалось сохранить конфиг: "+(t?.message||t))})},500)}connectedCallback(){super.connectedCallback(),window.addEventListener("keydown",this._keyHandler)}disconnectedCallback(){window.removeEventListener("keydown",this._keyHandler),this._roViewport?.disconnect(),this._roViewport=void 0,this._unsubCfg&&(this._unsubCfg(),this._unsubCfg=null),super.disconnectedCallback()}_onKey(t){if("Escape"===t.key){if(this._infoCard)return void(this._infoCard=null);if(this._markerDialog)return void(this._markerDialog=null)}if(!this._markup)return;return"Escape"===t.key||(t.ctrlKey||t.metaKey)&&"z"===t.key.toLowerCase()?this._roomDialog?(t.preventDefault(),void this._roomDialogCancel()):void("draw"===this._tool&&this._path.length&&(t.preventDefault(),this._undoPoint())):void 0}_undoPoint(){if(!this._path.length)return;if(1===this._path.length)return this._path=[],void(this._pathSegs=[]);const t=this._pathSegs[this._pathSegs.length-1];this._pathSegs=this._pathSegs.slice(0,-1),t&&this._removeSegmentByKey(t),this._path=this._path.slice(0,-1)}_removeSegmentByKey(t){const e=this._curSpaceCfg;if(!e?.segments)return;const i=this._segments.findIndex(e=>this._segKey([e[0],e[1]],[e[2],e[3]])===t);i>=0&&(e.segments.splice(i,1),this._saveConfig())}static getConfigElement(){return document.createElement("houseplan-card-editor")}static getStubConfig(){return{type:"custom:houseplan-card",title:"План дома"}}setConfig(t){this._config={icon_size:2.5,show_temperature:!0,live_states:!0,show_signal:!0,...t},t.default_floor&&(this._space=t.default_floor);try{this._zoomBySpace=JSON.parse(localStorage.getItem(Pt)||"{}")||{}}catch{this._zoomBySpace={}}try{const e=JSON.parse(localStorage.getItem(Dt)||"null");e&&e.config&&Array.isArray(e.config.spaces)&&(this._serverCfg=e.config,this._cfgRev=e.rev||0,this._layout=e.layout||{},this._serverStorage=!0,t.default_floor?this._space=t.default_floor:this._model.find(t=>t.id===this._space)||(this._space=this._model[0]?.id||this._space))}catch{}}_cacheSnapshot(){if(this._serverCfg)try{localStorage.setItem(Dt,JSON.stringify({config:this._serverCfg,rev:this._cfgRev,layout:this._layout}))}catch{}}getCardSize(){return 12}get _norm(){return!(!this._serverCfg||!this._serverCfg.spaces.length)}get _model(){return this._serverCfg?this._serverCfg.spaces.map(t=>{const e=Et/t.aspect;return{id:t.id,title:t.title,vb:[t.view_box[0]*Et,t.view_box[1]*e,t.view_box[2]*Et,t.view_box[3]*e],bg:t.plan_url?{href:t.plan_url,x:0,y:0,w:Et,h:e}:null,rooms:t.rooms.map(t=>({id:t.id,name:t.name,area:t.area??null,x:null!=t.x?t.x*Et:void 0,y:null!=t.y?t.y*e:void 0,w:null!=t.w?t.w*Et:void 0,h:null!=t.h?t.h*e:void 0,poly:t.poly?t.poly.map(t=>[t[0]*Et,t[1]*e]):void 0}))}}):[]}_spaceModel(t){const e=this._model;return e.find(e=>e.id===(t??this._space))||e[0]}get _areaToSpace(){const t={};for(const e of this._model)for(const i of e.rooms)i.area&&(t[i.area]={space:e.id,room:i});return t}get _settings(){return this._serverCfg?.settings||{}}get _showAll(){return!!this._settings.show_all}_toggleShowAll(){this._serverCfg&&(this._serverCfg={...this._serverCfg,settings:{...this._serverCfg.settings,show_all:!this._showAll}},this._regSignature="",this._maybeRebuildDevices(),this._saveConfig(),this.requestUpdate())}get _excluded(){const t=this._settings.exclude_integrations;return t?new Set(t):ct}willUpdate(t){t.has("hass")&&this.hass&&(!this._loadOk&&!this._loading&&this._loadTries<8&&this._loadFromServer(),this._maybeRebuildDevices())}updated(){const t=this._stageEl;t&&!this._roViewport&&(this._roViewport=new ResizeObserver(()=>this._refitView()),this._roViewport.observe(t)),t&&!this._view&&this._refitView(),this._serverStorage&&this._loadOk&&0===this._model.length&&!this._spaceDialog&&!this._onboardingShown&&(this._onboardingShown=!0,this._openSpaceDialog("create"))}async _loadFromServer(){this._loading=!0,this._loadTries++;try{const[t,e]=await Promise.all([this.hass.callWS({type:"houseplan/config/get"}),this.hass.callWS({type:"houseplan/layout/get"})]);this._loadOk=!0,this._serverStorage=!0;const i=t?.config;this._serverCfg=i&&Array.isArray(i.spaces)?i:null,this._cfgRev=t?.rev||0,this._layout=e?.layout||{},this._unsubCfg||(this._unsubCfg=await this.hass.connection.subscribeEvents(t=>{(t?.data?.rev??-1)!==this._cfgRev&&this._reloadConfigOnly()},"houseplan_config_updated")),this._norm&&!this._model.find(t=>t.id===this._space)&&(this._space=this._model[0]?.id||this._space),this._cacheSnapshot(),this._restoreZoom()}catch(t){if(this._loadTries>=8){this._serverStorage=!1,this._serverCfg=null;try{this._layout=JSON.parse(localStorage.getItem(Mt)||"{}")||{}}catch{this._layout={}}}}finally{this._loading=!1}this._regSignature="",this.requestUpdate()}async _reloadConfigOnly(){try{const t=await this.hass.callWS({type:"houseplan/config/get"}),e=t?.config;this._serverCfg=e&&Array.isArray(e.spaces)?e:null,this._cfgRev=t?.rev||0,this._cacheSnapshot(),this._regSignature="",this._maybeRebuildDevices(),this.requestUpdate()}catch{}}_maybeRebuildDevices(){const t=this.hass;if(!t?.devices||!t?.entities||!t?.areas)return;const e=Object.keys(t.devices).length+":"+Object.keys(t.entities).length+":"+Object.keys(t.areas).length+":"+(this._norm?"n":"l");e===this._regSignature&&this._devices.length||(this._regSignature=e,this._devices=St({hass:t,areaToSpace:Object.fromEntries(Object.entries(this._areaToSpace).map(([t,e])=>[t,e.space])),markers:this._markers,settings:this._settings,excluded:this._excluded,showAll:this._showAll,firstSpaceId:this._model[0]?.id||""}),this._defPos=this._defaultPositions())}get _markers(){return this._serverCfg?.markers||[]}_roomLqi(t){if(!t)return null;const e=[];for(const i of this._devices){if(i.area!==t||i.virtual)continue;const s=$t(this.hass,i.entities);null!=s&&e.push(s)}return gt(e)}_roomBounds(t){if(t.poly&&t.poly.length){const e=t.poly.map(t=>t[0]),i=t.poly.map(t=>t[1]),s=Math.min(...e),a=Math.min(...i);return{x:s,y:a,w:Math.max(...e)-s,h:Math.max(...i)-a}}return{x:t.x??0,y:t.y??0,w:t.w??0,h:t.h??0}}_defaultPositions(){const t={},e=(this._config?.icon_size??2.5)/100*Et*1.3;for(const i of this._model)for(const s of i.rooms){if(!s.area)continue;const a=this._devices.filter(t=>t.area===s.area&&t.space===i.id);if(!a.length)continue;const o=this._roomBounds(s),n=.1*Math.min(o.w,o.h),r=o.w-2*n,l=o.h-2*n,c=Math.max(1,Math.round(Math.sqrt(a.length*r/Math.max(l,1)))),h=Math.ceil(a.length/c),d=r/c,p=l/Math.max(h,1),u=a.map((t,e)=>({x:o.x+n+d*(e%c+.5),y:o.y+n+p*(Math.floor(e/c)+.5)}));ft(u,o,e,.5*n),a.forEach((e,i)=>t[e.id]=u[i])}return t}_pos(t){const e=this._spaceModel(t.space),i=this._layout[t.id];if(i)if(this._norm){if(i.s===t.space){const e=this._serverCfg.spaces.find(e=>e.id===t.space)?.aspect||1;return{x:i.x*Et,y:i.y*(Et/e)}}}else if(void 0===i.s)return{x:i.x,y:i.y};if(this._defPos[t.id])return this._defPos[t.id];const s=e.vb;return{x:s[0]+s[2]/2,y:s[1]+s[3]/2}}_savePos(t,e,i){if(this._norm){const s=this._gridPitch,a=Math.round(e/s)*s,o=Math.round(i/s)*s,n=this._serverCfg.spaces.find(e=>e.id===t.space)?.aspect||1;this._layout={...this._layout,[t.id]:{s:t.space,x:a/Et,y:o/(Et/n)}}}else this._layout={...this._layout,[t.id]:{x:Math.round(e),y:Math.round(i)}};this._dirtyPos.add(t.id),this._persistLayout()}_stateClass(t){if(!this._config?.live_states)return"";const e=t.primary?this.hass.states[t.primary]:void 0;if(!e)return"";if("unavailable"===e.state)return"unavail";const i=e.entity_id.split(".")[0];if(["light","switch","fan","humidifier"].includes(i))return"on"===e.state?"on":"";if("cover"===i||"valve"===i)return["open","opening"].includes(e.state)?"open":"";if("lock"===i)return["unlocked","open"].includes(e.state)?"open":"";if("binary_sensor"===i){const t=e.attributes?.device_class;if(["door","window","garage_door","opening","gas","smoke","moisture","problem"].includes(t))return"on"===e.state?"open":""}return"media_player"===i?["playing","on"].includes(e.state)?"on":"":"vacuum"===i&&["cleaning","returning"].includes(e.state)?"on":""}_liveTemp(t){return this._config?.show_temperature?"mdi:thermometer"!==t.icon&&"mdi:air-filter"!==t.icon?null:wt(this.hass,t.entities):null}_openMoreInfo(t){t?Rt(this,"hass-more-info",{entityId:t}):this._showToast("У устройства нет подходящей сущности")}_clickDevice(t,e){t.stopPropagation(),this._drag?.moved||this._suppressClick||this._markup||(this._infoCard=e)}get _stageEl(){return this.renderRoot.querySelector(".stage")}_stageAspect(){const t=this._stageEl,e=this._spaceModel().vb;return t&&t.clientHeight?t.clientWidth/t.clientHeight:e[2]/e[3]}_viewOr(t){return this._view&&this._view.w?this._view:mt(t,this._stageAspect())}_screenToVb(t,e){const i=this._stageEl,s=this._viewOr(this._spaceModel().vb),a=i?.clientWidth||1,o=i?.clientHeight||1;return[s.x+t/a*s.w,s.y+e/o*s.h]}_clampView(t,e){return{w:t.w,h:t.h,x:Math.max(e.x,Math.min(e.x+e.w-t.w,t.x)),y:Math.max(e.y,Math.min(e.y+e.h-t.h,t.y))}}_applyView(t,e,i){const s=this._spaceModel().vb,a=mt(s,this._stageAspect()),o=Math.min(8,Math.max(1,t)),n=a.w/o,r=a.h/o,l=this._viewOr(s),c=e??l.x+l.w/2,h=i??l.y+l.h/2;this._zoom=o,this._view=this._clampView({x:c-n/2,y:h-r/2,w:n,h:r},a)}_refitView(){if(!this._stageEl)return;const t=this._view;this._applyView(this._zoom,t?t.x+t.w/2:void 0,t?t.y+t.h/2:void 0),this.requestUpdate()}_zoomAt(t,e,i){const s=this._stageEl;if(!s)return;const a=mt(this._spaceModel().vb,this._stageAspect()),o=Math.min(8,Math.max(1,i)),n=s.clientWidth,r=s.clientHeight,l=this._screenToVb(t,e),c=a.w/o,h=a.h/o;this._zoom=o,this._view=this._clampView({x:l[0]-t/n*c,y:l[1]-e/r*h,w:c,h:h},a)}_onWheel(t){const e=this._stageEl;if(!e)return;t.preventDefault();const i=e.getBoundingClientRect(),s=t.deltaY<0?1.15:1/1.15;this._zoomAt(t.clientX-i.left,t.clientY-i.top,this._zoom*s),this._saveZoom()}_stepZoom(t){const e=this._stageEl;e&&(this._zoomAt(e.clientWidth/2,e.clientHeight/2,this._zoom*(t>0?1.4:1/1.4)),this._saveZoom())}_resetZoom(){const t=this._spaceModel().vb;this._zoom=1,this._view=mt(t,this._stageAspect()),this._saveZoom()}_saveZoom(){this._zoomBySpace={...this._zoomBySpace,[this._space]:this._zoom};try{localStorage.setItem(Pt,JSON.stringify(this._zoomBySpace))}catch{}}_restoreZoom(){const t=this._zoomBySpace[this._space]||1;this._zoom=t,this._view=null,requestAnimationFrame(()=>{if(!this._stageEl)return;const e=this._spaceModel().vb;this._applyView(t,e[0]+e[2]/2,e[1]+e[3]/2),this.requestUpdate()})}_stagePointerDown(t){if(this._drag||this._markup)return;if(t.target.closest(".dev"))return;this._pointers.set(t.pointerId,{x:t.clientX,y:t.clientY});const e=this._viewOr(this._spaceModel().vb);if(1===this._pointers.size)this._panStart={sx:t.clientX,sy:t.clientY,vx:e.x,vy:e.y},this._suppressClick=!1;else if(2===this._pointers.size){const t=[...this._pointers.values()],e=Math.hypot(t[0].x-t[1].x,t[0].y-t[1].y);this._pinchStart={dist:e,zoom:this._zoom},this._panStart=null}}_stagePointerMove(t){if(this._pointers.has(t.pointerId)){if(this._pointers.set(t.pointerId,{x:t.clientX,y:t.clientY}),this._pinchStart&&this._pointers.size>=2){const t=[...this._pointers.values()],e=Math.hypot(t[0].x-t[1].x,t[0].y-t[1].y)/(this._pinchStart.dist||1),i=this._stageEl.getBoundingClientRect(),s=(t[0].x+t[1].x)/2-i.left,a=(t[0].y+t[1].y)/2-i.top;this._zoomAt(s,a,this._pinchStart.zoom*e),this._suppressClick=!0,this._saveZoom()}else if(this._panStart){const e=t.clientX-this._panStart.sx,i=t.clientY-this._panStart.sy;if(Math.abs(e)+Math.abs(i)>4&&(this._suppressClick=!0),this._zoom>1&&this._view){const t=this._stageEl,s=this._view,a=mt(this._spaceModel().vb,this._stageAspect());this._view=this._clampView({x:this._panStart.vx-e/t.clientWidth*s.w,y:this._panStart.vy-i/t.clientHeight*s.h,w:s.w,h:s.h},a)}}}else this._markupMove(t)}_stagePointerUp(t){this._pointers.delete(t.pointerId),this._pointers.size<2&&(this._pinchStart=null),0===this._pointers.size&&(this._panStart=null,setTimeout(()=>this._suppressClick=!1,0))}_clickRoom(t){var e;!this._suppressClick&&t.area&&(e="/config/areas/area/"+t.area,history.pushState(null,"",e),Rt(window,"location-changed",{replace:!1}))}_pointerDown(t,e){if(this._markup)return;t.preventDefault();const i=this._pos(e);this._drag={id:e.id,sx:t.clientX,sy:t.clientY,ox:i.x,oy:i.y,moved:!1},t.target.setPointerCapture(t.pointerId),this._tip=null}_pointerMove(t,e){if(!this._drag||this._drag.id!==e.id)return;const i=this.renderRoot.querySelector(".stage");if(!i)return;const s=this._spaceModel().vb,a=i.getBoundingClientRect(),o=this._viewOr(s),n=(t.clientX-this._drag.sx)/a.width*o.w,r=(t.clientY-this._drag.sy)/a.height*o.h;Math.abs(t.clientX-this._drag.sx)+Math.abs(t.clientY-this._drag.sy)>3&&(this._drag.moved=!0);const l=.008*Math.min(s[2],s[3]),c=Math.max(s[0]+l,Math.min(s[0]+s[2]-l,this._drag.ox+n)),h=Math.max(s[1]+l,Math.min(s[1]+s[3]-l,this._drag.oy+r));this._savePos(e,c,h)}_pointerUp(t,e){if(!this._drag||this._drag.id!==e.id)return;const i=this._drag.moved;this._drag=i?this._drag:null,i&&(this._selId=e.id,window.setTimeout(()=>this._drag=null,0))}_resetLayout(){confirm("Сбросить позиции всех иконок к авто-раскладке?")&&(this._layout={},this._persistLayout())}_showToast(t){this._toast=t,clearTimeout(this._toastTimer),this._toastTimer=window.setTimeout(()=>{this._toast=""},3500)}_showTip(t,e,i,s){this._drag||(this._tip={x:t.clientX,y:t.clientY,title:e,meta:i,lqi:s})}get _gridPitch(){return Et/240}get _curSpaceCfg(){return this._serverCfg?.spaces.find(t=>t.id===this._space)}get _spaceH(){const t=this._curSpaceCfg;return t?Et/t.aspect:Et}get _segments(){const t=this._curSpaceCfg,e=this._spaceH;return(t?.segments||[]).map(t=>[t[0]*Et,t[1]*e,t[2]*Et,t[3]*e])}_toggleMarkup(){this._norm?(this._markup=!this._markup,this._path=[],this._cursorPt=null,this._tool="draw"):this._showToast("Разметка доступна после переноса конфига на сервер (режим правки → «На сервер»)")}_svgPoint(t){const e=this.renderRoot.querySelector(".stage").getBoundingClientRect();return this._screenToVb(t.clientX-e.left,t.clientY-e.top)}_snap(t){const e=this._gridPitch;return[_t(t[0],e),_t(t[1],e)]}_samePt(t,e){return function(t,e,i=.001){return Math.abs(t[0]-e[0])t.stopPropagation()}>
-
-
-
- this._spaceDialog={...t,title:e.target.value}} />
-
-
-
- ${t.planFile?L`${t.planFile.name}`:t.planUrl?L``:L`нет подложки`}
-
-
-
- ${"edit"===t.mode?L``:W}
-
-
-
-
-
+
+
+
+ ${this._spaceDialog?this._renderSpaceDialog():B}
+ ${this._toast?j`Пространств пока нет.
+ ${this._serverStorage?j`Добавьте первое пространство и загрузите план этажа.
+ `:j`Установите интеграцию House Plan и добавьте запись в «Устройства и службы».
`} +${this._toast}
`:B}
+
+
+
+
+
+ ${this._markup?this._renderMarkupBar():B}
+
+
+
+ ${t.map(t=>j``)}
+ ${this._norm?j``:B}
+
+ ${s.length} устр.
+
+
+
+
+
+
+ ${this._norm?j``:B}
+ ${this._norm?j`
+ `:B}
+
+ this._markupClick(t)}
+ @wheel=${t=>this._onWheel(t)}
+ @pointerdown=${t=>this._stagePointerDown(t)}
+ @pointermove=${t=>this._stagePointerMove(t)}
+ @pointerup=${t=>this._stagePointerUp(t)}
+ @pointercancel=${t=>this._stagePointerUp(t)}>
+
+
+ ${this._roomDialog?this._renderRoomDialog():B}
+ ${this._spaceDialog?this._renderSpaceDialog():B}
+ ${this._markerDialog?this._renderMarkerDialog():B}
+ ${this._infoCard?this._renderInfoCard():B}
+ ${this._tip?j`
+
+
+ ${this._zoom>1?j`
+ ${s.map(t=>this._renderDevice(t,n))}
+
+ ${Math.round(100*this._zoom)}%
`:B}
+
+ ${this._tip.title}${this._tip.meta?j`${this._tip.meta}`:B}
+ ${null!=this._tip.lqi?j`средний сигнал zigbee:
+ ${this._tip.lqi}`:B}
+
`:B}
+ ${this._toast?j`${this._toast}
`:B}
+ this._clickDevice(e,t)}
+ @mousemove=${e=>this._showTip(e,t.name,t.model+(null!=n?" · "+n+"°":"")+(null!=r?" · LQI "+r:""))}
+ @mouseleave=${()=>this._tip=null}
+ @pointerdown=${e=>this._pointerDown(e,t)}
+ @pointermove=${e=>this._pointerMove(e,t)}
+ @pointerup=${e=>this._pointerUp(e,t)}
+ >
+
`}_roomCenter(t){if(t.poly){const e=t.poly.length;return[t.poly.reduce((t,e)=>t+e[0],0)/e,t.poly.reduce((t,e)=>t+e[1],0)/e]}return[t.x+t.w/2,t.y+.1*Math.min(t.w,t.h)]}_renderMarkupDefs(t){const e=this._gridPitch,i=.14*e;return F`t.stopPropagation()}>
+
`}_renderRoomDialog(){const t=this._freeAreas;return j``}}Ot.properties={hass:{attribute:!1},_config:{state:!0},_space:{state:!0},_layout:{state:!0},_devices:{state:!0},_tip:{state:!0},_selId:{state:!0},_toast:{state:!0},_serverCfg:{state:!0},_markup:{state:!0},_tool:{state:!0},_path:{state:!0},_cursorPt:{state:!0},_areaSel:{state:!0},_nameSel:{state:!0},_roomDialog:{state:!0},_spaceDialog:{state:!0},_infoCard:{state:!0},_markerDialog:{state:!0},_zoom:{state:!0},_view:{state:!0}},Ot.styles=zt,customElements.get("houseplan-card")||customElements.define("houseplan-card",Ot),window.customCards=window.customCards||[],window.customCards.find(t=>"houseplan-card"===t.type)||window.customCards.push({type:"houseplan-card",name:"House Plan Card",description:"Интерактивный план дома: пространства, комнаты, устройства с живыми состояниями и drag-раскладкой."}),console.info("%c HOUSEPLAN-CARD %c v1.10.0 ","background:#3ea6ff;color:#04121f;font-weight:700","");
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index f6f26b9..72dba0a 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,34 @@
# Changelog
+## v1.10.0 — 2026-07-05 (аудит: гонки записи, XSS, модульность)
+**Бэкенд**
+- **Гонка записи устранена**: все циклы load→modify→save (`layout/set|update|delete`,
+ `config/set`) сериализованы общим `asyncio.Lock` — параллельные WS-вызовы больше не теряют
+ изменения, проверка `expected_rev` стала атомарной.
+- Новая WS-команда `houseplan/layout/delete` — чистка позиции при удалении маркера
+ (раньше в `.storage/houseplan.layout` копились сироты).
+- Удалена мёртвая WS-команда `houseplan/file/set` — файлы грузятся только по HTTP
+ (`/api/houseplan/upload`), как и было в карточке.
+- HTTP-загрузка: лимит 25 МБ применяется ПО МЕРЕ чтения multipart (обрыв на лимите),
+ а не после чтения всего файла в память; `stat()` файлов ушёл в executor.
+- `request.app[KEY_HASS]` вместо устаревшего `request.app["hass"]` (с фолбэком для старых HA).
+
+**Фронтенд**
+- **God-component разобран**: `houseplan-card.ts` 3023 → ~1990 строк.
+ Стили → `styles.ts`; типы → `types.ts`; построение устройств из реестров HA
+ (курирование, группы света, маркеры, LQI/температура) → `devices.ts` (чистые функции).
+- **Last-writer-wins в раскладке устранён**: `_saveMarker` пишет позицию точечно
+ (`layout/update`), а не всей раскладкой (`layout/set`) — не затирает позиции из других
+ окон (регресс-класс инцидента v1.4.4). Перепривязка/удаление подчищают старую позицию.
+- **XSS закрыт**: `link` и `pdfs[].url` маркеров проходят `safeUrl()` (только http(s)
+ и относительные пути; `javascript:`/`data:` отбрасываются). +12 тестов.
+- Загрузка файлов через `hass.fetchWithAuth` (автообновление протухшего токена),
+ фолбэк на сырой токен.
+- **Хардкод дачи убран из GUI-редактора**: список «пространство по умолчанию» строится
+ из серверного конфига (WS `config/get`), а не зашитых f1/f2/yard.
+- `rules.ts`: удалён мёртвый экспорт `GROUP_TITLES`; регэкспы `iconFor` прекомпилированы.
+- Единый `_errText()` во всех обработчиках ошибок (никогда «[object Object]»).
+
## v1.9.3 — 2026-07-05 (аудит + рефакторинг + тесты)
- Чистые функции `fitView` (contain-прямоугольник вьюпорта) и `declump` (расталкивание значков)
вынесены из карточки в `logic.ts` — покрыты юнит-тестами (было 9 → стало 14 тестов).
diff --git a/package.json b/package.json
index 39c77f0..d56b8df 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "houseplan-card",
- "version": "1.9.3",
- "description": "Interactive house plan Lovelace card for Home Assistant (dacha Kirillovskoe)",
+ "version": "1.10.0",
+ "description": "Interactive house plan Lovelace card for Home Assistant",
"license": "MIT",
"type": "module",
"scripts": {
diff --git a/src/devices.ts b/src/devices.ts
new file mode 100644
index 0000000..1eb01f1
--- /dev/null
+++ b/src/devices.ts
@@ -0,0 +1,275 @@
+/**
+ * Построение списка устройств из реестров HA: курирование, группы света,
+ * маркеры (оверрайды/виртуальные). Без Lit/DOM — только hass-объект.
+ */
+import { iconFor, DOMAIN_PRIORITY } from './rules';
+import { averageLqi } from './logic';
+import type { DevItem, Marker, ServerConfig } from './types';
+
+/** Контекст построения: срез hass + резолв конфига. */
+export interface BuildCtx {
+ hass: any;
+ /** area_id → space_id (только зоны, привязанные к комнатам). */
+ areaToSpace: Recordt.stopPropagation()}>
+
+
+
+ this._spaceDialog={...t,title:e.target.value}} />
+
+
+
+ ${t.planFile?j`${t.planFile.name}`:t.planUrl?j``:j`нет подложки`}
+
+
+
+ ${"edit"===t.mode?j``:B}
+
+
+
+
+
${d.model ? html`
`
: nothing}
${d.description ? html`Модель${d.model}
` : nothing}
${stateTxt ? html`Состояние${stateTxt}
` : nothing}
- ${d.link
+ ${safeUrl(d.link)
? html`Ссылка
- ${d.link}
`
+ ${d.link}${d.description}
` : nothing}
${d.pdfs && d.pdfs.length
? html`Инструкции
${d.pdfs.map(
- (p) => html`
+ (p) => html`
`
: nothing}
@@ -2171,7 +1857,7 @@ class HouseplanCard extends LitElement {
`;
}
- static styles = css`
- :host {
- --hp-bg: var(--card-background-color, #16212e);
- --hp-line: var(--divider-color, #2b3d4f);
- --hp-txt: var(--primary-text-color, #e6edf3);
- --hp-muted: var(--secondary-text-color, #8aa0b3);
- --hp-accent: var(--primary-color, #3ea6ff);
- --hp-on: #ffd45c;
- --hp-open: #ff9f43;
- }
- ha-card {
- overflow: visible; /* overflow:hidden ломает position:sticky у шапки */
- }
- .empty {
- padding: 40px 24px;
- color: var(--hp-txt);
- text-align: center;
- display: flex;
- flex-direction: column;
- align-items: center;
- gap: 8px;
- }
- .empty .big {
- --mdc-icon-size: 56px;
- color: var(--hp-accent);
- opacity: 0.7;
- }
- .empty .muted {
- color: var(--hp-muted);
- font-size: 13px;
- margin: 0;
- }
- .empty .btn {
- margin-top: 8px;
- }
- .hdr {
- position: sticky;
- top: var(--header-height, 56px);
- z-index: 20;
- background: var(--card-background-color, var(--hp-bg));
- border-radius: var(--ha-card-border-radius, 12px) var(--ha-card-border-radius, 12px) 0 0;
- }
- .head {
- display: flex;
- align-items: center;
- gap: 10px;
- padding: 10px 14px;
- border-bottom: 1px solid var(--hp-line);
- flex-wrap: wrap;
- }
- .title {
- font-size: 15px;
- font-weight: 600;
- display: flex;
- align-items: center;
- gap: 6px;
- white-space: nowrap;
- }
- .title ha-icon {
- color: var(--hp-accent);
- --mdc-icon-size: 18px;
- }
- .tabs {
- display: flex;
- gap: 4px;
- background: rgba(127, 127, 127, 0.12);
- padding: 3px;
- border-radius: 10px;
- flex-wrap: wrap;
- }
- @media (max-width: 620px) {
- .head { gap: 6px; padding: 8px 10px; }
- .head .count { display: none; }
- .head .title { font-size: 14px; }
- }
- .tab {
- border: 0;
- background: transparent;
- color: var(--hp-muted);
- padding: 6px 13px;
- border-radius: 8px;
- font-size: 13px;
- font-weight: 600;
- cursor: pointer;
- transition: 0.15s;
- font-family: inherit;
- }
- .tab:hover {
- color: var(--hp-txt);
- }
- .tab.active {
- background: var(--hp-accent);
- color: var(--text-primary-color, #fff);
- }
- .count {
- font-size: 12px;
- color: var(--hp-muted);
- }
- .spacer {
- flex: 1;
- }
- .btn {
- display: inline-flex;
- align-items: center;
- gap: 6px;
- border: 1px solid var(--hp-line);
- background: transparent;
- color: var(--hp-txt);
- padding: 6px 10px;
- border-radius: 8px;
- cursor: pointer;
- transition: 0.15s;
- font-family: inherit;
- font-size: 12.5px;
- }
- .btn ha-icon {
- --mdc-icon-size: 17px;
- }
- .btn:hover {
- border-color: var(--hp-accent);
- }
- .btn.on {
- background: var(--hp-accent);
- color: var(--text-primary-color, #fff);
- border-color: var(--hp-accent);
- }
- .btn.ghost {
- border: none;
- }
- .btn[disabled] {
- opacity: 0.5;
- pointer-events: none;
- }
- .stage {
- position: relative;
- width: 100%;
- container-type: inline-size;
- overflow: hidden;
- touch-action: none; /* свои жесты pinch/pan */
- background: var(--ha-card-background, var(--card-background-color, #111));
- }
- .zoomwrap {
- position: absolute;
- inset: 0;
- }
- .zoomctl {
- display: inline-flex;
- gap: 2px;
- background: rgba(127, 127, 127, 0.12);
- border-radius: 8px;
- padding: 2px;
- }
- .zoomctl .zb {
- border: none;
- padding: 5px 7px;
- }
- .zoomctl .zb[disabled] {
- opacity: 0.4;
- pointer-events: none;
- }
- .zoombadge {
- position: absolute;
- left: 8px;
- bottom: 8px;
- background: rgba(4, 18, 31, 0.8);
- color: #dff1ff;
- border: 1px solid var(--hp-accent);
- border-radius: 8px;
- padding: 2px 8px;
- font-size: 12px;
- font-weight: 600;
- pointer-events: none;
- }
- .stage svg {
- position: absolute;
- inset: 0;
- width: 100%;
- height: 100%;
- display: block;
- }
- .room {
- transition: 0.12s;
- cursor: pointer;
- }
- .room.overlay {
- fill: transparent;
- stroke: transparent;
- stroke-width: 2;
- }
- .room.overlay:hover {
- fill: rgba(62, 166, 255, 0.18);
- stroke: var(--hp-accent);
- }
- .room.yard {
- fill: rgba(75, 140, 90, 0.14);
- stroke: #4b8c5a;
- stroke-width: 2;
- }
- .room.yard:hover {
- fill: rgba(75, 140, 90, 0.24);
- stroke: #6fbf86;
- }
- .rlabel {
- fill: var(--hp-muted);
- font-size: 15px;
- font-weight: 600;
- pointer-events: none;
- text-anchor: middle;
- }
- .stage.edit .room {
- pointer-events: none;
- }
- .stage.markup {
- cursor: crosshair;
- }
- .stage.markup .room {
- pointer-events: none;
- }
- .stage.markup .devlayer {
- display: none; /* в разметке иконки не мешают */
- }
- .room.outlined {
- stroke: rgba(62, 166, 255, 0.55);
- fill: rgba(62, 166, 255, 0.06);
- }
- .griddot {
- fill: var(--hp-accent);
- opacity: 0.75;
- stroke: rgba(0, 0, 0, 0.35);
- stroke-width: 0.4;
- }
- .seg {
- stroke: var(--hp-accent);
- stroke-width: 2.5;
- stroke-linecap: round;
- }
- .pathline {
- stroke: #ffc14d;
- stroke-width: 3;
- fill: none;
- stroke-linecap: round;
- stroke-linejoin: round;
- }
- .preview {
- stroke: #ffc14d;
- stroke-width: 2;
- stroke-dasharray: 6 5;
- opacity: 0.7;
- }
- .vertex {
- fill: #ffc14d;
- stroke: #4a2800;
- stroke-width: 1;
- }
- .vertex.first {
- fill: #4bd28f;
- stroke: #04121f;
- }
- .areasel,
- .namein {
- background: var(--hp-bg);
- border: 1px solid var(--hp-line);
- color: var(--hp-txt);
- border-radius: 6px;
- padding: 6px 8px;
- font-size: 13px;
- font-family: inherit;
- }
- .namein {
- width: 130px;
- }
- .devlayer {
- position: absolute;
- inset: 0;
- pointer-events: none;
- }
- .dev {
- position: absolute;
- width: var(--icon-size, 2.5cqw);
- height: var(--icon-size, 2.5cqw);
- margin: calc(var(--icon-size, 2.5cqw) / -2) 0 0 calc(var(--icon-size, 2.5cqw) / -2);
- border-radius: 22%;
- background: var(--hp-bg);
- border: 1px solid var(--hp-line);
- display: flex;
- align-items: center;
- justify-content: center;
- color: var(--hp-txt);
- cursor: grab;
- pointer-events: auto;
- transition: background 0.15s, border-color 0.15s, opacity 0.2s;
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.45);
- z-index: 2;
- }
- .dev ha-icon {
- --mdc-icon-size: calc(var(--icon-size, 2.5cqw) * 0.62);
- }
- .dev:active {
- cursor: grabbing;
- }
- .dev:hover {
- background: var(--hp-accent);
- color: var(--text-primary-color, #fff);
- z-index: 5;
- }
- .dev.on {
- background: var(--hp-on);
- border-color: var(--hp-on);
- color: #503c00;
- box-shadow: 0 0 8px rgba(255, 212, 92, 0.7);
- }
- .dev.open {
- background: var(--hp-open);
- border-color: var(--hp-open);
- color: #4a2800;
- }
- .dev.unavail {
- opacity: 0.35;
- }
- .dev.virtual {
- border-style: dashed;
- }
- .dev.sel {
- border-color: #ffc14d;
- box-shadow: 0 0 0 3px rgba(255, 193, 77, 0.35);
- }
-
- .dev .tval {
- position: absolute;
- left: 100%;
- top: 50%;
- transform: translateY(-50%);
- margin-left: calc(var(--icon-size, 2.5cqw) * 0.1);
- background: rgba(4, 18, 31, 0.9);
- border: 1px solid var(--hp-accent);
- border-radius: calc(var(--icon-size, 2.5cqw) * 0.18);
- padding: 0 calc(var(--icon-size, 2.5cqw) * 0.14);
- font-size: calc(var(--icon-size, 2.5cqw) * 0.45);
- font-weight: 700;
- line-height: calc(var(--icon-size, 2.5cqw) * 0.68);
- color: #dff1ff;
- white-space: nowrap;
- pointer-events: none;
- }
- .dev .lqi {
- position: absolute;
- top: 100%;
- left: 50%;
- transform: translateX(-50%);
- margin-top: calc(var(--icon-size, 2.5cqw) * 0.05);
- font-size: calc(var(--icon-size, 2.5cqw) * 0.38);
- font-weight: 700;
- line-height: 1;
- text-shadow: 0 0 3px rgba(0, 0, 0, 0.9), 0 0 2px rgba(0, 0, 0, 0.9);
- white-space: nowrap;
- pointer-events: none;
- }
- .editbar {
- display: flex;
- align-items: center;
- gap: 10px;
- padding: 9px 14px;
- border-bottom: 1px solid var(--hp-line);
- font-size: 13px;
- flex-wrap: wrap;
- }
- .tab .tabedit {
- --mdc-icon-size: 13px;
- margin-left: 6px;
- opacity: 0.4;
- vertical-align: middle;
- }
- .tab:hover .tabedit {
- opacity: 0.9;
- }
- .tab.tabadd {
- padding: 6px 8px;
- }
- .tab.tabadd ha-icon {
- --mdc-icon-size: 15px;
- }
- .planrow {
- display: flex;
- align-items: center;
- gap: 10px;
- }
- .planprev {
- max-width: 120px;
- max-height: 70px;
- border: 1px solid var(--hp-line);
- border-radius: 6px;
- background: #fff;
- }
- .planname {
- font-size: 12.5px;
- max-width: 150px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
- .planname.muted {
- color: var(--hp-muted);
- }
- .filebtn {
- cursor: pointer;
- }
- .btn.danger {
- border-color: #b3402a;
- color: #ff7a5c;
- }
- .dialog .row .spacer {
- flex: 1;
- }
- .dialog.wide {
- width: min(440px, 94vw);
- }
- .dialog .body {
- max-height: 66vh;
- overflow-y: auto;
- }
- .descin {
- width: 100%;
- box-sizing: border-box;
- background: var(--hp-bg);
- border: 1px solid var(--hp-line);
- color: var(--hp-txt);
- border-radius: 6px;
- padding: 6px 8px;
- font-size: 13px;
- font-family: inherit;
- resize: vertical;
- }
- .bindsel {
- display: flex;
- flex-direction: column;
- gap: 6px;
- border: 1px solid var(--hp-line);
- border-radius: 8px;
- padding: 8px;
- }
- .bindsel .opt {
- display: flex;
- align-items: center;
- gap: 6px;
- border: 1px solid var(--hp-line);
- background: transparent;
- color: var(--hp-txt);
- border-radius: 6px;
- padding: 6px 8px;
- cursor: pointer;
- font-size: 12.5px;
- font-family: inherit;
- }
- .bindsel .opt.on {
- background: var(--hp-accent);
- color: var(--text-primary-color, #fff);
- border-color: var(--hp-accent);
- }
- .curbind {
- display: flex;
- align-items: center;
- gap: 6px;
- font-size: 12.5px;
- color: var(--hp-txt);
- flex-wrap: wrap;
- }
- .curbind .ref {
- color: var(--hp-muted);
- font-size: 11px;
- }
- .candlist {
- max-height: 160px;
- overflow-y: auto;
- border-top: 1px solid var(--hp-line);
- }
- .cand {
- display: flex;
- justify-content: space-between;
- gap: 8px;
- padding: 6px 8px;
- cursor: pointer;
- border-radius: 6px;
- font-size: 12.5px;
- }
- .cand:hover {
- background: rgba(127, 127, 127, 0.15);
- }
- .cand.sel {
- background: var(--hp-accent);
- color: var(--text-primary-color, #fff);
- }
- .cand .cs {
- color: var(--hp-muted);
- font-size: 11px;
- white-space: nowrap;
- }
- .cand.sel .cs {
- color: var(--text-primary-color, #fff);
- opacity: 0.85;
- }
- .cand.muted {
- color: var(--hp-muted);
- cursor: default;
- }
- .pdfedit {
- display: flex;
- flex-wrap: wrap;
- gap: 6px;
- align-items: center;
- }
- .pdftag {
- display: inline-flex;
- align-items: center;
- gap: 4px;
- border: 1px solid var(--hp-line);
- border-radius: 6px;
- padding: 3px 6px;
- font-size: 12px;
- }
- .pdftag a {
- color: var(--hp-txt);
- text-decoration: none;
- max-width: 150px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
- .pdftag .x {
- --mdc-icon-size: 15px;
- cursor: pointer;
- color: var(--hp-muted);
- }
- .pdftag .x:hover {
- color: #ff7a5c;
- }
- .inforow {
- display: flex;
- gap: 10px;
- font-size: 13px;
- margin: 3px 0;
- }
- .inforow .k {
- color: var(--hp-muted);
- min-width: 84px;
- }
- .inforow a {
- color: var(--hp-accent);
- word-break: break-all;
- }
- .infodesc {
- font-size: 13px;
- white-space: pre-wrap;
- margin-top: 6px;
- }
- .infodesc.muted {
- color: var(--hp-muted);
- }
- .pdflist {
- display: flex;
- flex-direction: column;
- gap: 4px;
- }
- .pdf {
- display: inline-flex;
- align-items: center;
- gap: 4px;
- color: var(--hp-accent);
- text-decoration: none;
- }
- ha-icon-picker {
- display: block;
- }
- .dialogwrap {
- background: rgba(0, 0, 0, 0.45);
- display: flex;
- align-items: center;
- justify-content: center;
- z-index: 90;
- }
- .dialog {
- background: var(--card-background-color, var(--hp-bg));
- border: 1px solid var(--hp-accent);
- border-radius: 14px;
- box-shadow: 0 8px 30px rgba(0, 0, 0, 0.5);
- width: min(360px, 92vw);
- overflow: hidden;
- }
- .dialog .hd {
- padding: 12px 16px;
- font-weight: 600;
- border-bottom: 1px solid var(--hp-line);
- display: flex;
- align-items: center;
- gap: 8px;
- }
- .dialog .hd ha-icon {
- color: var(--hp-accent);
- }
- .dialog .body {
- padding: 14px 16px;
- display: flex;
- flex-direction: column;
- gap: 6px;
- }
- .dialog .body label {
- font-size: 12px;
- color: var(--hp-muted);
- margin-top: 6px;
- }
- .dialog .body .namein,
- .dialog .body .areasel {
- width: 100%;
- box-sizing: border-box;
- }
- .dialog .row {
- display: flex;
- justify-content: flex-end;
- gap: 8px;
- padding: 12px 16px;
- border-top: 1px solid var(--hp-line);
- }
- .editbar .warn {
- color: #ffc14d;
- }
- .editbar .sname {
- font-weight: 600;
- }
- .editbar input {
- width: 74px;
- background: transparent;
- border: 1px solid var(--hp-line);
- color: var(--hp-txt);
- border-radius: 6px;
- padding: 5px 7px;
- font-size: 13px;
- }
- .editbar label,
- .editbar .hint {
- color: var(--hp-muted);
- font-size: 12px;
- }
- .menuwrap {
- position: fixed;
- inset: 0;
- z-index: 80;
- }
- .menu {
- position: fixed;
- background: var(--hp-bg);
- border: 1px solid var(--hp-accent);
- border-radius: 10px;
- box-shadow: 0 6px 22px rgba(0, 0, 0, 0.45);
- min-width: 210px;
- max-width: 300px;
- overflow: hidden;
- transform: translate(0, 8px);
- }
- .menu .hd {
- padding: 8px 12px;
- font-weight: 600;
- font-size: 12.5px;
- border-bottom: 1px solid var(--hp-line);
- display: flex;
- align-items: center;
- gap: 6px;
- }
- .menu .hd ha-icon,
- .menu .it.all ha-icon {
- color: var(--hp-accent);
- --mdc-icon-size: 16px;
- }
- .menu .it {
- padding: 8px 12px;
- font-size: 12.5px;
- cursor: pointer;
- display: flex;
- align-items: center;
- gap: 8px;
- }
- .menu .it ha-icon {
- --mdc-icon-size: 16px;
- color: var(--hp-muted);
- }
- .menu .it:hover {
- background: rgba(127, 127, 127, 0.15);
- }
- .menu .it.all {
- color: var(--hp-accent);
- font-weight: 600;
- }
- .tip {
- position: fixed;
- pointer-events: none;
- background: var(--hp-bg);
- border: 1px solid var(--hp-accent);
- color: var(--hp-txt);
- padding: 6px 10px;
- border-radius: 8px;
- font-size: 12.5px;
- box-shadow: 0 6px 22px rgba(0, 0, 0, 0.45);
- z-index: 99;
- max-width: 260px;
- }
- .tip .m {
- color: var(--hp-muted);
- font-size: 11px;
- display: block;
- }
- .toast {
- position: fixed;
- left: 50%;
- bottom: 22px;
- transform: translateX(-50%);
- background: var(--hp-bg);
- border: 1px solid var(--hp-accent);
- color: var(--hp-txt);
- padding: 9px 16px;
- border-radius: 10px;
- font-size: 13px;
- box-shadow: 0 6px 22px rgba(0, 0, 0, 0.45);
- z-index: 120;
- max-width: 90vw;
- }
- `;
+ static styles = cardStyles;
}
if (!customElements.get('houseplan-card')) {
diff --git a/src/logic.ts b/src/logic.ts
index a77a682..4ddde9d 100644
--- a/src/logic.ts
+++ b/src/logic.ts
@@ -98,3 +98,17 @@ export function declump(
if (!moved) break;
}
}
+
+/**
+ * Безопасный URL для : допускаются только http(s) и относительные пути.
+ * Отсекает javascript:, data: и прочие опасные схемы (XSS через конфиг).
+ */
+export function safeUrl(url: string | null | undefined): string | null {
+ if (!url) return null;
+ const u = url.trim();
+ if (/^(https?:)?\/\//i.test(u) || u.startsWith('/') || /^[\w./#?=&%~-]+$/i.test(u)) {
+ if (/^[a-z][\w+.-]*:/i.test(u) && !/^https?:/i.test(u)) return null;
+ return u;
+ }
+ return null;
+}
diff --git a/src/rules.ts b/src/rules.ts
index 022aab3..6d8e7dd 100755
--- a/src/rules.ts
+++ b/src/rules.ts
@@ -9,48 +9,40 @@ export const EXCLUDED_DOMAINS = new Set([
'upnp_serial_number',
]);
-/** Заголовки групп ламп по area_id. */
-export const GROUP_TITLES: Record