Skip to content

Refactor requests #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spudwebb wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Refactor requests #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
319e910
Refactor all request methods to centralize TaskCompletionSource handl…
spudwebb Jun 4, 2026
e4f272c
Fix SetValueResult.remainingDuration type
spudwebb Jun 4, 2026
c0bd216
Add Endpoint.GetCCs() command.
spudwebb Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 34 additions & 52 deletions Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/ConfigManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,82 +14,64 @@ internal ConfigManager(Driver Driver)
{
_driver = Driver;

Guid ID = Guid.Empty;
string RequestPL = string.Empty;
Dictionary<string, object> Request;

Request = new Dictionary<string, object>();
ID = Guid.NewGuid();
Request.Add("messageId", ID);
Request.Add("command", Enums.Commands.LoadManufacturers);
RequestPL = Newtonsoft.Json.JsonConvert.SerializeObject(Request);
_driver.ClientWebSocket.SendInstant(RequestPL);

Request = new Dictionary<string, object>();
ID = Guid.NewGuid();
Request.Add("messageId", ID);
Request.Add("command", Enums.Commands.LoadDeviceIndex);
RequestPL = Newtonsoft.Json.JsonConvert.SerializeObject(Request);
_driver.ClientWebSocket.SendInstant(RequestPL);


// Fire-and-forget the load commands but observe failures to avoid unobserved exceptions.
var req1 = new Dictionary<string, object>
{
{ "command", Enums.Commands.LoadManufacturers }
};
_ = _driver.SendRequestAsync(req1).ContinueWith(t =>
{
System.Diagnostics.Debug.WriteLine($"LoadManufacturers request failed: {t.Exception?.GetBaseException()}");
}, TaskContinuationOptions.OnlyOnFaulted);

var req2 = new Dictionary<string, object>
{
{ "command", Enums.Commands.LoadDeviceIndex }
};
_ = _driver.SendRequestAsync(req2).ContinueWith(t =>
{
System.Diagnostics.Debug.WriteLine($"LoadDeviceIndex request failed: {t.Exception?.GetBaseException()}");
}, TaskContinuationOptions.OnlyOnFaulted);
}

// Checked as of : 3.5.0
public Task<CMDResult> LookupDevice(int ManufacturerID, int ProductTypeID, int ProductId)
{

Guid ID = Guid.NewGuid();
TaskCompletionSource<CMDResult> Result = new TaskCompletionSource<CMDResult>();
_driver.Callbacks.Add(ID, (JO) =>
var request = new Dictionary<string, object>
{
{ "command", Enums.Commands.LookupDevice },
{ "manufacturerId", ManufacturerID },
{ "productType", ProductTypeID },
{ "productId", ProductId }
};

return _driver.SendRequestAsync(request, (JO, Res) =>
{
CMDResult Res = new CMDResult(JO);
if (Res.Success)
{
DeviceConfig Config = JO.SelectToken("result.config").ToObject<DeviceConfig>();
Res.SetPayload(Config);
}
Result.SetResult(Res);
});

Dictionary<string, object> Request = new Dictionary<string, object>();
Request.Add("messageId", ID);
Request.Add("command", Enums.Commands.LookupDevice);
Request.Add("manufacturerId", ManufacturerID);
Request.Add("productType", ProductTypeID);
Request.Add("productId", ProductId);

string RequestPL = Newtonsoft.Json.JsonConvert.SerializeObject(Request);
_driver.ClientWebSocket.SendInstant(RequestPL);

return Result.Task;
}

// Checked as of : 3.5.0
public Task<CMDResult> LookupManufacturer(int ManufacturerID)
{
Guid ID = Guid.NewGuid();
TaskCompletionSource<CMDResult> Result = new TaskCompletionSource<CMDResult>();
_driver.Callbacks.Add(ID, (JO) =>
var request = new Dictionary<string, object>
{
{ "command", Enums.Commands.LookupManufacturer },
{ "manufacturerId", ManufacturerID }
};

return _driver.SendRequestAsync(request, (JO, Res) =>
{
CMDResult Res = new CMDResult(JO);
if (Res.Success)
{
string Name = JO.SelectToken("result.name").ToObject<string>();
Res.SetPayload(Name);
}
Result.SetResult(Res);
});

Dictionary<string, object> Request = new Dictionary<string, object>();
Request.Add("messageId", ID);
Request.Add("command", Enums.Commands.LookupManufacturer);
Request.Add("manufacturerId", ManufacturerID);

string RequestPL = Newtonsoft.Json.JsonConvert.SerializeObject(Request);
_driver.ClientWebSocket.SendInstant(RequestPL);

return Result.Task;
}
}
}
Loading