homebridge-melcloud-control 4.3.14 → 4.3.15

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/functions.js +85 -83
  3. package/src/melcloudhome.js +3 -3
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "displayName": "MELCloud Control",
3
3
  "name": "homebridge-melcloud-control",
4
- "version": "4.3.14",
4
+ "version": "4.3.15",
5
5
  "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
6
6
  "license": "MIT",
7
7
  "author": "grzegorz914",
package/src/functions.js CHANGED
@@ -55,128 +55,130 @@ class Functions extends EventEmitter {
55
55
  }
56
56
 
57
57
  async ensureChromiumInstalled() {
58
- let chromiumPath = '/usr/bin/chromium-browser';
58
+ let chromiumPath = null;
59
59
 
60
60
  try {
61
- // Detect OS
62
- const { stdout: osOut } = await execPromise('uname -s');
61
+ // --- Detect OS ---
62
+ const { stdout: osOut } = await execPromise("uname -s");
63
63
  const osName = osOut.trim();
64
- if (this.logDebug) this.emit('debug', `Detected OS: ${osName}`);
65
-
66
- // Detect Architecture
67
- const { stdout: archOut } = await execPromise('uname -m');
64
+ const { stdout: archOut } = await execPromise("uname -m");
68
65
  const arch = archOut.trim();
69
- if (this.logDebug) this.emit('debug', `Detected architecture: ${arch}`);
70
66
 
71
- // Docker detection
72
- let isDocker = false;
73
- try {
74
- await access('/.dockerenv', fs.constants.F_OK);
75
- isDocker = true;
76
- } catch { }
67
+ const isARM = arch.startsWith("arm") || arch.startsWith("aarch64") || arch.startsWith("aarch");
68
+ const isMac = osName === "Darwin";
69
+ const isLinux = osName === "Linux";
77
70
 
71
+ // --- Detect Docker ---
72
+ let isDocker = false;
73
+ try { await access("/.dockerenv"); isDocker = true; } catch { }
78
74
  try {
79
- const { stdout } = await execPromise('cat /proc/1/cgroup || true');
80
- if (stdout.includes('docker') || stdout.includes('containerd')) isDocker = true;
75
+ const { stdout } = await execPromise("cat /proc/1/cgroup || true");
76
+ if (stdout.includes("docker") || stdout.includes("containerd")) isDocker = true;
81
77
  } catch { }
82
- if (isDocker && this.logDebug) this.emit('debug', 'Running inside Docker container');
83
78
 
84
- // macOS
85
- if (osName === 'Darwin') {
86
- chromiumPath = '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome';
87
- try {
88
- await access(chromiumPath, fs.constants.X_OK);
89
- return chromiumPath;
90
- } catch {
91
- return null;
79
+ // --- macOS ---
80
+ if (isMac) {
81
+ const macCandidates = [
82
+ "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
83
+ "/Applications/Chromium.app/Contents/MacOS/Chromium"
84
+ ];
85
+ for (const p of macCandidates) {
86
+ try { await access(p, fs.constants.X_OK); return p; } catch { }
92
87
  }
88
+ return null;
93
89
  }
94
90
 
95
- // ARM
96
- // ARM
97
- if (arch.startsWith('arm') || arch.startsWith('aarch')) {
98
-
99
- const candidates = [
100
- '/usr/bin/chromium-browser',
101
- '/usr/bin/chromium'
91
+ // --- ARM / Raspberry Pi ---
92
+ if (isARM && isLinux) {
93
+ const armCandidates = [
94
+ "/usr/bin/chromium-browser",
95
+ "/usr/bin/chromium",
96
+ "/snap/bin/chromium"
102
97
  ];
103
98
 
104
- // sprawdzam czy któryś istnieje
105
- for (const path of candidates) {
106
- try {
107
- await access(path, fs.constants.X_OK);
108
- chromiumPath = path;
109
- return chromiumPath;
110
- } catch { }
99
+ // Try existing
100
+ for (const p of armCandidates) {
101
+ try { await access(p, fs.constants.X_OK); return p; } catch { }
111
102
  }
112
103
 
113
- // instalacja Chromium
114
- try {
115
- await execPromise('sudo apt-get update -y && sudo apt-get install -y chromium-browser chromium-codecs-ffmpeg');
116
- } catch {
117
- try {
118
- await execPromise('sudo apt-get install -y chromium');
119
- } catch {
120
- return null;
121
- }
104
+ // If not in Docker, try apt installation
105
+ if (!isDocker) {
106
+ try { await execPromise("sudo apt-get update -y"); } catch { }
107
+ try { await execPromise("sudo apt-get install -y chromium-browser chromium-codecs-ffmpeg || true"); } catch { }
108
+ try { await execPromise("sudo apt-get install -y chromium || true"); } catch { }
122
109
  }
123
110
 
124
- // po instalacji ponownie sprawdzam obie nazwy
125
- for (const path of candidates) {
126
- try {
127
- await access(path, fs.constants.X_OK);
128
- chromiumPath = path;
129
- return chromiumPath;
130
- } catch { }
111
+ // Retry after installation
112
+ for (const p of armCandidates) {
113
+ try { await access(p, fs.constants.X_OK); return p; } catch { }
131
114
  }
132
115
 
133
116
  return null;
134
117
  }
135
118
 
136
- // Linux x64
137
- if (osName === 'Linux') {
138
- let systemChromium = null;
119
+ // --- QNAP / Entware ---
120
+ let entwareExists = false;
121
+ try { await access("/opt/bin/opkg", fs.constants.X_OK); entwareExists = true; } catch { }
122
+
123
+ if (entwareExists) {
139
124
  try {
140
- const { stdout: checkOut } = await execPromise('which chromium || which chromium-browser || true');
141
- systemChromium = checkOut.trim() || null;
125
+ await execPromise("/opt/bin/opkg update");
126
+ await execPromise("/opt/bin/opkg install nspr nss libx11 libxcomposite libxdamage libxrandr atk libcups libdrm libgbm alsa-lib");
127
+ process.env.LD_LIBRARY_PATH = `/opt/lib:${process.env.LD_LIBRARY_PATH || ""}`;
142
128
  } catch { }
129
+ }
130
+
131
+ // --- Synology DSM 7 ---
132
+ const synoCandidates = [
133
+ "/var/packages/Chromium/target/usr/bin/chromium",
134
+ "/usr/local/chromium/bin/chromium"
135
+ ];
136
+ for (const p of synoCandidates) {
137
+ try { await access(p, fs.constants.X_OK); return p; } catch { }
138
+ }
139
+
140
+ // --- Linux x64 ---
141
+ if (isLinux) {
142
+ const linuxCandidates = [
143
+ "/usr/bin/chromium",
144
+ "/usr/bin/chromium-browser",
145
+ "/usr/bin/google-chrome",
146
+ "/snap/bin/chromium",
147
+ "/usr/local/bin/chromium"
148
+ ];
143
149
 
144
- // Entware (QNAP)
145
- let entwareExists = false;
146
150
  try {
147
- await access('/opt/bin/opkg', fs.constants.X_OK);
148
- entwareExists = true;
151
+ const { stdout } = await execPromise("which chromium || which chromium-browser || which google-chrome || true");
152
+ const found = stdout.trim();
153
+ if (found) return found;
149
154
  } catch { }
150
155
 
151
- if (entwareExists) {
152
- try {
153
- await execPromise('/opt/bin/opkg update');
154
- await execPromise('/opt/bin/opkg install nspr nss libx11 libxcomposite libxdamage libxrandr libatk libatk-bridge libcups libdrm libgbm libasound');
155
- process.env.LD_LIBRARY_PATH = `/opt/lib:${process.env.LD_LIBRARY_PATH || ''}`;
156
- } catch { }
156
+ for (const p of linuxCandidates) {
157
+ try { await access(p, fs.constants.X_OK); return p; } catch { }
157
158
  }
158
159
 
159
- // Install missing libs
160
+ // Docker: try installing chromium inside container (if allowed)
161
+ if (isDocker) {
162
+ try { await execPromise("apt-get update -y && apt-get install -y chromium || true"); } catch { }
163
+ try { await access("/usr/bin/chromium", fs.constants.X_OK); return "/usr/bin/chromium"; } catch { }
164
+ }
165
+
166
+ // Install missing libraries
160
167
  const depCommands = [
161
- 'apt-get update -y && apt-get install -y libnspr4 libnss3 libx11-6 libxcomposite1 libxdamage1 libxrandr2 libatk1.0-0 libcups2 libdrm2 libgbm1 libasound2',
162
- 'apk add --no-cache nspr nss libx11 libxcomposite libxdamage libxrandr atk cups libdrm libgbm alsa-lib',
163
- 'yum install -y nspr nss libX11 libXcomposite libXdamage libXrandr atk cups libdrm libgbm alsa-lib'
168
+ "apt-get update -y && apt-get install -y libnspr4 libnss3 libx11-6 libxcomposite1 libxdamage1 libxrandr2 libatk1.0-0 libcups2 libdrm2 libgbm1 libasound2 || true",
169
+ "yum install -y nspr nss libX11 libXcomposite libXdamage libXrandr atk cups libdrm libgbm alsa-lib || true",
170
+ "apk add --no-cache nspr nss libx11 libxcomposite libxdamage libxrandr atk cups libdrm libgbm alsa-lib || true"
164
171
  ];
165
-
166
172
  for (const cmd of depCommands) {
167
- try {
168
- await execPromise(`sudo ${cmd}`);
169
- } catch { }
173
+ try { await execPromise(`sudo ${cmd}`); } catch { }
170
174
  }
171
175
 
172
- process.env.LD_LIBRARY_PATH = `/usr/lib:/usr/lib64:${process.env.LD_LIBRARY_PATH || ''}`;
173
- return systemChromium;
176
+ return null;
174
177
  }
175
178
 
176
- if (this.logDebug) this.emit('debug', `Unsupported OS: ${osName}`);
177
179
  return null;
178
- } catch (error) {
179
- if (this.logError) this.emit('error', `Chromium detection/install error: ${error.message}`);
180
+ } catch (err) {
181
+ if (this.logError) this.emit("error", `Chromium detection error: ${err.message}`);
180
182
  return null;
181
183
  }
182
184
  }
package/src/melcloudhome.js CHANGED
@@ -219,7 +219,7 @@ class MelCloudHome extends EventEmitter {
219
219
 
220
220
  async connect() {
221
221
  if (this.logDebug) this.emit('debug', 'Connecting to MELCloud Home');
222
- const GLOBAL_TIMEOUT = 90000;
222
+ const GLOBAL_TIMEOUT = 120000;
223
223
 
224
224
  let browser;
225
225
  try {
@@ -228,7 +228,7 @@ class MelCloudHome extends EventEmitter {
228
228
  // Get Chromium path
229
229
  let chromiumPath = await this.functions.ensureChromiumInstalled();
230
230
 
231
- // === Fallback to Puppeteer's built-in Chromium ===
231
+ // === Fallback to Puppeteer's bundled Chromium ===
232
232
  if (!chromiumPath) {
233
233
  try {
234
234
  const puppeteerPath = puppeteer.executablePath();
@@ -245,7 +245,7 @@ class MelCloudHome extends EventEmitter {
245
245
  }
246
246
  }
247
247
 
248
- // Verify executable works
248
+ // === Verify Chromium executable ===
249
249
  try {
250
250
  const { stdout } = await execPromise(`"${chromiumPath}" --version`);
251
251
  if (this.logDebug) this.emit('debug', `Chromium detected: ${stdout.trim()}`);