homebridge 2.0.2-alpha.0 → 2.0.2-alpha.1
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/dist/matter/utils.d.ts.map +1 -1
- package/dist/matter/utils.js +38 -55
- package/dist/matter/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/matter/utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAUxD,MAAM,WAAW,SAAU,SAAQ,KAAK;IACtC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAE9D;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAE/D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,SAAS,CAK7F;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAIjE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAErF;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAclG;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/matter/utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAUxD,MAAM,WAAW,SAAU,SAAQ,KAAK;IACtC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAE9D;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAE/D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,SAAS,CAK7F;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAIjE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAErF;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAclG;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CA6D1D"}
|
package/dist/matter/utils.js
CHANGED
|
@@ -122,72 +122,58 @@ export function stripVendorFromLabel(label, vendor) {
|
|
|
122
122
|
* @returns The version string of @matter/main, or '0.0.0' if not found.
|
|
123
123
|
*/
|
|
124
124
|
export async function getMatterJsVersion() {
|
|
125
|
-
let matterJsVersion = '0.0.0';
|
|
126
125
|
// 1. Check MATTER_MAIN_VERSION environment variable
|
|
127
126
|
let proc;
|
|
128
127
|
try {
|
|
129
|
-
// ESM-safe: use dynamic import for process
|
|
130
128
|
proc = (await import('node:process')).default || (await import('node:process'));
|
|
131
129
|
}
|
|
132
|
-
catch
|
|
133
|
-
|
|
134
|
-
}
|
|
135
|
-
if (proc && proc.env && proc.env.MATTER_MAIN_VERSION) {
|
|
130
|
+
catch { }
|
|
131
|
+
if (proc?.env?.MATTER_MAIN_VERSION) {
|
|
136
132
|
return proc.env.MATTER_MAIN_VERSION;
|
|
137
133
|
}
|
|
138
|
-
// 2. Try
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
return matterPkg.version;
|
|
134
|
+
// 2. Try to resolve @matter/main/package.json using import.meta.resolve (Node 20+)
|
|
135
|
+
let matterPkgPath;
|
|
136
|
+
if (typeof import.meta.resolve === 'function') {
|
|
137
|
+
try {
|
|
138
|
+
matterPkgPath = import.meta.resolve('@matter/main/package.json');
|
|
144
139
|
}
|
|
140
|
+
catch { }
|
|
145
141
|
}
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
142
|
+
// 3. Fallback: try require.resolve
|
|
143
|
+
if (!matterPkgPath) {
|
|
144
|
+
try {
|
|
145
|
+
const require = createRequire(import.meta.url);
|
|
146
|
+
matterPkgPath = require.resolve('@matter/main/package.json');
|
|
147
|
+
}
|
|
148
|
+
catch { }
|
|
149
149
|
}
|
|
150
|
-
//
|
|
150
|
+
// 4. If we found a path, try to read it
|
|
151
|
+
if (matterPkgPath) {
|
|
152
|
+
try {
|
|
153
|
+
const fs = await import('node:fs/promises');
|
|
154
|
+
// Remove file:// if present (import.meta.resolve returns URLs)
|
|
155
|
+
const filePath = matterPkgPath.startsWith('file://') ? matterPkgPath.slice(7) : matterPkgPath;
|
|
156
|
+
const pkgRaw = await fs.readFile(filePath, 'utf8');
|
|
157
|
+
const pkgJson = JSON.parse(pkgRaw);
|
|
158
|
+
if (pkgJson && typeof pkgJson.version === 'string') {
|
|
159
|
+
return pkgJson.version;
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
catch { }
|
|
163
|
+
}
|
|
164
|
+
// 5. Fallback: try to read from local package.json dependencies
|
|
151
165
|
try {
|
|
152
166
|
// Use import to read the version from the project's package.json
|
|
153
167
|
// @ts-expect-error: dynamic import of JSON
|
|
154
168
|
const pkg = await import('../../package.json', { assert: { type: 'json' } });
|
|
155
169
|
const dependencies = pkg.default?.dependencies;
|
|
156
|
-
|
|
157
|
-
if (
|
|
158
|
-
return
|
|
170
|
+
const depVer = dependencies?.['@matter/main'];
|
|
171
|
+
if (depVer) {
|
|
172
|
+
return depVer;
|
|
159
173
|
}
|
|
160
174
|
}
|
|
161
|
-
catch
|
|
162
|
-
|
|
163
|
-
console.debug('[getMatterJsVersion] import ../../package.json failed:', e);
|
|
164
|
-
}
|
|
165
|
-
// 4. Try fs read of node_modules/@matter/main/package.json
|
|
166
|
-
try {
|
|
167
|
-
// Only import fs if available (Node.js)
|
|
168
|
-
const fs = await import('node:fs/promises');
|
|
169
|
-
const path = await import('node:path');
|
|
170
|
-
// ESM-safe: use dynamic import for process
|
|
171
|
-
let proc;
|
|
172
|
-
try {
|
|
173
|
-
proc = (await import('node:process')).default || (await import('node:process'));
|
|
174
|
-
}
|
|
175
|
-
catch (e) {
|
|
176
|
-
// fallback: process not available
|
|
177
|
-
}
|
|
178
|
-
const cwd = proc?.cwd ? proc.cwd() : '';
|
|
179
|
-
const pkgPath = path.resolve(cwd, 'node_modules', '@matter', 'main', 'package.json');
|
|
180
|
-
const pkgRaw = await fs.readFile(pkgPath, 'utf8');
|
|
181
|
-
const pkgJson = JSON.parse(pkgRaw);
|
|
182
|
-
if (pkgJson && typeof pkgJson.version === 'string') {
|
|
183
|
-
return pkgJson.version;
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
catch (e) {
|
|
187
|
-
// eslint-disable-next-line no-console
|
|
188
|
-
console.debug('[getMatterJsVersion] fs read node_modules/@matter/main/package.json failed:', e);
|
|
189
|
-
}
|
|
190
|
-
// 5. Final fallback: try to import @matter/main/package.json via dynamic import
|
|
175
|
+
catch { }
|
|
176
|
+
// 6. Final fallback: try to import @matter/main/package.json via dynamic import
|
|
191
177
|
try {
|
|
192
178
|
// @ts-expect-error: dynamic import of JSON
|
|
193
179
|
const matterPkg = await import('@matter/main/package.json', { assert: { type: 'json' } });
|
|
@@ -195,11 +181,8 @@ export async function getMatterJsVersion() {
|
|
|
195
181
|
return matterPkg.default.version;
|
|
196
182
|
}
|
|
197
183
|
}
|
|
198
|
-
catch
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
}
|
|
202
|
-
// 6. Give up
|
|
203
|
-
return matterJsVersion;
|
|
184
|
+
catch { }
|
|
185
|
+
// 7. Give up
|
|
186
|
+
return '0.0.0';
|
|
204
187
|
}
|
|
205
188
|
//# sourceMappingURL=utils.js.map
|
package/dist/matter/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/matter/utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C;;GAEG;AACH,MAAM,UAAU,GAAG,aAAa,CAAA;AAChC,MAAM,WAAW,GAAG,SAAS,CAAA;AAS7B;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,KAAc;IACxC,OAAO,KAAK,YAAY,KAAK,IAAI,MAAM,IAAI,KAAK,CAAA;AAClD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,KAAc;IACzC,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;AACpD,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAmC;IACrE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;AAC5C,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,oBAAoB,CAAC,QAAgB;IACnD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;IAChD,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,IAAI,QAAQ,CAAA;IAC7F,OAAO,SAAuB,CAAA;AAChC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,YAAoB,EAAE,MAAc;IACvE,OAAO,GAAG,YAAY,IAAI,MAAM,EAAgB,CAAA;AAClD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAyB,EAAE,MAA0B;IACxF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,CAAA;IACX,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAA;IACd,CAAC;IACD,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;IAC7D,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;QACf,OAAO,KAAK,CAAA;IACd,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;SAC5D,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACpB,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAA;AAC5C,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/matter/utils.ts"],"names":[],"mappings":"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"}
|