Skip to content
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

Jump to bottom

[KNOWN ISSUE] Bulk request over WebAPI is limited to 64kB #82

Merged
merged 2 commits into from
Feb 20, 2023
Merged

[KNOWN ISSUE] Bulk request over WebAPI is limited to 64kB #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbf16a5
Create draft PR for #19
PTKu Feb 18, 2023
f74746d
[webapiconn] Adds segemtation of bulk requestion that exceed 64KB
PTKu Feb 20, 2023
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
2 changes: 1 addition & 1 deletion src/ix.compiler/src/ixc/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"profiles": {
"ixc": {
"commandName": "Project",
"workingDirectory": "c:\\W\\Develop\\gh\\ix-ax\\ix\\src\\tests.integrations\\integrated\\src\\ax\\"
"workingDirectory": "c:\\W\\Develop\\gh\\ix-ax\\ix.framework.app.templates\\working\\templates\\ax\\"
}
}
}
4 changes: 4 additions & 0 deletions src/ix.connectors/src/Ix.Connector.S71500.WebAPI/BuiltInWrappers/IWebApiPrimitive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ namespace Ix.Connector.S71500.WebApi;

internal interface IWebApiPrimitive : ITwinPrimitive
{
ApiPlcReadRequest PeekPlcReadRequestData { get; }

ApiPlcWriteRequest PeekPlcWriteRequestData { get; }

ApiPlcReadRequest PlcReadRequestData { get; }
ApiPlcWriteRequest PlcWriteRequestData { get; }

Expand Down
30 changes: 26 additions & 4 deletions src/ix.connectors/src/Ix.Connector.S71500.WebAPI/BuiltInWrappers/WebApiBool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,35 @@ public WebApiBool(ITwinObject parent,
_webApiConnector = WebApiConnector.Cast(parent.GetConnector());
}

private ApiPlcWriteRequest _plcWriteRequestData;
private ApiPlcReadRequest _plcReadRequestData;

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PeekPlcReadRequestData => _plcReadRequestData ?? WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData =>
WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
ApiPlcWriteRequest IWebApiPrimitive.PeekPlcWriteRequestData => _plcWriteRequestData ?? WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData =>
WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData
{
get
{
_plcReadRequestData = WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
return _plcReadRequestData;
}

}

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData
{
get
{
_plcWriteRequestData = WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);
return _plcWriteRequestData;
}
}

/// <inheritdoc />
public void Read(string value)
Expand Down
30 changes: 26 additions & 4 deletions src/ix.connectors/src/Ix.Connector.S71500.WebAPI/BuiltInWrappers/WebApiByte.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,35 @@ public WebApiByte()
_webApiConnector = new WebApiConnector();
}

private ApiPlcWriteRequest _plcWriteRequestData;
private ApiPlcReadRequest _plcReadRequestData;

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PeekPlcReadRequestData => _plcReadRequestData ?? WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PeekPlcWriteRequestData => _plcWriteRequestData ?? WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData =>
WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData
{
get
{
_plcReadRequestData = WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
return _plcReadRequestData;
}

}

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData =>
WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData
{
get
{
_plcWriteRequestData = WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);
return _plcWriteRequestData;
}
}

/// <inheritdoc />
public void Read(string result)
Expand Down
37 changes: 32 additions & 5 deletions src/ix.connectors/src/Ix.Connector.S71500.WebAPI/BuiltInWrappers/WebApiChar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,40 @@ public WebApiChar()
_webApiConnector = new WebApiConnector();
}

private ApiPlcWriteRequest _plcWriteRequestData;
private ApiPlcReadRequest _plcReadRequestData;

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PeekPlcReadRequestData => _plcReadRequestData ?? WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData =>
WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
ApiPlcWriteRequest IWebApiPrimitive.PeekPlcWriteRequestData => _plcWriteRequestData ?? WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData =>
WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData
{
get
{
_plcReadRequestData = WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
return _plcReadRequestData;
}

}

private char AdjustToValueValue(char value)
{
return (char)(value < 0x0020 || value > 0x007F ? 0x0020 : value);
}

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData
{
get
{
_plcWriteRequestData = WebApiConnector.CreateWriteRequest(Symbol, AdjustToValueValue(CyclicToWrite), _webApiConnector.DBName);
return _plcWriteRequestData;
}
}

/// <inheritdoc />
public void Read(string value)
Expand All @@ -54,6 +81,6 @@ public override async Task<char> GetAsync()
/// <inheritdoc />
public override async Task<char> SetAsync(char value)
{
return await _webApiConnector.WriteAsync(this, value);
return await _webApiConnector.WriteAsync(this, AdjustToValueValue(value));
}
}
29 changes: 25 additions & 4 deletions src/ix.connectors/src/Ix.Connector.S71500.WebAPI/BuiltInWrappers/WebApiDInt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,35 @@ public WebApiDInt(ITwinObject parent,
_webApiConnector = WebApiConnector.Cast(parent.GetConnector());
}

private ApiPlcWriteRequest _plcWriteRequestData;
private ApiPlcReadRequest _plcReadRequestData;

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData =>
WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
ApiPlcReadRequest IWebApiPrimitive.PeekPlcReadRequestData => _plcReadRequestData ?? WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData =>
WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);
ApiPlcWriteRequest IWebApiPrimitive.PeekPlcWriteRequestData => _plcWriteRequestData ?? WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData
{
get
{
_plcReadRequestData = WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
return _plcReadRequestData;
}

}

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData
{
get
{
_plcWriteRequestData = WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);
return _plcWriteRequestData;
}
}

