Skip to content

Commit

Permalink
Dev 1.6.6-dev.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@Luligu
Luligu committed Dec 7, 2024
1 parent fcb91b4 commit c97801b
Show file tree
Hide file tree
Showing 10 changed files with 84 additions and 110 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ If you want to run Matterbridge in Home Assistant please use the official add-on

Tamer (https://github.com/tammeryousef1006) has created the Matterbridge Discord group: https://discord.gg/QX58CDe6hd.

## [1.6.6] - 2024-12-05
## [1.6.6] - 2024-12-06

### Added

Expand Down
6 changes: 3 additions & 3 deletions frontend/build/asset-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "./static/css/main.823e08b6.css",
"main.js": "./static/js/main.cb537856.js",
"main.js": "./static/js/main.565ff6ba.js",
"static/js/453.abd36b29.chunk.js": "./static/js/453.abd36b29.chunk.js",
"static/media/roboto-latin-700-normal.woff2": "./static/media/roboto-latin-700-normal.4535474e1cf8598695ad.woff2",
"static/media/roboto-latin-500-normal.woff2": "./static/media/roboto-latin-500-normal.7077203b1982951ecf76.woff2",
Expand Down Expand Up @@ -61,11 +61,11 @@
"static/media/roboto-greek-ext-400-normal.woff": "./static/media/roboto-greek-ext-400-normal.16eb83b4a3b1ea994243.woff",
"index.html": "./index.html",
"main.823e08b6.css.map": "./static/css/main.823e08b6.css.map",
"main.cb537856.js.map": "./static/js/main.cb537856.js.map",
"main.565ff6ba.js.map": "./static/js/main.565ff6ba.js.map",
"453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
},
"entrypoints": [
"static/css/main.823e08b6.css",
"static/js/main.cb537856.js"
"static/js/main.565ff6ba.js"
]
}
2 changes: 1 addition & 1 deletion frontend/build/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.cb537856.js"></script><link href="./static/css/main.823e08b6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.565ff6ba.js"></script><link href="./static/css/main.823e08b6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
6 changes: 3 additions & 3 deletions frontend/build/static/js/main.cb537856.js → frontend/build/static/js/main.565ff6ba.js
View file

Large diffs are not rendered by default.

0 ...ld/static/js/main.cb537856.js.LICENSE.txt → ...ld/static/js/main.565ff6ba.js.LICENSE.txt
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tend/build/static/js/main.cb537856.js.map → ...tend/build/static/js/main.565ff6ba.js.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions frontend/src/components/Settings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ function MatterSettings({ matterbridgeInfo, showSnackbarMessage }) {
sendCommandToMatterbridge('setmatterport', event.target.value);
showSnackbarMessage('Restart Matterbridge to apply changes', 5);
};

// Define a function to handle change matterDiscriminator
const handleChangeMatterDiscriminator = (event) => {
console.log('handleChangeMatterDiscriminator called with value:', event.target.value);
Expand Down Expand Up @@ -287,7 +287,7 @@ function MatterSettings({ matterbridgeInfo, showSnackbarMessage }) {
}}/>
</div>
<div style={{ display: 'flex', alignItems: 'center', gap: '15px' }}>
<FormLabel color='readonly' style={{padding: '0px', margin: '0px'}}>Matter commissioning port:</FormLabel>
<FormLabel color='readonly' style={{padding: '0px', margin: '0px'}}>Commissioning port:</FormLabel>
<TextField value={matterPort} onChange={handleChangeMatterPort} size="small" variant="outlined"
style={{ height: '30px', flexGrow: 1 }} InputProps={{
style: {
Expand All @@ -297,7 +297,7 @@ function MatterSettings({ matterbridgeInfo, showSnackbarMessage }) {
}}/>
</div>
<div style={{ display: 'flex', alignItems: 'center', gap: '15px' }}>
<FormLabel color='readonly' style={{padding: '0px', margin: '0px'}}>Matter commissioning discriminator:</FormLabel>
<FormLabel color='readonly' style={{padding: '0px', margin: '0px'}}>Commissioning discriminator:</FormLabel>
<TextField value={matterDiscriminator} onChange={handleChangeMatterDiscriminator} size="small" variant="outlined"
style={{ height: '30px', flexGrow: 1 }} InputProps={{
style: {
Expand All @@ -307,7 +307,7 @@ function MatterSettings({ matterbridgeInfo, showSnackbarMessage }) {
}}/>
</div>
<div style={{ display: 'flex', alignItems: 'center', gap: '15px' }}>
<FormLabel color='readonly' style={{padding: '0px', margin: '0px'}}>Matter commissioning passcode:</FormLabel>
<FormLabel color='readonly' style={{padding: '0px', margin: '0px'}}>Commissioning passcode:</FormLabel>
<TextField value={matterPasscode} onChange={handleChangemMatterPasscode} size="small" variant="outlined"
style={{ height: '30px', flexGrow: 1 }} InputProps={{
style: {
Expand Down
138 changes: 63 additions & 75 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "matterbridge",
"version": "1.6.6-dev.7",
"version": "1.6.6-dev.8",
"description": "Matterbridge plugin manager for Matter",
"author": "https://github.com/Luligu",
"license": "Apache-2.0",
Expand Down Expand Up @@ -125,9 +125,9 @@
"install:jest": "npm install --save-dev jest ts-jest @types/jest eslint-plugin-jest && npm run test"
},
"dependencies": {
"@matter/main": "^0.11.9-alpha.0-20241206-22f233334",
"@matter/nodejs": "^0.11.9-alpha.0-20241206-22f233334",
"@project-chip/matter.js": "^0.11.9-alpha.0-20241206-22f233334",
"@matter/main": "^0.11.9-alpha.0-20241207-b604cfa44",
"@matter/nodejs": "^0.11.9-alpha.0-20241207-b604cfa44",
"@project-chip/matter.js": "^0.11.9-alpha.0-20241207-b604cfa44",
"archiver": "7.0.1",
"express": "4.21.1",
"glob": "11.0.0",
Expand All @@ -154,4 +154,4 @@
"typescript": "5.7.2",
"typescript-eslint": "8.17.0"
}
}
}
20 changes: 3 additions & 17 deletions src/matterbridgeEdge.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,23 +111,9 @@ export class MatterbridgeEdge extends Matterbridge {
if (this.mdnsInterface) this.environment.vars.set('mdns.networkInterface', this.mdnsInterface);

// Setup Matter commissioning server
this.port = 5540;
this.passcode = PaseClient.generateRandomPasscode();
this.discriminator = PaseClient.generateRandomDiscriminator();
/*
static generateRandomPasscode() {
let passcode: number;
passcode = (Crypto.getRandomUInt32() % 99999998) + 1; // prevents 00000000 and 99999999
if (CommissioningOptions.FORBIDDEN_PASSCODES.includes(passcode)) {
passcode += 1; // With current forbidden passcode list can never collide
}
return passcode;
}
static generateRandomDiscriminator() {
return Crypto.getRandomUInt16() % 4096;
}
*/
// this.port = 5540;
// this.passcode = PaseClient.generateRandomPasscode();
// this.discriminator = PaseClient.generateRandomDiscriminator();
}

override async startMatterStorage(storageType: string, storageName: string): Promise<void> {
Expand Down

0 comments on commit c97801b

Please sign in to comment.