Skip to content

Temporarily remove app startup feature #596

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

Merged
merged 1 commit into from
Jun 13, 2022
Merged

Temporarily remove app startup feature #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 4 additions & 32 deletions src/eventHandlers/WorkerInitHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@
// Licensed under the MIT License.

import { access, constants } from 'fs';
import { pathExists } from 'fs-extra';
import * as path from 'path';
import { AzureFunctionsRpcMessages as rpc } from '../../azure-functions-language-worker-protobuf/src/rpc';
import { loadScriptFile } from '../loadScriptFile';
import { ensureErrorType, isError } from '../utils/ensureErrorType';
import { nonNullProp } from '../utils/nonNull';
import { isError } from '../utils/ensureErrorType';
import { WorkerChannel } from '../WorkerChannel';
import { EventHandler } from './EventHandler';
import LogCategory = rpc.RpcLog.RpcLogCategory;
Expand All @@ -33,34 +30,9 @@ export class WorkerInitHandler extends EventHandler<'workerInitRequest', 'worker
});

logColdStartWarning(channel);
const functionAppDirectory = nonNullProp(msg, 'functionAppDirectory');
await channel.updatePackageJson(functionAppDirectory);

const entryPointFile = channel.packageJson.main;
if (entryPointFile) {
channel.log({
message: `Loading entry point "${entryPointFile}"`,
level: LogLevel.Debug,
logCategory: LogCategory.System,
});
try {
const entryPointFullPath = path.join(functionAppDirectory, entryPointFile);
if (!(await pathExists(entryPointFullPath))) {
throw new Error(`file does not exist`);
}

await loadScriptFile(entryPointFullPath, channel.packageJson);
channel.log({
message: `Loaded entry point "${entryPointFile}"`,
level: LogLevel.Debug,
logCategory: LogCategory.System,
});
} catch (err) {
const error = ensureErrorType(err);
error.isAzureFunctionsInternalException = true;
error.message = `Worker was unable to load entry point "${entryPointFile}": ${error.message}`;
throw error;
}
const functionAppDirectory = msg.functionAppDirectory;
if (functionAppDirectory) {
await channel.updatePackageJson(functionAppDirectory);
}

response.capabilities = {
Expand Down
16 changes: 13 additions & 3 deletions test/eventHandlers/WorkerInitHandler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import { expect } from 'chai';
import * as escapeStringRegexp from 'escape-string-regexp';
import 'mocha';
import { ITestCallbackContext } from 'mocha';
import * as mockFs from 'mock-fs';
import { AzureFunctionsRpcMessages as rpc } from '../../azure-functions-language-worker-protobuf/src/rpc';
import { logColdStartWarning } from '../../src/eventHandlers/WorkerInitHandler';
Expand Down Expand Up @@ -213,7 +214,10 @@ describe('WorkerInitHandler', () => {
});

for (const extension of ['.js', '.mjs', '.cjs']) {
it(`Loads entry point (${extension})`, async () => {
it(`Loads entry point (${extension})`, async function (this: ITestCallbackContext) {
// Should be re-enabled after https://github.com/Azure/azure-functions-nodejs-worker/pull/577
this.skip();

const fileName = `entryPointFiles/doNothing${extension}`;
const expectedPackageJson = {
main: fileName,
Expand All @@ -236,7 +240,10 @@ describe('WorkerInitHandler', () => {
});
}

it('Fails for missing entry point', async () => {
it('Fails for missing entry point', async function (this: ITestCallbackContext) {
// Should be re-enabled after https://github.com/Azure/azure-functions-nodejs-worker/pull/577
this.skip();

const fileName = 'entryPointFiles/missing.js';
const expectedPackageJson = {
main: fileName,
Expand All @@ -257,7 +264,10 @@ describe('WorkerInitHandler', () => {
);
});

it('Fails for invalid entry point', async () => {
it('Fails for invalid entry point', async function (this: ITestCallbackContext) {
// Should be re-enabled after https://github.com/Azure/azure-functions-nodejs-worker/pull/577
this.skip();

const fileName = 'entryPointFiles/throwError.js';
const expectedPackageJson = {
main: fileName,
Expand Down