Skip to content

Commit 82d04ed

Browse files
V3.0 (#15)
* Versions * NVM * Implement Backup events and Health Checks * Update README.md * Naming * minor name corrections * Update package.json * Version Bumps + EP Command Classes * PSI Serialport v10 support * .NET Standard 2.0 * Deps * VS * Update ZWaveJS.NET.csproj * Smart Start * Route Statistics * Update CHANGELOG.md * Build * Delete yarn.lock * Create yarn.lock * Decimal not Integer * 3.0 Alpha * Better socket management. * Scratch Pad * Toolkit * Error Handling * Recovery * Unix Binary * Thread mgmt * Update ZWaveJS.NET.csproj * Alpha 2 * Updates * Cleanup * S2 Dialog * Kill Process * DSK * Node Controls * Node Options * Update Node.cs * Restart Mech * Socket * Just because. * Switch to container class on task result. * Switch object * WS Client Swap * Net stats in UI * Device Event Dialog Update * Check isFinal before setting failed interview signal * Update Event.cs * Health Checks * FW Updates * Replace Failed Node * Associations * Alpha 6 * Smart Start * Prep * Update Readme.png * So close * I have a funny feeling, this the last (crucial) commit * Multicast * Update Controller.cs * Read me * Update README.md * Frameworks * Read me * Update README.md * Update Helpers.cs * Create codeql-analysis.yml * Update codeql-analysis.yml * Yarn * Network Heal UI * Toolkit * Update README.md * Update README.md * Release
1 parent d58f7d2 commit 82d04ed

File tree

118 files changed

+14119
-4894
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+14119
-4894
lines changed

.github/workflows/BuildPSI.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
strategy:
1010
matrix:
1111
node-version: [16]
12-
os: [windows-latest, macos-latest]
12+
os: [windows-latest, macos-latest, ubuntu-latest]
1313
include:
14-
# Define the binary names to use for uploads
15-
# - os: ubuntu-latest
16-
# file: server
17-
# asset_name: server-linux.psi
18-
# asset_body: "Linux Server Binary"
14+
# Define the binary names to use for uploads
15+
- os: ubuntu-latest
16+
file: server
17+
asset_name: server-ubuntu.psi
18+
asset_body: "Ubuntu Server Binary"
1919
- os: windows-latest
2020
file: server.exe
2121
asset_name: server-win.psi

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
**/obj/*
55
**/bin/*
66
**/.vs/*
7+
**/packages/*
78

89
# Node Stuff
910
**/node_modules/*

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
## v3.0.0
2+
3+
- Versions
4+
- ZWave JS Driver Version: 9.3.0
5+
- ZWave JS Server Version: 1.17.0 (Schema Version 17)
6+
7+
- Breaking Changes
8+
- The libary has been retargeted for **.NET Standard 2.0** and **.NET 4.5** to support a wider varitey of frameworks
9+
- All ZWave methods, now return a task encapsulating a **CMDResult** instance, containing the response payload (if any) including the **success** property and any error message.
10+
- The **NodeInterviewFailed** event now returns a **NodeInterviewFailedEventArgs** instance and no longer a generic **JObject** instance
11+
- The controller events **ValidateDSK** and **GrantSecurityClasses** have been removed.
12+
- **BeginInclusion** and **ReplaceFailedNode** now require an **InclusionOptions** instance (which contains User callbacks)
13+
- The **NodeRemoved** event now returns the **ZWaveNode** instance and no longer just it's ID.
14+
- The **NodeAdded** event now also returns an instance of **InclusionResult**.
15+
- **SetValueOptions** has been renamed to **SetValueAPIOptions**
16+
- **ValueMetaData** has been renamed to **ValueMetadata**
17+
18+
- New Features
19+
- Added **BackupNVMRaw** method and associated user callbacks
20+
- Added **RestoreNVM** method and associated user callbacks
21+
- Added **CheckLifelineHealth** method and associated user callbacks
22+
- Added **Smart Start** methods and associated user callbacks
23+
- Added **Multicast** support
24+
125
## v2.0.0
226

327
- Versions

PSI/.yarn/releases/yarn-3.1.1.cjs

Lines changed: 0 additions & 768 deletions
This file was deleted.

PSI/.yarnrc.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

PSI/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
2-
"version": "2.0.0",
2+
"version": "3.0.0",
33
"name": "server",
44
"bin": "./server.js",
55
"dependencies": {
6-
"@zwave-js/server": "1.14.0",
7-
"zwave-js": "8.10.0"
6+
"@zwave-js/server": "1.17.0",
7+
"zwave-js": "9.3.0"
88
},
99
"devDependencies": {
10-
"pkg": "^5.5.1"
10+
"pkg": "^5.7.0"
1111
},
1212
"scripts": {
1313
"build": "pkg . --compress GZip -t host"
1414
},
1515
"pkg": {
16-
"assets": "./node_modules/@serialport/bindings/build/Release/bindings.node",
16+
"assets": "./node_modules/@serialport/bindings-cpp/prebuilds/**/*",
1717
"outputPath": "dist"
1818
},
19-
"packageManager": "yarn@3.1.1"
19+
"packageManager": "yarn@3.2.1"
2020
}

PSI/server.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
// @ts-check
2-
31
const { Driver, ZWaveError, ZWaveErrorCodes } = require("zwave-js");
42
const { ZwavejsServer } = require("@zwave-js/server");
53

64
console.log("ZWaveJS.NET: Preparing server...");
75

86
const serialPort = process.env.SERIAL_PORT;
97
const wsPort = parseInt(process.env.WS_PORT);
10-
/** @type {import("zwave-js").ZWaveOptions} */
118
const driverOptions = JSON.parse(process.env.CONFIG);
129

1310
console.log(`ZWaveJS.NET: Serial Port: ${serialPort}, WSPort: ${wsPort}`);
@@ -23,13 +20,13 @@ if (driverOptions.securityKeys) {
2320

2421
console.log("ZWaveJS.NET: Instantiating driver...");
2522
const driver = new Driver(serialPort, driverOptions);
26-
// @ts-expect-error The host property is a workaround
2723
const server = new ZwavejsServer(driver, { port: wsPort, host: "localhost" });
2824
driver.on("error", (e) => {
29-
console.error(e);
25+
/*
3026
if (e instanceof ZWaveError && e.code === ZWaveErrorCodes.Driver_Failed) {
31-
process.exit(2); // Exit code 2: restart requested
27+
process.stderr.write("2\n");
3228
}
29+
*/
3330
});
3431

3532
driver.on("driver ready", () => {
@@ -38,6 +35,5 @@ driver.on("driver ready", () => {
3835

3936
console.log("ZWaveJS.NET: Starting driver...");
4037
driver.start().catch((e) => {
41-
console.error(e);
42-
process.exit(1); // Exit code 1: cannot start
38+
process.stderr.write("1\n");
4339
});

0 commit comments

Comments
 (0)