Fixed build process

ioBroker · Sep 25, 2024 · f6c7ec1 · f6c7ec1
1 parent e74a77d
commit f6c7ec1
Show file tree

Hide file tree

Showing 50 changed files with 1,797 additions and 176 deletions.
diff --git a/README.md b/README.md
@@ -32,13 +32,15 @@ sendTo('cameras.0', 'image', {
 The result is always in `jpg` format.
 
 Supported cameras:
-- Reolink E1 Pro via RTSP (important, without `Pro` it will not work)
-- Eufy via eusec adapter
-- [HiKam](https://support.hikam.de/support/solutions/articles/16000070656-zugriff-auf-kameras-der-2-generation-via-onvif-f%C3%BCr-s6-q8-a7-2-generation-) of second and third generation via ONVIF (für S6, Q8, A7 2. Generation), A7 Pro, A9
-- [WIWICam M1 via HiKam adapter](https://www.wiwacam.com/de/mw1-minikamera-kurzanleitung-und-faq/)
-- RTSP Native - if your camera supports RTSP protocol
+- `Reolink E1 Pro` via RTSP (important, without `Pro` it will not work)
+- `Eufy` via eusec adapter
+- [`HiKam`](https://support.hikam.de/support/solutions/articles/16000070656-zugriff-auf-kameras-der-2-generation-via-onvif-f%C3%BCr-s6-q8-a7-2-generation-) of second and third generation via ONVIF (für S6, Q8, A7 2. Generation), A7 Pro, A9
+- [`WIWICam M1` via `HiKam` adapter](https://www.wiwacam.com/de/mw1-minikamera-kurzanleitung-und-faq/)
+- RTSP native - if your camera supports RTSP protocol
 - Screenshots via HTTP URL - if you can get the snapshot from your camera via URL
 
+Important: the adapter starts the internal web server on `localhost:8200`, if this port is occupied on your system, you can change the port in settings.
+
 ### URL image
 This is a normal URL request, where all parameters are in URL. Like `http://mycam/snapshot.jpg`  
 

diff --git a/src-editor/public/favicon.ico → admin/assets/favicon-CSF3NglM.ico b/src-editor/public/favicon.ico → admin/assets/favicon-CSF3NglM.ico
diff --git a/admin/assets/index-BqFSCGOi.css b/admin/assets/index-BqFSCGOi.css
diff --git a/admin/assets/index-BqWEC3ZM.js b/admin/assets/index-BqWEC3ZM.js
diff --git a/admin/assets/index-BqWEC3ZM.js.map b/admin/assets/index-BqWEC3ZM.js.map
diff --git a/src-editor/public/manifest.json → admin/assets/manifest-DQd0VAqi.json b/src-editor/public/manifest.json → admin/assets/manifest-DQd0VAqi.json
diff --git a/src-editor/public/cameras.png → admin/cameras.png b/src-editor/public/cameras.png → admin/cameras.png
diff --git a/admin/index_m.html b/admin/index_m.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <link
+            rel="shortcut icon"
+            href="./assets/favicon-CSF3NglM.ico"
+        />
+        <meta
+            name="viewport"
+            content="width=device-width, initial-scale=1, shrink-to-fit=no"
+        />
+        <meta
+            name="theme-color"
+            content="#000000"
+        />
+        <link
+            rel="manifest"
+            href="./assets/manifest-DQd0VAqi.json"
+        />
+        <script type="text/javascript" onerror="setTimeout(function(){window.location.reload()}, 5000)" src="./lib/js/socket.io.js"></script>
+        <title>ioBroker.cameras</title>
+      <script type="module" crossorigin src="./assets/index-BqWEC3ZM.js"></script>
+      <link rel="stylesheet" crossorigin href="./assets/index-BqFSCGOi.css">
+    </head>
+    <body>
+        <noscript>You need to enable JavaScript to run this app.</noscript>
+        <div id="root"></div>
+    </body>
+</html>
diff --git a/build-backend/main.js b/build-backend/main.js
@@ -91,16 +91,29 @@ class CamerasAdapter extends adapter_core_1.Adapter {
     }
     async onReady() {
         this.streamSubscribes = [];
-        if (!this.config.ffmpegPath && process.platform === 'win32' && !(0, node_fs_1.existsSync)(`${__dirname}/win-ffmpeg.exe`)) {
+        if (!this.config.ffmpegPath &&
+            process.platform === 'win32' &&
+            !(0, node_fs_1.existsSync)(`${__dirname}/../win-ffmpeg.exe`) &&
+            !(0, node_fs_1.existsSync)(`${__dirname}/win-ffmpeg.exe`)) {
             this.log.info('Decompress ffmpeg.exe...');
-            await (0, decompress_1.default)(`${__dirname}/win-ffmpeg.zip`, __dirname);
+            if (__dirname.endsWith('cameras')) {
+                await (0, decompress_1.default)((0, node_path_1.normalize)(`${__dirname}/win-ffmpeg.zip`), __dirname);
+            }
+            else {
+                await (0, decompress_1.default)((0, node_path_1.normalize)(`${__dirname}/../win-ffmpeg.zip`), (0, node_path_1.normalize)(`${__dirname}/..`));
+            }
         }
         this.language = this.config.language || this.language || 'en';
         this.config.tempPath = this.config.tempPath || `${__dirname}/snapshots`;
         this.config.defaultCacheTimeout = parseInt(this.config.defaultCacheTimeout, 10) || 0;
         if (!(0, node_fs_1.existsSync)(this.config.ffmpegPath) && !(0, node_fs_1.existsSync)(`${this.config.ffmpegPath}.exe`)) {
             if (process.platform === 'win32') {
-                this.config.ffmpegPath = `${__dirname}/win-ffmpeg.exe`;
+                if (__dirname.endsWith('cameras')) {
+                    this.config.ffmpegPath = (0, node_path_1.normalize)(`${__dirname}/win-ffmpeg.exe`);
+                }
+                else {
+                    this.config.ffmpegPath = (0, node_path_1.normalize)(`${__dirname}/../win-ffmpeg.exe`);
+                }
             }
             else {
                 this.log.error(`Cannot find ffmpeg in "${this.config.ffmpegPath}"`);

diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "@alcalzone/release-script": "^3.8.0",
     "@alcalzone/release-script-plugin-iobroker": "^3.7.2",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
-    "@iobroker/build-tools": "^1.0.3",
+    "@iobroker/build-tools": "^1.1.0",
     "@iobroker/testing": "^5.0.0",
     "@iobroker/types": "^6.0.11",
     "@iobroker/vis-2-widgets-react-dev": "^4.0.3",

diff --git a/src-editor/.gitignore → src-admin/.gitignore b/src-editor/.gitignore → src-admin/.gitignore
diff --git a/src-editor/README.md → src-admin/README.md b/src-editor/README.md → src-admin/README.md
diff --git a/src-editor/eslint.config.mjs → src-admin/eslint.config.mjs b/src-editor/eslint.config.mjs → src-admin/eslint.config.mjs
diff --git a/src-editor/index.html → src-admin/index.html b/src-editor/index.html → src-admin/index.html
@@ -30,7 +30,7 @@
                 script.src =
                     window.location.port === '3000'
                         ? window.location.protocol + '//' + window.location.hostname + ':8081/lib/js/socket.io.js'
-                        : '%PUBLIC_URL%/../../lib/js/socket.io.js';
+                        : '../../lib/js/socket.io.js';
             }, 1000);
 
             document.head.appendChild(script);

diff --git a/src-editor/package-lock.json → src-admin/package-lock.json b/src-editor/package-lock.json → src-admin/package-lock.json
diff --git a/src-editor/package.json → src-admin/package.json b/src-editor/package.json → src-admin/package.json
diff --git a/src-editor/prettier.config.mjs → src-admin/prettier.config.mjs b/src-editor/prettier.config.mjs → src-admin/prettier.config.mjs
diff --git a/src-admin/public/cameras.png b/src-admin/public/cameras.png
diff --git a/src-admin/public/favicon.ico b/src-admin/public/favicon.ico
diff --git a/src-admin/public/manifest.json b/src-admin/public/manifest.json
@@ -0,0 +1,15 @@
+{
+  "short_name": "ioBroker.cameras",
+  "name": "ioBroker.cameras",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
diff --git a/src-editor/src/App.tsx → src-admin/src/App.tsx b/src-editor/src/App.tsx → src-admin/src/App.tsx
diff --git a/src-editor/src/Tabs/Cameras.tsx → src-admin/src/Tabs/Cameras.tsx b/src-editor/src/Tabs/Cameras.tsx → src-admin/src/Tabs/Cameras.tsx
diff --git a/src-editor/src/Tabs/Options.tsx → src-admin/src/Tabs/Options.tsx b/src-editor/src/Tabs/Options.tsx → src-admin/src/Tabs/Options.tsx
@@ -173,141 +173,141 @@ class Options extends Component<OptionsProps, OptionsState> {
         });
     }
 
-    renderSettings(): JSX.Element[] {
-        return [
-            <TextField
-                variant="standard"
-                disabled={this.state.requesting}
-                key="port"
-                type="number"
-                slotProps={{
-                    htmlInput: {
-                        min: 1,
-                        max: 0xffff,
-                    },
-                }}
-                style={styles.port}
-                label={I18n.t('Local port')}
-                value={this.props.native.port}
-                onChange={e => this.props.onChange('port', e.target.value)}
-            />,
-            <br key="br1" />,
-            <TextField
-                variant="standard"
-                disabled={this.state.requesting}
-                key="defaultTimeout"
-                type="number"
-                slotProps={{
-                    htmlInput: {
-                        min: 0,
-                        max: 10000,
-                    },
-                }}
-                style={styles.defaultTimeout}
-                label={I18n.t('Default timeout (ms)')}
-                value={this.props.native.defaultTimeout}
-                onChange={e => this.props.onChange('defaultTimeout', e.target.value)}
-            />,
-            <br key="br2" />,
-            <FormControl
-                key="webInstanceSelect"
-                style={styles.bind}
-                variant="standard"
-            >
-                <InputLabel>{I18n.t('WEB Instance')}</InputLabel>
-                <Select
+    renderSettings(): JSX.Element {
+        return (
+            <>
+                <TextField
                     variant="standard"
                     disabled={this.state.requesting}
-                    value={this.props.native.webInstance}
-                    onChange={e => this.props.onChange('webInstance', e.target.value)}
+                    key="defaultTimeout"
+                    type="number"
+                    slotProps={{
+                        htmlInput: {
+                            min: 0,
+                            max: 10000,
+                        },
+                    }}
+                    style={styles.defaultTimeout}
+                    label={I18n.t('Default timeout (ms)')}
+                    value={this.props.native.defaultTimeout}
+                    onChange={e => this.props.onChange('defaultTimeout', e.target.value)}
+                />
+                <br />
+                <FormControl
+                    key="webInstanceSelect"
+                    style={styles.bind}
+                    variant="standard"
                 >
-                    <MenuItem value="*">{I18n.t('All')}</MenuItem>
-                    {this.state.webInstances
-                        ? this.state.webInstances.map(instance => (
-                              <MenuItem
-                                  key={instance}
-                                  value={instance}
-                              >
-                                  {instance}
-                              </MenuItem>
-                          ))
-                        : null}
-                </Select>
-            </FormControl>,
-            <br key="br3" />,
-            <TextField
-                variant="standard"
-                disabled={this.state.requesting}
-                key="ffmpegPath"
-                style={styles.ffmpegPath}
-                label={I18n.t('Path to ffpmeg executable')}
-                value={this.props.native.ffmpegPath || ''}
-                onChange={e => this.props.onChange('ffmpegPath', e.target.value)}
-                helperText={I18n.t('Like /usr/bin/ffmpeg')}
-            />,
-            <Button
-                key="ffmpegPathButton"
-                color="grey"
-                variant="outlined"
-                onClick={() => this.onTestFfmpeg()}
-                disabled={!this.props.instanceAlive || this.state.requesting}
-                startIcon={<IconTest />}
-            >
-                {I18n.t('Test path')}
-            </Button>,
-            <br key="br4" />,
-            <TextField
-                variant="standard"
-                disabled={this.state.requesting}
-                key="tempPath"
-                style={styles.ffmpegPath}
-                label={I18n.t('Path to store temporary images')}
-                value={this.props.native.tempPath || ''}
-                onChange={e => this.props.onChange('tempPath', e.target.value)}
-                helperText={I18n.t('If empty then in adapter folder')}
-            />,
-            <br key="br5" />,
-            <TextField
-                variant="standard"
-                disabled={this.state.requesting}
-                key="defaultCacheTimeout"
-                style={styles.ffmpegPath}
-                label={I18n.t('Default cache timeout (ms)')}
-                slotProps={{
-                    htmlInput: {
-                        min: 0,
-                        max: 60000,
-                    },
-                }}
-                type="number"
-                value={this.props.native.defaultCacheTimeout || ''}
-                onChange={e => this.props.onChange('defaultCacheTimeout', e.target.value)}
-                helperText={I18n.t('How often the cameras will be asked for new snapshot. If 0, then by every request')}
-            />,
-            <br key="br6" />,
-            <TextField
-                variant="standard"
-                disabled={this.state.requesting}
-                key="dateFormat"
-                style={styles.ffmpegPath}
-                label={I18n.t('Time format')}
-                value={this.props.native.dateFormat || ''}
-                onChange={e => this.props.onChange('dateFormat', e.target.value)}
-                helperText={
-                    <span>
-                        {I18n.t('See here:')}{' '}
-                        <a
-                            href="https://momentjs.com/docs/#/displaying/"
-                            rel="noreferrer"
-                            target="_blank"
-                            style={styles.link}
-                        >
-                            https://momentjs.com/
-                        </a>
-                    </span>
-                }
-            />,
-        ];
+                    <InputLabel>{I18n.t('WEB Instance')}</InputLabel>
+                    <Select
+                        variant="standard"
+                        disabled={this.state.requesting}
+                        value={this.props.native.webInstance}
+                        onChange={e => this.props.onChange('webInstance', e.target.value)}
+                    >
+                        <MenuItem value="*">{I18n.t('All')}</MenuItem>
+                        {this.state.webInstances
+                            ? this.state.webInstances.map(instance => (
+                                  <MenuItem
+                                      key={instance}
+                                      value={instance}
+                                  >
+                                      {instance}
+                                  </MenuItem>
+                              ))
+                            : null}
+                    </Select>
+                </FormControl>
+                <br />
+                <TextField
+                    variant="standard"
+                    disabled={this.state.requesting}
+                    key="ffmpegPath"
+                    style={styles.ffmpegPath}
+                    label={I18n.t('Path to ffpmeg executable')}
+                    value={this.props.native.ffmpegPath || ''}
+                    onChange={e => this.props.onChange('ffmpegPath', e.target.value)}
+                    helperText={I18n.t('Like /usr/bin/ffmpeg')}
+                />
+                <Button
+                    color="grey"
+                    variant="outlined"
+                    onClick={() => this.onTestFfmpeg()}
+                    disabled={!this.props.instanceAlive || this.state.requesting}
+                    startIcon={<IconTest />}
+                >
+                    {I18n.t('Test path')}
+                </Button>
+                <br />
+                <TextField
+                    variant="standard"
+                    disabled={this.state.requesting}
+                    style={styles.ffmpegPath}
+                    label={I18n.t('Path to store temporary images')}
+                    value={this.props.native.tempPath || ''}
+                    onChange={e => this.props.onChange('tempPath', e.target.value)}
+                    helperText={I18n.t('If empty then in adapter folder')}
+                />
+                ,
+                <br />
+                <TextField
+                    variant="standard"
+                    disabled={this.state.requesting}
+                    style={styles.ffmpegPath}
+                    label={I18n.t('Default cache timeout (ms)')}
+                    slotProps={{
+                        htmlInput: {
+                            min: 0,
+                            max: 60000,
+                        },
+                    }}
+                    type="number"
+                    value={this.props.native.defaultCacheTimeout || ''}
+                    onChange={e => this.props.onChange('defaultCacheTimeout', e.target.value)}
+                    helperText={I18n.t(
+                        'How often the cameras will be asked for new snapshot. If 0, then by every request',
+                    )}
+                />
+                <br />
+                <TextField
+                    variant="standard"
+                    disabled={this.state.requesting}
+                    style={styles.ffmpegPath}
+                    label={I18n.t('Time format')}
+                    value={this.props.native.dateFormat || ''}
+                    onChange={e => this.props.onChange('dateFormat', e.target.value)}
+                    helperText={
+                        <span>
+                            {I18n.t('See here:')}{' '}
+                            <a
+                                href="https://momentjs.com/docs/#/displaying/"
+                                rel="noreferrer"
+                                target="_blank"
+                                style={styles.link}
+                            >
+                                https://momentjs.com/
+                            </a>
+                        </span>
+                    }
+                />
+                <br />
+                <TextField
+                    variant="standard"
+                    disabled={this.state.requesting}
+                    type="number"
+                    slotProps={{
+                        htmlInput: {
+                            min: 1,
+                            max: 0xffff,
+                        },
+                    }}
+                    style={styles.port}
+                    label={I18n.t('Local port')}
+                    value={this.props.native.port}
+                    onChange={e => this.props.onChange('port', e.target.value)}
+                />
+            </>
+        );
     }
 
     renderMessage(): JSX.Element | null {

diff --git a/src-editor/src/Types/GenericConfig.tsx → src-admin/src/Types/GenericConfig.tsx b/src-editor/src/Types/GenericConfig.tsx → src-admin/src/Types/GenericConfig.tsx
diff --git a/src-editor/src/Types/RTSPEufy.tsx → src-admin/src/Types/RTSPEufy.tsx b/src-editor/src/Types/RTSPEufy.tsx → src-admin/src/Types/RTSPEufy.tsx
diff --git a/src-editor/src/Types/RTSPHiKam.tsx → src-admin/src/Types/RTSPHiKam.tsx b/src-editor/src/Types/RTSPHiKam.tsx → src-admin/src/Types/RTSPHiKam.tsx
diff --git a/src-editor/src/Types/RTSPImage.tsx → src-admin/src/Types/RTSPImage.tsx b/src-editor/src/Types/RTSPImage.tsx → src-admin/src/Types/RTSPImage.tsx
diff --git a/src-editor/src/Types/RTSPReolinkE1.tsx → src-admin/src/Types/RTSPReolinkE1.tsx b/src-editor/src/Types/RTSPReolinkE1.tsx → src-admin/src/Types/RTSPReolinkE1.tsx
diff --git a/src-editor/src/Types/URLBasicAuthImage.tsx → src-admin/src/Types/URLBasicAuthImage.tsx b/src-editor/src/Types/URLBasicAuthImage.tsx → src-admin/src/Types/URLBasicAuthImage.tsx
diff --git a/src-editor/src/Types/URLImage.tsx → src-admin/src/Types/URLImage.tsx b/src-editor/src/Types/URLImage.tsx → src-admin/src/Types/URLImage.tsx