/// <inheritdoc />
public void Read(string value)
Expand Down
30 changes: 26 additions & 4 deletions src/ix.connectors/src/Ix.Connector.S71500.WebAPI/BuiltInWrappers/WebApiDWord.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,35 @@ public WebApiDWord(ITwinObject parent,
_webApiConnector = WebApiConnector.Cast(parent.GetConnector());
}

private ApiPlcWriteRequest _plcWriteRequestData;
private ApiPlcReadRequest _plcReadRequestData;

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PeekPlcReadRequestData => _plcReadRequestData ?? WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PeekPlcWriteRequestData => _plcWriteRequestData ?? WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData =>
WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData
{
get
{
_plcReadRequestData = WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
return _plcReadRequestData;
}

}

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData =>
WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData
{
get
{
_plcWriteRequestData = WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);
return _plcWriteRequestData;
}
}

/// <inheritdoc />
public void Read(string value)
Expand Down
29 changes: 25 additions & 4 deletions src/ix.connectors/src/Ix.Connector.S71500.WebAPI/BuiltInWrappers/WebApiDate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,35 @@ public WebApiDate(ITwinObject parent,
_webApiConnector = WebApiConnector.Cast(parent.GetConnector());
}

private ApiPlcWriteRequest _plcWriteRequestData;
private ApiPlcReadRequest _plcReadRequestData;

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData =>
WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
ApiPlcReadRequest IWebApiPrimitive.PeekPlcReadRequestData => _plcReadRequestData ?? WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData =>
WebApiConnector.CreateWriteRequest(Symbol, GetFromDate(CyclicToWrite), _webApiConnector.DBName);
ApiPlcWriteRequest IWebApiPrimitive.PeekPlcWriteRequestData => _plcWriteRequestData ?? WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData
{
get
{
_plcReadRequestData = WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
return _plcReadRequestData;
}

}

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData
{
get
{
_plcWriteRequestData = WebApiConnector.CreateWriteRequest(Symbol, GetFromDate(CyclicToWrite), _webApiConnector.DBName);
return _plcWriteRequestData;
}
}

/// <inheritdoc />
public void Read(string value)
Expand Down
30 changes: 26 additions & 4 deletions src/ix.connectors/src/Ix.Connector.S71500.WebAPI/BuiltInWrappers/WebApiDateTime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,35 @@ public WebApiDateTime(ITwinObject parent,
_webApiConnector = WebApiConnector.Cast(parent.GetConnector());
}

private ApiPlcWriteRequest _plcWriteRequestData;
private ApiPlcReadRequest _plcReadRequestData;

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData =>
WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
ApiPlcReadRequest IWebApiPrimitive.PeekPlcReadRequestData => _plcReadRequestData ?? WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData =>
WebApiConnector.CreateWriteRequest(Symbol, GetFromDate(CyclicToWrite), _webApiConnector.DBName);
ApiPlcWriteRequest IWebApiPrimitive.PeekPlcWriteRequestData => _plcWriteRequestData ?? WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData
{
get
{
_plcReadRequestData = WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
return _plcReadRequestData;
}

}

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData
{
get
{
_plcWriteRequestData = WebApiConnector.CreateWriteRequest(Symbol, GetFromDate(CyclicToWrite), _webApiConnector.DBName);
return _plcWriteRequestData;
}
}

/// <inheritdoc />
public void Read(string value)
Expand Down
30 changes: 26 additions & 4 deletions src/ix.connectors/src/Ix.Connector.S71500.WebAPI/BuiltInWrappers/WebApiInt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,35 @@ public WebApiInt(ITwinObject parent,
_webApiConnector = WebApiConnector.Cast(parent.GetConnector());
}

private ApiPlcWriteRequest _plcWriteRequestData;
private ApiPlcReadRequest _plcReadRequestData;

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PeekPlcReadRequestData => _plcReadRequestData ?? WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PeekPlcWriteRequestData => _plcWriteRequestData ?? WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData =>
WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData
{
get
{
_plcReadRequestData = WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
return _plcReadRequestData;
}

}

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData =>
WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData
{
get
{
_plcWriteRequestData = WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);
return _plcWriteRequestData;
}
}

/// <inheritdoc />
public void Read(string value)
Expand Down
30 changes: 26 additions & 4 deletions src/ix.connectors/src/Ix.Connector.S71500.WebAPI/BuiltInWrappers/WebApiLDate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,35 @@ public WebApiLDate(ITwinObject parent,
_webApiConnector = WebApiConnector.Cast(parent.GetConnector());
}

private ApiPlcWriteRequest _plcWriteRequestData;
private ApiPlcReadRequest _plcReadRequestData;

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData =>
WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
ApiPlcReadRequest IWebApiPrimitive.PeekPlcReadRequestData => _plcReadRequestData ?? WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData =>
WebApiConnector.CreateWriteRequest(Symbol, GetFromDate(CyclicToWrite), _webApiConnector.DBName);
ApiPlcWriteRequest IWebApiPrimitive.PeekPlcWriteRequestData => _plcWriteRequestData ?? WebApiConnector.CreateWriteRequest(Symbol, CyclicToWrite, _webApiConnector.DBName);

/// <inheritdoc />
ApiPlcReadRequest IWebApiPrimitive.PlcReadRequestData
{
get
{
_plcReadRequestData = WebApiConnector.CreateReadRequest(Symbol, _webApiConnector.DBName);
return _plcReadRequestData;
}

}

/// <inheritdoc />
ApiPlcWriteRequest IWebApiPrimitive.PlcWriteRequestData
{
get
{
_plcWriteRequestData = WebApiConnector.CreateWriteRequest(Symbol, GetFromDate(CyclicToWrite), _webApiConnector.DBName);
return _plcWriteRequestData;
}
}

public void Read(string value)
{
Expand Down
Loading