iobroker.javascript 9.0.3 → 9.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -9
- package/admin/assets/OpenAiDialog-B5PG4z2f.js +34 -0
- package/admin/assets/Save-BKC3BS3x.js +1 -0
- package/admin/assets/ScriptEditor-CzccdGxE.js +2 -0
- package/admin/assets/ScriptEditorVanillaMonaco-NQqW_Tkm.js +1 -0
- package/admin/assets/{index-C3f8WSiz.js → index-CTFVTNbj.js} +35 -35
- package/admin/assets/index-CWSymef2.js +1294 -0
- package/admin/assets/index-DUBaHZ92.css +1 -0
- package/admin/assets/index-Dm1jc4t6.js +1 -0
- package/admin/assets/index-DnqHzUyv.js +5 -0
- package/admin/assets/index-Dr_ZFwru.css +1 -0
- package/admin/assets/index-DyVKKqMg.js +27 -0
- package/admin/assets/index-KXl04Hyb.js +16 -0
- package/admin/custom/assets/{index-DQRrNJnQ.js → index-CEFrj8jA.js} +35 -35
- package/admin/custom/assets/{index-sawv1cUe.js → index-Coei6-WB.js} +64 -64
- package/admin/custom/customComponents.js +2 -2
- package/admin/mf-manifest.json +1 -1
- package/admin/remoteEntry.js +2 -2
- package/admin/tab.html +3 -3
- package/admin/vs/configure.js +10 -9
- package/build-backend/lib/convert.js +11 -10
- package/build-backend/lib/convert.js.map +1 -1
- package/build-backend/main.js +5 -7
- package/build-backend/main.js.map +1 -1
- package/io-package.json +27 -27
- package/package.json +3 -3
- package/admin/assets/index-B2hdKtuj.js +0 -1329
- package/admin/assets/index-CEoeyJnt.css +0 -1
- package/admin/assets/index-CuCs5aLs.js +0 -5
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./assets/index-Co3YA5NW.js","./assets/_commonjsHelpers-D6-XlEtG.js","./assets/index-Dbe-II7_.js","./assets/ConfigCustomJavascriptSet__loadShare__react__loadShare__-CzzIM-HW.js","./assets/ConfigCustomJavascriptSet__mf_v__runtimeInit__mf_v__-BaLGCXMi.js","./assets/jsx-runtime-o-xyxrOj.js","./assets/createSvgIcon-BQThUM-f.js","./assets/DefaultPropsProvider-9qubdy-V.js","./assets/defaultTheme-avbtL0lf.js","./assets/createTheme-BwMO3rTt.js","./assets/DefaultPropsProvider-DbEA5uR6.js","./assets/Tabs-CvEv0KOT.js","./assets/useTheme-MELayQMj.js","./assets/useThemeWithoutDefault-C-hl_s0Z.js","./assets/FilledInput-BpuM_GyB.js","./assets/useEnhancedEffect-CdLBzwyA.js","./assets/index-B7G6Jpdl.js","./assets/useTheme-CDtRWagv.js","./assets/ConfigCustomJavascriptSet__loadShare__react_mf_2_dom__loadShare__-DibxNPKw.js","./assets/index-BzS6q3oS.js","./assets/ThemeProvider-DZTpMR8n.js","./assets/index-
|
|
2
|
-
import{i as d,C as p}from"./assets/ConfigCustomJavascriptSet__mf_v__runtimeInit__mf_v__-BaLGCXMi.js";import s from"./assets/virtualExposes-BMKIjWrE.js";import{_ as a}from"./assets/preload-helper-Dp1pzeXC.js";const n={react:async()=>await a(()=>import("./assets/index-Co3YA5NW.js").then(t=>t.i),__vite__mapDeps([0,1]),import.meta.url),"@mui/x-date-pickers":async()=>await a(()=>import("./assets/index-Dbe-II7_.js"),__vite__mapDeps([2,3,1,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]),import.meta.url),"@mui/material":async()=>await a(()=>import("./assets/index-BzS6q3oS.js"),__vite__mapDeps([19,9,3,1,4,7,8,10,5,11,12,13,14,15,16,17,6,18,20]),import.meta.url),"@iobroker/adapter-react-v5":async()=>await a(()=>import("./assets/index-
|
|
1
|
+
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./assets/index-Co3YA5NW.js","./assets/_commonjsHelpers-D6-XlEtG.js","./assets/index-Dbe-II7_.js","./assets/ConfigCustomJavascriptSet__loadShare__react__loadShare__-CzzIM-HW.js","./assets/ConfigCustomJavascriptSet__mf_v__runtimeInit__mf_v__-BaLGCXMi.js","./assets/jsx-runtime-o-xyxrOj.js","./assets/createSvgIcon-BQThUM-f.js","./assets/DefaultPropsProvider-9qubdy-V.js","./assets/defaultTheme-avbtL0lf.js","./assets/createTheme-BwMO3rTt.js","./assets/DefaultPropsProvider-DbEA5uR6.js","./assets/Tabs-CvEv0KOT.js","./assets/useTheme-MELayQMj.js","./assets/useThemeWithoutDefault-C-hl_s0Z.js","./assets/FilledInput-BpuM_GyB.js","./assets/useEnhancedEffect-CdLBzwyA.js","./assets/index-B7G6Jpdl.js","./assets/useTheme-CDtRWagv.js","./assets/ConfigCustomJavascriptSet__loadShare__react_mf_2_dom__loadShare__-DibxNPKw.js","./assets/index-BzS6q3oS.js","./assets/ThemeProvider-DZTpMR8n.js","./assets/index-CEFrj8jA.js","./assets/ConfigCustomJavascriptSet__loadShare___mf_0_mui_mf_1_material__loadShare__-BlV79j8y.js","./assets/index-B8sZ2j0S.js","./assets/index-Coei6-WB.js","./assets/ConfigCustomJavascriptSet__loadShare___mf_0_iobroker_mf_1_adapter_mf_2_react_mf_2_v5__loadShare__-DAwHgdl6.js","./assets/preload-helper-Dp1pzeXC.js","./assets/index-CWXHfC2L.js","./assets/leaflet-src-A2ZHl6nF.js","./assets/index-DIWNdd4a.js"])))=>i.map(i=>d[i]);
|
|
2
|
+
import{i as d,C as p}from"./assets/ConfigCustomJavascriptSet__mf_v__runtimeInit__mf_v__-BaLGCXMi.js";import s from"./assets/virtualExposes-BMKIjWrE.js";import{_ as a}from"./assets/preload-helper-Dp1pzeXC.js";const n={react:async()=>await a(()=>import("./assets/index-Co3YA5NW.js").then(t=>t.i),__vite__mapDeps([0,1]),import.meta.url),"@mui/x-date-pickers":async()=>await a(()=>import("./assets/index-Dbe-II7_.js"),__vite__mapDeps([2,3,1,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]),import.meta.url),"@mui/material":async()=>await a(()=>import("./assets/index-BzS6q3oS.js"),__vite__mapDeps([19,9,3,1,4,7,8,10,5,11,12,13,14,15,16,17,6,18,20]),import.meta.url),"@iobroker/adapter-react-v5":async()=>await a(()=>import("./assets/index-CEFrj8jA.js"),__vite__mapDeps([21,9,3,1,4,22,23,12,13,17,8]),import.meta.url),"@iobroker/json-config":async()=>await a(()=>import("./assets/index-Coei6-WB.js"),__vite__mapDeps([24,3,1,4,22,23,12,9,13,25,18,14,7,8,10,5,15,26]),import.meta.url),"react-dom":async()=>await a(()=>import("./assets/index-CWXHfC2L.js").then(t=>t.i),__vite__mapDeps([27,1,3,4]),import.meta.url),leaflet:async()=>await a(()=>import("./assets/leaflet-src-A2ZHl6nF.js").then(t=>t.l),__vite__mapDeps([28,1]),import.meta.url),"@mui/icons-material":async()=>await a(()=>import("./assets/index-DIWNdd4a.js"),__vite__mapDeps([29,5,3,1,4,6,7,8,9,10]),import.meta.url)},o={react:{name:"react",version:"18.3.1",scope:["default"],loaded:!1,from:"ConfigCustomJavascriptSet",async get(){o.react.loaded=!0;const{react:e}=n,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"@mui/x-date-pickers":{name:"@mui/x-date-pickers",version:"7.29.4",scope:["default"],loaded:!1,from:"ConfigCustomJavascriptSet",async get(){o["@mui/x-date-pickers"].loaded=!0;const{"@mui/x-date-pickers":e}=n,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"@mui/material":{name:"@mui/material",version:"6.4.12",scope:["default"],loaded:!1,from:"ConfigCustomJavascriptSet",async get(){o["@mui/material"].loaded=!0;const{"@mui/material":e}=n,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"@iobroker/adapter-react-v5":{name:"@iobroker/adapter-react-v5",version:"7.6.20",scope:["default"],loaded:!1,from:"ConfigCustomJavascriptSet",async get(){o["@iobroker/adapter-react-v5"].loaded=!0;const{"@iobroker/adapter-react-v5":e}=n,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"@iobroker/json-config":{name:"@iobroker/json-config",version:"7.6.20",scope:["default"],loaded:!1,from:"ConfigCustomJavascriptSet",async get(){o["@iobroker/json-config"].loaded=!0;const{"@iobroker/json-config":e}=n,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"react-dom":{name:"react-dom",version:"18.3.1",scope:["default"],loaded:!1,from:"ConfigCustomJavascriptSet",async get(){o["react-dom"].loaded=!0;const{"react-dom":e}=n,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},leaflet:{name:"leaflet",version:"1.9.4",scope:["default"],loaded:!1,from:"ConfigCustomJavascriptSet",async get(){o.leaflet.loaded=!0;const{leaflet:e}=n,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"@mui/icons-material":{name:"@mui/icons-material",version:"6.4.12",scope:["default"],loaded:!1,from:"ConfigCustomJavascriptSet",async get(){o["@mui/icons-material"].loaded=!0;const{"@mui/icons-material":e}=n,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}}},f=[],u={},c="default",l="ConfigCustomJavascriptSet";async function k(e={},t=[]){const r=d.init({name:l,remotes:f,shared:o,plugins:[],shareStrategy:"version-first"});var i=u[c];if(i||(i=u[c]={from:l}),!(t.indexOf(i)>=0)){t.push(i),r.initShareScopeMap("default",e);try{await Promise.all(await r.initializeSharing("default",{strategy:"version-first",from:"build",initScope:t}))}catch(m){console.error(m)}return p.initResolve(r),r}}function y(e){if(!(e in s))throw new Error(`Module ${e} does not exist in container.`);return s[e]().then(t=>()=>t)}export{y as get,k as init};
|
package/admin/mf-manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"id":"iobroker_javascript","name":"iobroker_javascript","metaData":{"name":"iobroker_javascript","type":"app","buildInfo":{"buildVersion":"1.0.0","buildName":"iobroker_javascript"},"remoteEntry":{"name":"remoteEntry.js","path":"","type":"module"},"ssrRemoteEntry":{"name":"remoteEntry.js","path":"","type":"module"},"types":{"path":"","name":""},"globalName":"iobroker_javascript","pluginVersion":"0.2.5","publicPath":"./"},"shared":[{"id":"iobroker_javascript:@iobroker/adapter-react-v5","name":"@iobroker/adapter-react-v5","version":"7.
|
|
1
|
+
{"id":"iobroker_javascript","name":"iobroker_javascript","metaData":{"name":"iobroker_javascript","type":"app","buildInfo":{"buildVersion":"1.0.0","buildName":"iobroker_javascript"},"remoteEntry":{"name":"remoteEntry.js","path":"","type":"module"},"ssrRemoteEntry":{"name":"remoteEntry.js","path":"","type":"module"},"types":{"path":"","name":""},"globalName":"iobroker_javascript","pluginVersion":"0.2.5","publicPath":"./"},"shared":[{"id":"iobroker_javascript:@iobroker/adapter-react-v5","name":"@iobroker/adapter-react-v5","version":"7.7.0","requiredVersion":"*","assets":{"js":{"async":[],"sync":["assets/index-CTFVTNbj.js","assets/createSvgIcon-BQT-7-GS.js","assets/iobroker_javascript__loadShare__react__loadShare__-BiJPUKBK.js","assets/_commonjsHelpers-Cpj98o6Y.js","assets/iobroker_javascript__mf_v__runtimeInit__mf_v__-CBQgOKij.js","assets/index-DnqHzUyv.js","assets/Save-BKC3BS3x.js","assets/useTheme-DF6qfrtI.js","assets/index-Dm1jc4t6.js"]},"css":{"async":[],"sync":[]}}},{"id":"iobroker_javascript:@mui/material","name":"@mui/material","version":"6.4.12","requiredVersion":"*","assets":{"js":{"async":[],"sync":["assets/index-glyB1sbj.js","assets/createSvgIcon-BQT-7-GS.js","assets/iobroker_javascript__loadShare__react__loadShare__-BiJPUKBK.js","assets/_commonjsHelpers-Cpj98o6Y.js","assets/iobroker_javascript__mf_v__runtimeInit__mf_v__-CBQgOKij.js","assets/inheritsLoose--KnFDOw1.js","assets/useTheme-DF6qfrtI.js"]},"css":{"async":[],"sync":[]}}},{"id":"iobroker_javascript:react-dom","name":"react-dom","version":"18.3.1","requiredVersion":"*","assets":{"js":{"async":[],"sync":["assets/index-x0m5vR1T.js","assets/_commonjsHelpers-Cpj98o6Y.js","assets/iobroker_javascript__loadShare__react__loadShare__-BiJPUKBK.js","assets/iobroker_javascript__mf_v__runtimeInit__mf_v__-CBQgOKij.js"]},"css":{"async":[],"sync":[]}}},{"id":"iobroker_javascript:react","name":"react","version":"18.3.1","requiredVersion":"*","assets":{"js":{"async":[],"sync":["assets/index-Do-nCdWy.js","assets/_commonjsHelpers-Cpj98o6Y.js"]},"css":{"async":[],"sync":[]}}},{"id":"iobroker_javascript:prop-types","name":"prop-types","version":"15.8.1","requiredVersion":"*","assets":{"js":{"async":[],"sync":["assets/index-DQiceR5U.js","assets/_commonjsHelpers-Cpj98o6Y.js"]},"css":{"async":[],"sync":[]}}}],"remotes":[],"exposes":[]}
|
package/admin/remoteEntry.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./assets/index-
|
|
2
|
-
import{i as d,a as m}from"./assets/iobroker_javascript__mf_v__runtimeInit__mf_v__-CBQgOKij.js";import s from"./assets/virtualExposes-BIHI7g3E.js";import{_ as a}from"./assets/preload-helper-Dp1pzeXC.js";const i={"@iobroker/adapter-react-v5":async()=>await a(()=>import("./assets/index-
|
|
1
|
+
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./assets/index-CTFVTNbj.js","./assets/createSvgIcon-BQT-7-GS.js","./assets/iobroker_javascript__loadShare__react__loadShare__-BiJPUKBK.js","./assets/_commonjsHelpers-Cpj98o6Y.js","./assets/iobroker_javascript__mf_v__runtimeInit__mf_v__-CBQgOKij.js","./assets/index-DnqHzUyv.js","./assets/Save-BKC3BS3x.js","./assets/useTheme-DF6qfrtI.js","./assets/index-Dm1jc4t6.js","./assets/index-glyB1sbj.js","./assets/inheritsLoose--KnFDOw1.js","./assets/index-x0m5vR1T.js","./assets/index-Do-nCdWy.js","./assets/index-DQiceR5U.js"])))=>i.map(i=>d[i]);
|
|
2
|
+
import{i as d,a as m}from"./assets/iobroker_javascript__mf_v__runtimeInit__mf_v__-CBQgOKij.js";import s from"./assets/virtualExposes-BIHI7g3E.js";import{_ as a}from"./assets/preload-helper-Dp1pzeXC.js";const i={"@iobroker/adapter-react-v5":async()=>await a(()=>import("./assets/index-CTFVTNbj.js"),__vite__mapDeps([0,1,2,3,4,5,6,7,8]),import.meta.url),"@mui/material":async()=>await a(()=>import("./assets/index-glyB1sbj.js"),__vite__mapDeps([9,1,2,3,4,10,7]),import.meta.url),"react-dom":async()=>await a(()=>import("./assets/index-x0m5vR1T.js").then(t=>t.i),__vite__mapDeps([11,3,2,4]),import.meta.url),react:async()=>await a(()=>import("./assets/index-Do-nCdWy.js").then(t=>t.i),__vite__mapDeps([12,3]),import.meta.url),"prop-types":async()=>await a(()=>import("./assets/index-DQiceR5U.js").then(t=>t.i),__vite__mapDeps([13,3]),import.meta.url)},o={"@iobroker/adapter-react-v5":{name:"@iobroker/adapter-react-v5",version:"7.7.0",scope:["default"],loaded:!1,from:"iobroker_javascript",async get(){o["@iobroker/adapter-react-v5"].loaded=!0;const{"@iobroker/adapter-react-v5":e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"@mui/material":{name:"@mui/material",version:"6.4.12",scope:["default"],loaded:!1,from:"iobroker_javascript",async get(){o["@mui/material"].loaded=!0;const{"@mui/material":e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"react-dom":{name:"react-dom",version:"18.3.1",scope:["default"],loaded:!1,from:"iobroker_javascript",async get(){o["react-dom"].loaded=!0;const{"react-dom":e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},react:{name:"react",version:"18.3.1",scope:["default"],loaded:!1,from:"iobroker_javascript",async get(){o.react.loaded=!0;const{react:e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"prop-types":{name:"prop-types",version:"15.8.1",scope:["default"],loaded:!1,from:"iobroker_javascript",async get(){o["prop-types"].loaded=!0;const{"prop-types":e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}}},_=[],u={},p="default",c="iobroker_javascript";async function k(e={},t=[]){const r=d.init({name:c,remotes:_,shared:o,plugins:[],shareStrategy:"version-first"});var n=u[p];if(n||(n=u[p]={from:c}),!(t.indexOf(n)>=0)){t.push(n),r.initShareScopeMap("default",e);try{await Promise.all(await r.initializeSharing("default",{strategy:"version-first",from:"build",initScope:t}))}catch(l){console.error(l)}return m.initResolve(r),r}}function y(e){if(!(e in s))throw new Error(`Module ${e} does not exist in container.`);return s[e]().then(t=>()=>t)}export{y as get,k as init};
|
package/admin/tab.html
CHANGED
|
@@ -115,15 +115,15 @@
|
|
|
115
115
|
type="text/javascript"
|
|
116
116
|
src="google-blockly/own/blocks_object.js"
|
|
117
117
|
></script>
|
|
118
|
-
<script type="module" crossorigin src="./assets/index-
|
|
118
|
+
<script type="module" crossorigin src="./assets/index-CWSymef2.js"></script>
|
|
119
119
|
<link rel="modulepreload" crossorigin href="./assets/iobroker_javascript__mf_v__runtimeInit__mf_v__-CBQgOKij.js">
|
|
120
120
|
<link rel="modulepreload" crossorigin href="./assets/_commonjsHelpers-Cpj98o6Y.js">
|
|
121
121
|
<link rel="modulepreload" crossorigin href="./assets/iobroker_javascript__loadShare__react__loadShare__-BiJPUKBK.js">
|
|
122
122
|
<link rel="modulepreload" crossorigin href="./assets/createSvgIcon-BQT-7-GS.js">
|
|
123
123
|
<link rel="modulepreload" crossorigin href="./assets/inheritsLoose--KnFDOw1.js">
|
|
124
|
-
<link rel="modulepreload" crossorigin href="./assets/index-
|
|
124
|
+
<link rel="modulepreload" crossorigin href="./assets/index-DnqHzUyv.js">
|
|
125
125
|
<link rel="modulepreload" crossorigin href="./assets/preload-helper-Dp1pzeXC.js">
|
|
126
|
-
<link rel="stylesheet" crossorigin href="./assets/index-
|
|
126
|
+
<link rel="stylesheet" crossorigin href="./assets/index-Dr_ZFwru.css">
|
|
127
127
|
</head>
|
|
128
128
|
<body>
|
|
129
129
|
<noscript> You need to enable JavaScript to run this app. </noscript>
|
package/admin/vs/configure.js
CHANGED
|
@@ -6,34 +6,35 @@
|
|
|
6
6
|
// Set the correct root path
|
|
7
7
|
require.config({ paths: { 'vs': 'vs' }});
|
|
8
8
|
|
|
9
|
-
// Allow
|
|
9
|
+
// Allow localization
|
|
10
10
|
|
|
11
11
|
// All languages in monaco-editor
|
|
12
|
-
|
|
12
|
+
const availableLanguages = ['de', 'en', 'fr', 'es', 'it', 'ru', 'zh-cn'];
|
|
13
13
|
|
|
14
14
|
// find the best match
|
|
15
15
|
function findLanguage() {
|
|
16
|
-
if (window.sysLang !== undefined) {
|
|
16
|
+
if (window.sysLang !== undefined && availableLanguages.includes(window.sysLang)) {
|
|
17
17
|
return window.sysLang; // this variable will be set via info.js
|
|
18
18
|
}
|
|
19
19
|
if (navigator.languages && Array.isArray(navigator.languages)) {
|
|
20
|
-
return navigator.languages.find(
|
|
20
|
+
return navigator.languages.find(lang => availableLanguages.includes(lang)) || 'en';
|
|
21
21
|
}
|
|
22
|
-
|
|
22
|
+
let lang = navigator.language || navigator.userLanguage;
|
|
23
23
|
if (typeof lang === 'string') {
|
|
24
24
|
// first try the long version
|
|
25
|
-
if (availableLanguages.
|
|
25
|
+
if (availableLanguages.includes(lang)) {
|
|
26
26
|
return lang;
|
|
27
27
|
}
|
|
28
28
|
// then the short one
|
|
29
|
-
lang = lang.
|
|
30
|
-
if (availableLanguages.
|
|
29
|
+
lang = lang.substring(0, 2);
|
|
30
|
+
if (availableLanguages.includes(lang)) {
|
|
31
31
|
return lang;
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
|
+
return 'en';
|
|
34
35
|
}
|
|
35
36
|
|
|
36
|
-
|
|
37
|
+
const language = findLanguage();
|
|
37
38
|
// if we have a match, configure the editor
|
|
38
39
|
if (language !== undefined && language !== null && language !== 'en') {
|
|
39
40
|
require.config({
|
|
@@ -12,25 +12,26 @@ function stringify(data) {
|
|
|
12
12
|
result = JSON.stringify(obj, null, 2);
|
|
13
13
|
}
|
|
14
14
|
else if (data.data.type === 'script') {
|
|
15
|
+
const objScript = obj;
|
|
15
16
|
id = `${id.replace(/\./g, '/').substring('script.js.'.length)}.json`;
|
|
16
|
-
if (
|
|
17
|
-
const source =
|
|
18
|
-
if (
|
|
17
|
+
if (objScript.common?.source) {
|
|
18
|
+
const source = objScript.common.source;
|
|
19
|
+
if (objScript.common.enabled) {
|
|
19
20
|
// @ts-expect-error We do not use it
|
|
20
|
-
delete
|
|
21
|
+
delete objScript.common.enabled;
|
|
21
22
|
}
|
|
22
|
-
if (
|
|
23
|
+
if (objScript.common.engine === 'system.adapter.javascript.0') {
|
|
23
24
|
// @ts-expect-error We do not use it
|
|
24
|
-
delete
|
|
25
|
+
delete objScript.common.engine;
|
|
25
26
|
}
|
|
26
|
-
if (
|
|
27
|
+
if (objScript.common.engineType === 'Javascript/js') {
|
|
27
28
|
// @ts-expect-error We do not use it
|
|
28
|
-
delete
|
|
29
|
+
delete objScript.common.engineType;
|
|
29
30
|
}
|
|
30
31
|
// @ts-expect-error We do not use it
|
|
31
|
-
delete
|
|
32
|
+
delete objScript.common.name;
|
|
32
33
|
// @ts-expect-error We do not use it
|
|
33
|
-
delete
|
|
34
|
+
delete objScript.common.source;
|
|
34
35
|
if (JSON.stringify(obj.common) !== '{}') {
|
|
35
36
|
result = `/* -- do not edit following lines - START --\n${JSON.stringify(obj.common, null, 2)}\n-- do not edit previous lines - END --*/\n${source}`;
|
|
36
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/lib/convert.ts"],"names":[],"mappings":";;AACA,
|
|
1
|
+
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/lib/convert.ts"],"names":[],"mappings":"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","sourcesContent":["// controller uses this file when build uploads\nexport function stringify(data: { data: ioBroker.ScriptObject | ioBroker.ChannelObject; id: string }): {\n id: string;\n data: string | undefined;\n} {\n const obj = data.data;\n let id = data.id;\n let result: string | undefined;\n if (data.data.type === 'channel') {\n id = `${id.replace(/\\./g, '/').substring('script.js.'.length)}/_dir.json`;\n result = JSON.stringify(obj, null, 2);\n } else if (data.data.type === 'script') {\n const objScript = obj as ioBroker.ScriptObject;\n id = `${id.replace(/\\./g, '/').substring('script.js.'.length)}.json`;\n if (objScript.common?.source) {\n const source = objScript.common.source;\n if (objScript.common.enabled) {\n // @ts-expect-error We do not use it\n delete objScript.common.enabled;\n }\n if (objScript.common.engine === 'system.adapter.javascript.0') {\n // @ts-expect-error We do not use it\n delete objScript.common.engine;\n }\n if (objScript.common.engineType === 'Javascript/js') {\n // @ts-expect-error We do not use it\n delete objScript.common.engineType;\n }\n // @ts-expect-error We do not use it\n delete objScript.common.name;\n // @ts-expect-error We do not use it\n delete objScript.common.source;\n if (JSON.stringify(obj.common) !== '{}') {\n result = `/* -- do not edit following lines - START --\\n${JSON.stringify(obj.common, null, 2)}\\n-- do not edit previous lines - END --*/\\n${source}`;\n } else {\n result = source;\n }\n } else {\n result = JSON.stringify(obj, null, 2);\n }\n }\n\n return { id, data: result };\n}\n\nexport function parse(data: {\n data: string;\n id: string;\n}): { id: string; data: ioBroker.ScriptObject; error: string | undefined } | null {\n let obj: string = data.data;\n let id = data.id;\n let error: string | undefined;\n let name: string;\n let result: ioBroker.Object | undefined;\n if (id[id.length - 1] === '/') {\n id = id.substring(0, id.length - 1);\n }\n\n if (!id.match(/\\.json$/)) {\n return null;\n }\n\n if (id.match(/_dir\\.json$/)) {\n name = id.substring(0, id.length - '/_dir.json'.length).replace(/\\//g, '.');\n\n try {\n result = JSON.parse(obj);\n } catch (err: unknown) {\n error = `Cannot parse object \"${name}\": ${err as Error}`;\n result = {\n common: {\n name: name.split('.').pop() || name,\n },\n type: 'channel',\n _id: `script.js.${name}`,\n native: {},\n };\n }\n id = `script.js.${name}`;\n } else {\n //script\n name = id.substring(0, id.length - '.json'.length).replace(/\\//g, '.');\n let source: string;\n if (obj.match(/^\\/\\*\\s--\\sdo\\snot/)) {\n obj = obj.replace(/\\r\\n/g, '\\n').replace(/\\r/g, '\\n');\n const lines = obj.split('\\n');\n let stringObj = '';\n let line = 1;\n while (line < lines.length) {\n if (lines[line].match(/^--\\sdo\\snot/)) {\n break;\n }\n stringObj += lines[line];\n line++;\n }\n lines.splice(0, line + 1);\n source = lines.join('\\n');\n try {\n result = {} as ioBroker.Object;\n result.common = JSON.parse(stringObj);\n result.common.source = source;\n } catch (err: unknown) {\n error = `Cannot parse object \"${id}\": ${err as Error}`;\n }\n } else {\n source = obj;\n }\n result = {} as ioBroker.Object;\n result.common = result.common || {};\n result._id = `script.js.${name}`;\n result.type = 'script';\n result.common.name = name.split('.').pop() || name;\n result.common.enabled = result.common.enabled === undefined ? true : result.common.enabled;\n result.common.engine = result.common.engine || 'system.adapter.javascript.0';\n result.common.engineType = result.common.engineType || 'Javascript/js';\n result.common.source = result.common.source || source;\n id = `script.js.${name}`;\n }\n\n return { id: id, data: result as ioBroker.ScriptObject, error: error };\n}\n"]}
|
package/build-backend/main.js
CHANGED
|
@@ -681,12 +681,11 @@ class JavaScript extends adapter_core_1.Adapter {
|
|
|
681
681
|
this.context.errorLogFunction = this.log;
|
|
682
682
|
this.config.maxSetStatePerMinute = parseInt(this.config.maxSetStatePerMinute, 10) || 1000;
|
|
683
683
|
this.config.maxTriggersPerScript = parseInt(this.config.maxTriggersPerScript, 10) || 100;
|
|
684
|
-
if (this.supportsFeature
|
|
684
|
+
if (this.supportsFeature?.('PLUGINS')) {
|
|
685
685
|
const sentryInstance = this.getPluginInstance('sentry');
|
|
686
686
|
if (sentryInstance) {
|
|
687
687
|
const Sentry = sentryInstance.getSentryObject();
|
|
688
|
-
|
|
689
|
-
const scope = Sentry.getCurrentScope();
|
|
688
|
+
Sentry?.withScope(scope => {
|
|
690
689
|
scope.addEventProcessor((event, _hint) => {
|
|
691
690
|
if (event.exception?.values?.[0]) {
|
|
692
691
|
const eventData = event.exception.values[0];
|
|
@@ -697,10 +696,9 @@ class JavaScript extends adapter_core_1.Adapter {
|
|
|
697
696
|
if (eventData.stacktrace.frames.find(frame => frame.filename?.includes(SCRIPT_CODE_MARKER))) {
|
|
698
697
|
return null;
|
|
699
698
|
}
|
|
700
|
-
//Exclude event if own directory is included but not inside own node_modules
|
|
699
|
+
// Exclude event if own directory is included but not inside own node_modules
|
|
701
700
|
const ownNodeModulesDir = (0, node_path_1.join)(__dirname, 'node_modules');
|
|
702
|
-
if (!eventData.stacktrace.frames.find(frame => frame.filename &&
|
|
703
|
-
frame.filename.includes(__dirname) &&
|
|
701
|
+
if (!eventData.stacktrace.frames.find(frame => frame.filename?.includes(__dirname) &&
|
|
704
702
|
!frame.filename.includes(ownNodeModulesDir))) {
|
|
705
703
|
return null;
|
|
706
704
|
}
|
|
@@ -711,7 +709,7 @@ class JavaScript extends adapter_core_1.Adapter {
|
|
|
711
709
|
// No exception in it ... do not report
|
|
712
710
|
return null;
|
|
713
711
|
});
|
|
714
|
-
}
|
|
712
|
+
});
|
|
715
713
|
}
|
|
716
714
|
}
|
|
717
715
|
await this.main();
|