Skip to content

Avoid external contentType processing for OPC UA #1402

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Avoid external contentType processing for OPC UA #1402

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
8ac8dce
refactor: avoid external contentType processing for OPC UA
danielpeintner Jun 25, 2025
fde2f4c
refactor: move removing contentType just before returning
danielpeintner Jun 25, 2025
b365da4
refactor: remove contentType only if not handled by internal OPC UA C…
danielpeintner Jun 25, 2025
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 packages/binding-opcua/src/codec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ export const theOpcuaJSONCodec = new OpcuaJSONCodec();

export class OpcuaBinaryCodec implements ContentCodec {
getMediaType(): string {
return "application/opcua+octet-stream"; // see Ege
return "application/opcua+octet-stream";
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a left-over I would like to remove

}

bytesToValue(bytes: Buffer, schema: DataSchema, parameters?: { [key: string]: string }): DataValueJSON {
Expand Down
8 changes: 8 additions & 0 deletions packages/binding-opcua/src/opcua-protocol-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,13 @@ export class OPCUAProtocolClient implements ProtocolClient {
return this._resolveNodeId2(form, fNodeId as NodeIdLike | NodeByBrowsePath);
}

// node-opcua handles the contentType internally and no further *external* processing should be done
private vanishContentType(form: OPCUAForm) {
if (!(form.contentType === "application/opcua+json" || form.contentType === "application/opcua+octet-stream")) {
form.contentType = undefined;
}
}

public async readResource(form: OPCUAForm): Promise<Content> {
debug(`readResource: reading ${form}`);

Expand All @@ -314,6 +321,7 @@ export class OPCUAProtocolClient implements ProtocolClient {
return this._dataValueToContent(form, dataValue);
});
debug(`readResource: contentType ${content.type}`);
this.vanishContentType(form);
return content;
}

Expand Down