Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion src/eventHandlers/WorkerInitHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import { access, constants } from 'fs';
import * as path from 'path';
import { AzureFunctionsRpcMessages as rpc } from '../../azure-functions-language-worker-protobuf/src/rpc';
import { version as workerVersion } from '../constants';
import { startApp } from '../startApp';
import { isError } from '../utils/ensureErrorType';
import { nonNullProp } from '../utils/nonNull';
Expand All @@ -19,7 +20,14 @@ export class WorkerInitHandler extends EventHandler<'workerInitRequest', 'worker
readonly responseName = 'workerInitResponse';

getDefaultResponse(_msg: rpc.IWorkerInitRequest): rpc.IWorkerInitResponse {
return {};
return {
workerMetadata: {
runtimeName: 'node',
runtimeVersion: process.version,
workerBitness: process.arch,
workerVersion,
},
};
}

async handleEvent(channel: WorkerChannel, msg: rpc.IWorkerInitRequest): Promise<rpc.IWorkerInitResponse> {
Expand Down
44 changes: 30 additions & 14 deletions test/eventHandlers/WorkerInitHandler.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,34 @@ export namespace Msg {
};
}

export const response: rpc.IStreamingMessage = {
requestId: 'id',
workerInitResponse: {
capabilities: {
RpcHttpBodyOnly: 'true',
RpcHttpTriggerMetadataRemoved: 'true',
IgnoreEmptyValuedRpcHttpHeaders: 'true',
UseNullableValueDictionaryForHttp: 'true',
WorkerStatus: 'true',
TypedDataCollection: 'true',
},
result: {
status: rpc.StatusResult.Status.Success,
const workerMetadataRegExps = {
'workerInitResponse.workerMetadata.runtimeVersion': /^v[0-9]+\.[0-9]+\.[0-9]+$/,
'workerInitResponse.workerMetadata.workerBitness': /^(x64|ia32|arm64)$/,
'workerInitResponse.workerMetadata.workerVersion': /^3\.[0-9]+\.[0-9]+$/,
};

export const response = new RegExpStreamingMessage(
{
requestId: 'id',
workerInitResponse: {
capabilities: {
RpcHttpBodyOnly: 'true',
RpcHttpTriggerMetadataRemoved: 'true',
IgnoreEmptyValuedRpcHttpHeaders: 'true',
UseNullableValueDictionaryForHttp: 'true',
WorkerStatus: 'true',
TypedDataCollection: 'true',
},
result: {
status: rpc.StatusResult.Status.Success,
},
workerMetadata: {
runtimeName: 'node',
},
},
},
};
workerMetadataRegExps
);

export function failedResponse(fileName: string, errorMessage: string): RegExpStreamingMessage {
const expectedMsg: rpc.IStreamingMessage = {
Expand All @@ -54,12 +66,16 @@ export namespace Msg {
message: errorMessage,
},
},
workerMetadata: {
runtimeName: 'node',
},
},
};
return new RegExpStreamingMessage(expectedMsg, {
'workerInitResponse.result.exception.stackTrace': new RegExp(
`Error: ${escapeStringRegexp(errorMessage)}\\s*at`
),
...workerMetadataRegExps,
});
}

Expand Down