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

Fix return output binding logic #264

Merged
merged 11 commits into from
Dec 2, 2019
Merged

Fix return output binding logic #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9f3d17f
updates to make 2.0 worker 1.0 compatible
mhoeger Nov 21, 2019
2c217c9
split validation logic so it's both v1 and v2 compatible
mhoeger Nov 22, 2019
f57858a
hard-coded solution to camelCase timer trigger while proper fix is ou…
mhoeger Nov 22, 2019
35337f6
added test
Nov 25, 2019
ec52d57
adding unit test
Nov 25, 2019
051ab27
testing both v1 behavior and v2 behavior
Nov 25, 2019
3505bd3
dont code without intellisense
Nov 25, 2019
0be167e
remove e2e test until have better test on functions host v2 and v3
Nov 25, 2019
874cc71
properly convert data when defined as output array
mhoeger Nov 25, 2019
d575c48
fix worker validation logic and warning message on ts changes
Nov 27, 2019
773b315
add tests
Nov 28, 2019
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
4 changes: 3 additions & 1 deletion scripts/generateProtos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ async function generateProtos() {
.catch(err => console.log(`Could not compile to JavaScript: ${err}`));

// Don't generate with Node.js v12 until resolved: https://github.com/protobufjs/protobuf.js/issues/1275
if (!process.version.startsWith("v12")) {
if (process.version.startsWith("v12") && process.platform === 'win32') {
console.warn("Warning! Could not compile to TypeScript for Node.js 12 and Windows OS. Do not change public interfaces.");
} else {
genTs(allFiles)
.then(data => console.log("Compiled to TypeScript."))
.catch(err => console.log(`Could not compile to TypeScript: ${err}`));
Expand Down
23 changes: 16 additions & 7 deletions src/WorkerChannel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,11 @@ export class WorkerChannel implements IWorkerChannel {
// Validate version
let version = process.version;
if (this._v1WorkerBehavior) {
if (version.startsWith("v12."))
{
if (version.startsWith("v12.")) {
systemWarn("The Node.js version you are using (" + version + ") is not fully supported with Azure Functions V2. We recommend using one the following major versions: 8, 10.");
}
} else {
if (version.startsWith("v8."))
{
if (version.startsWith("v8.")) {
let msg = "Incompatible Node.js version. The version you are using (" + version + ") is not supported with Azure Functions V3. Please use one of the following major versions: 10, 12.";
systemError(msg);
throw msg;
Expand Down Expand Up @@ -192,10 +190,22 @@ export class WorkerChannel implements IWorkerChannel {
response.returnValue = toTypedData(result.return);
} else {
let returnBinding = info.getReturnBinding();
response.returnValue = returnBinding ? returnBinding.converter(result.return) : toTypedData(result.return);
// $return binding is found: return result data to $return binding
if (returnBinding) {
response.returnValue = returnBinding.converter(result.return);
// $return binding is not found: read result as object of outputs
} else if (result.return) {
response.outputData = Object.keys(info.outputBindings)
.filter(key => result.return[key] !== undefined)
.map(key => <rpc.IParameterBinding>{
name: key,
data: info.outputBindings[key].converter(result.return[key])
});
}
}
}
if (result.bindings) {
// Data from return supersedes data from context.bindings
if (result.bindings && !response.outputData) {
response.outputData = Object.keys(info.outputBindings)
.filter(key => result.bindings[key] !== undefined)
.map(key => <rpc.IParameterBinding>{
Expand All @@ -207,7 +217,6 @@ export class WorkerChannel implements IWorkerChannel {
} catch (e) {
response.result = this.getStatus(e)
}

this._eventStream.write({
requestId: requestId,
invocationResponse: response
Expand Down
Loading