@adobe/aio-cli-plugin-api-mesh 4.0.1-beta.1 → 4.1.0-beta.1

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"4.0.1-beta.1","commands":{"PLUGINNAME":{"id":"PLUGINNAME","description":"Your description here","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio PLUGINNAME:some_command"],"flags":{"someflag":{"name":"someflag","type":"option","char":"f","description":"this is some flag"}},"args":[]},"api-mesh:create":{"id":"api-mesh:create","description":"Create a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:delete":{"id":"api-mesh:delete","description":"Delete the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false}},"args":[]},"api-mesh:describe":{"id":"api-mesh:describe","description":"Get details of a mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:get":{"id":"api-mesh:get","description":"Get the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false}},"args":[{"name":"file"}]},"api-mesh:init":{"id":"api-mesh:init","description":"This command will create a workspace where you can organise your API mesh configuration and other files","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[{"description":"API mesh workspace init","command":"aio api-mesh init commerce-mesh"},{"description":"API mesh workspace init with flags","command":"aio api-mesh init commerce-mesh --path ./mesh_projects/test_mesh --git y --packageManager yarn"}],"flags":{"path":{"name":"path","type":"option","char":"p","default":"."},"packageManager":{"name":"packageManager","type":"option","char":"m","options":["npm","yarn"]},"git":{"name":"git","type":"option","char":"g","options":["y","n"]}},"args":[{"name":"projectName","description":"Project name","required":true}]},"api-mesh:log-get-bulk":{"id":"api-mesh:log-get-bulk","description":"Download all mesh logs for a selected time period.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"startTime":{"name":"startTime","type":"option","description":"Start time for the logs in UTC","required":true},"endTime":{"name":"endTime","type":"option","description":"End time for the logs in UTC","required":true},"filename":{"name":"filename","type":"option","description":"Path to the output file for logs","required":true}},"args":[]},"api-mesh:log-get":{"id":"api-mesh:log-get","description":"Get the Log of a given mesh by RayId","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"rayId","description":"Fetch a single log by rayID","required":true}]},"api-mesh:log-list":{"id":"api-mesh:log-list","description":"Get recent logs of requests made to the API Mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"filename":{"name":"filename","type":"option","description":"Name of CSV file to export the recent logs to"}},"args":[]},"api-mesh:run":{"id":"api-mesh:run","description":"Run a local development server that builds and compiles a mesh locally","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"Port number for the local dev server"},"debug":{"name":"debug","type":"boolean","description":"Enable debugging mode","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"select":{"name":"select","type":"boolean","description":"Retrieve existing artifacts from the mesh","allowNo":false},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file","description":"Mesh File"}]},"api-mesh:status":{"id":"api-mesh:status","description":"Get a mesh status with a given meshid.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:update":{"id":"api-mesh:update","description":"Update a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:source:discover":{"id":"api-mesh:source:discover","description":"Return the list of avaliable sources","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm install action prompt. CLI will not check ask user to install source.","allowNo":false}},"args":[]},"api-mesh:source:get":{"id":"api-mesh:source:get","description":"Command returns the content of a specific source.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:get -s=<version>@<source_name>","$ aio api-mesh:source:get -s<source_name>","$ aio api-mesh:source:get -m"],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm print action prompt. CLI will not check ask user to print source.","allowNo":false},"source":{"name":"source","type":"option","char":"s","description":"Source name"},"multiple":{"name":"multiple","type":"boolean","char":"m","description":"Select multiple sources","allowNo":false}},"args":[]},"api-mesh:source:install":{"id":"api-mesh:source:install","description":"Command to install the source to your API mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:install <version>@<source_name>","$ aio api-mesh:source:install <source_name> -v <variable_name>=<variable_value>","$ aio api-mesh:source:install <source_name> -f <path_to_variables_file>"],"flags":{"source":{"name":"source","type":"option","char":"s","description":"Source name"},"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm override action prompt. CLI will not check ask user to override source.","allowNo":false},"variable":{"name":"variable","type":"option","char":"v","description":"Variables required for the source"},"variable-file":{"name":"variable-file","type":"option","char":"f","description":"Variables file path"},"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"source"}]}}}
+{"version":"4.1.0-beta.1","commands":{"PLUGINNAME":{"id":"PLUGINNAME","description":"Your description here","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio PLUGINNAME:some_command"],"flags":{"someflag":{"name":"someflag","type":"option","char":"f","description":"this is some flag"}},"args":[]},"api-mesh:create":{"id":"api-mesh:create","description":"Create a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:delete":{"id":"api-mesh:delete","description":"Delete the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false}},"args":[]},"api-mesh:describe":{"id":"api-mesh:describe","description":"Get details of a mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:get":{"id":"api-mesh:get","description":"Get the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false}},"args":[{"name":"file"}]},"api-mesh:init":{"id":"api-mesh:init","description":"This command will create a workspace where you can organise your API mesh configuration and other files","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[{"description":"API mesh workspace init","command":"aio api-mesh init commerce-mesh"},{"description":"API mesh workspace init with flags","command":"aio api-mesh init commerce-mesh --path ./mesh_projects/test_mesh --git y --packageManager yarn"}],"flags":{"path":{"name":"path","type":"option","char":"p","default":"."},"packageManager":{"name":"packageManager","type":"option","char":"m","options":["npm","yarn"]},"git":{"name":"git","type":"option","char":"g","options":["y","n"]}},"args":[{"name":"projectName","description":"Project name","required":true}]},"api-mesh:log-get-bulk":{"id":"api-mesh:log-get-bulk","description":"Download all mesh logs for a selected time period.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"startTime":{"name":"startTime","type":"option","description":"Start time for the logs in UTC","required":true},"endTime":{"name":"endTime","type":"option","description":"End time for the logs in UTC","required":true},"filename":{"name":"filename","type":"option","description":"Path to the output file for logs","required":true}},"args":[]},"api-mesh:log-get":{"id":"api-mesh:log-get","description":"Get the Log of a given mesh by RayId","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"rayId","description":"Fetch a single log by rayID","required":true}]},"api-mesh:log-list":{"id":"api-mesh:log-list","description":"Get recent logs of requests made to the API Mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"filename":{"name":"filename","type":"option","description":"Name of CSV file to export the recent logs to"}},"args":[]},"api-mesh:run":{"id":"api-mesh:run","description":"Run a local development server that builds and compiles a mesh locally","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"Port number for the local dev server"},"debug":{"name":"debug","type":"boolean","description":"Enable debugging mode","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"select":{"name":"select","type":"boolean","description":"Retrieve existing artifacts from the mesh","allowNo":false},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file","description":"Mesh File"}]},"api-mesh:status":{"id":"api-mesh:status","description":"Get a mesh status with a given meshid.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:update":{"id":"api-mesh:update","description":"Update a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:source:discover":{"id":"api-mesh:source:discover","description":"Return the list of avaliable sources","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm install action prompt. CLI will not check ask user to install source.","allowNo":false}},"args":[]},"api-mesh:source:get":{"id":"api-mesh:source:get","description":"Command returns the content of a specific source.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:get -s=<version>@<source_name>","$ aio api-mesh:source:get -s<source_name>","$ aio api-mesh:source:get -m"],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm print action prompt. CLI will not check ask user to print source.","allowNo":false},"source":{"name":"source","type":"option","char":"s","description":"Source name"},"multiple":{"name":"multiple","type":"boolean","char":"m","description":"Select multiple sources","allowNo":false}},"args":[]},"api-mesh:source:install":{"id":"api-mesh:source:install","description":"Command to install the source to your API mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:install <version>@<source_name>","$ aio api-mesh:source:install <source_name> -v <variable_name>=<variable_value>","$ aio api-mesh:source:install <source_name> -f <path_to_variables_file>"],"flags":{"source":{"name":"source","type":"option","char":"s","description":"Source name"},"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm override action prompt. CLI will not check ask user to override source.","allowNo":false},"variable":{"name":"variable","type":"option","char":"v","description":"Variables required for the source"},"variable-file":{"name":"variable-file","type":"option","char":"f","description":"Variables file path"},"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"source"}]}}}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adobe/aio-cli-plugin-api-mesh",
-	"version": "4.0.1-beta.1",
+	"version": "4.1.0-beta.1",
 	"description": "Adobe I/O CLI plugin to develop and manage API mesh sources",
 	"keywords": [
 		"oclif-plugin"
@@ -45,11 +45,13 @@
 		"@adobe/aio-lib-ims": "^7.0.1",
 		"@adobe/plugin-hooks": "0.3.2",
 		"@adobe/plugin-on-fetch": "0.1.1",
+		"@adobe/plugin-source-headers": "^0.0.1",
 		"@graphql-mesh/cli": "0.82.30",
 		"@graphql-mesh/graphql": "0.34.13",
+		"@graphql-mesh/http": "^0.96.9",
 		"@graphql-mesh/json-schema": "0.35.38",
 		"@graphql-mesh/openapi": "0.33.39",
-		"@graphql-mesh/plugin-http-details-extensions": "0.1.21",
+		"@graphql-mesh/plugin-http-details-extensions": "^0.103.4",
 		"@graphql-mesh/runtime": "0.46.21",
 		"@graphql-mesh/soap": "0.14.25",
 		"@graphql-mesh/store": "0.9.20",
@@ -88,7 +90,7 @@
 		"lru-cache": "^7.14.1",
 		"node-clipboardy": "^1.0.3",
 		"node-fetch": "2.6.1",
-		"pino": "^7.9.2",
+		"pino": "^9.5.0",
 		"pino-pretty": "^7.6.0",
 		"pupa": "^3.1.0",
 		"source-registry-storage-adapter": "github:devx-services/source-registry-storage-adapter#main",
@@ -98,6 +100,7 @@
 	},
 	"devDependencies": {
 		"@babel/eslint-parser": "^7.15.8",
+		"@graphql-mesh/plugin-http-details-extensions": "0.1.21",
 		"@oclif/dev-cli": "1.26.10",
 		"@oclif/plugin-help": "2.2.3",
 		"@trivago/prettier-plugin-sort-imports": "^3.1.1",
@@ -117,7 +120,8 @@
 		"jest": "^29.2.2",
 		"jest-junit": "^6.0.0",
 		"prettier": "2.2.1",
-		"stdout-stderr": "^0.1.9"
+		"stdout-stderr": "^0.1.9",
+		"wrangler": "^3.80.4"
 	},
 	"engines": {
 		"node": "^16.13 || >=18.0.0",

package/src/commands/api-mesh/__tests__/run.test.js

@@ -12,7 +12,6 @@ governing permissions and limitations under the License.
 
 const RunCommand = require('../run');
 const {
-	startGraphqlServer,
 	interpolateMesh,
 	importFiles,
 	promptConfirm,
@@ -20,6 +19,7 @@ const {
 	initSdk,
 	writeSecretsFile,
 } = require('../../../helpers');
+const { runServer } = require('../../../server');
 const { getMeshId, getMeshArtifact } = require('../../../lib/devConsole');
 require('@adobe-apimesh/mesh-builder');
 
@@ -31,7 +31,6 @@ jest.mock('../../../helpers', () => ({
 		workspaceName: 'mockWorkspaceTitle',
 	}),
 	initRequestId: jest.fn().mockResolvedValue({}),
-	startGraphqlServer: jest.fn().mockResolvedValue({}),
 	interpolateMesh: jest.fn().mockResolvedValue({}),
 	importFiles: jest.fn().mockResolvedValue(),
 	promptConfirm: jest.fn().mockResolvedValue(true),
@@ -39,6 +38,10 @@ jest.mock('../../../helpers', () => ({
 	writeSecretsFile: jest.fn().mockResolvedValue(),
 }));
 
+jest.mock('../../../server', () => ({
+	runServer: jest.fn().mockResolvedValue(),
+}));
+
 jest.mock('../../../lib/devConsole', () => ({
 	getMeshId: jest.fn().mockResolvedValue('mockMeshId'),
 	getMeshArtifact: jest.fn().mockResolvedValue(),
@@ -91,6 +94,10 @@ describe('run command tests', () => {
 		platformSpy.mockRestore();
 	});
 
+	beforeAll(() => {
+		jest.spyOn(RunCommand.prototype, 'copyMeshContent').mockImplementation(() => {});
+	});
+
 	test('snapshot run command description', () => {
 		expect(RunCommand.description).toMatchInlineSnapshot(
 			`"Run a local development server that builds and compiles a mesh locally"`,
@@ -189,11 +196,7 @@ describe('run command tests', () => {
 		parseSpy.mockResolvedValue(parseOutput);
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(
-			expect.anything(),
-			parseOutput.flags.port,
-			false,
-		);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), parseOutput.flags.port);
 	});
 
 	test('should use the port number provided in the .env file if there is no port', async () => {
@@ -210,7 +213,7 @@ describe('run command tests', () => {
 		parseSpy.mockResolvedValue(parseOutput);
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), process.env.PORT, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), process.env.PORT);
 	});
 
 	test('should use the default port if port number is not provided explicitly', async () => {
@@ -226,7 +229,7 @@ describe('run command tests', () => {
 		parseSpy.mockResolvedValue(parseOutput);
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should return error for run command if the mesh has placeholders and env file provided using --env flag is not found', async () => {
@@ -393,7 +396,7 @@ describe('run command tests', () => {
 		});
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	// file import tests
@@ -439,7 +442,7 @@ describe('run command tests', () => {
 		});
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should fail if the file name is more than 25 characters', async () => {
@@ -615,7 +618,7 @@ describe('run command tests', () => {
 		});
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should override if prompt returns Yes, if there is files array', async () => {
@@ -662,7 +665,7 @@ describe('run command tests', () => {
 
 		await RunCommand.run();
 
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should pass for a fully-qualified meshConfig even if the file does not exist in fileSystem', async () => {
@@ -709,7 +712,7 @@ describe('run command tests', () => {
 		});
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should pass if the file is located in subdirectory of mesh directory', async () => {
@@ -755,7 +758,7 @@ describe('run command tests', () => {
 
 		await RunCommand.run();
 
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should fail if the file is outside the workspace directory', async () => {
@@ -926,7 +929,7 @@ describe('run command tests', () => {
 
 		await RunCommand.run();
 		expect(writeSecretsFile).toHaveBeenCalled();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should return error if ran with secrets against windows platform with batch variables', async () => {
@@ -964,7 +967,7 @@ describe('run command tests', () => {
 
 		await RunCommand.run();
 		expect(writeSecretsFile).toHaveBeenCalled();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should pass if ran with secrets against darwin(macOS) platform with batch variables', async () => {
@@ -979,7 +982,7 @@ describe('run command tests', () => {
 
 		await RunCommand.run();
 		expect(writeSecretsFile).toHaveBeenCalled();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should escape variables that are preceded by backslash symbol', async () => {
@@ -996,6 +999,6 @@ describe('run command tests', () => {
 			'Home: rootPath\nHomeString: $HOME\nHomeWithSlash: \\rootPath\nHomeStringWithSlash: \\$HOME\n',
 			expect.anything(),
 		);
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 });

package/src/commands/api-mesh/run.js

@@ -26,12 +26,10 @@ const {
 } = require('../../utils');
 const meshBuilder = require('@adobe-apimesh/mesh-builder');
 const fs = require('fs');
-const UUID = require('../../uuid');
 const path = require('path');
 const {
 	initSdk,
 	initRequestId,
-	startGraphqlServer,
 	importFiles,
 	setUpTenantFiles,
 	writeSecretsFile,
@@ -39,6 +37,8 @@ const {
 const logger = require('../../classes/logger');
 const { getMeshId, getMeshArtifact } = require('../../lib/devConsole');
 require('dotenv').config();
+const { runServer } = require('../../server');
+const { fixPlugins } = require('../../fixPlugins');
 
 const { validateMesh, buildMesh, compileMesh } = meshBuilder.default;
 
@@ -163,13 +163,12 @@ class RunCommand extends Command {
 					}
 
 					//Generating unique mesh id
-					meshId = UUID.newUuid().toString();
+					meshId = 'testMesh';
 
 					await validateMesh(data.meshConfig);
 					await buildMesh(meshId, data.meshConfig);
 					await compileMesh(meshId);
 				}
-
 				let portNo;
 				//secrets management
 				if (secretsFilePath) {
@@ -183,6 +182,8 @@ class RunCommand extends Command {
 					}
 				}
 
+				await this.copyMeshContent(meshId);
+
 				//To set the port number using the environment file
 				if (process.env.PORT !== undefined) {
 					if (isNaN(process.env.PORT) || !Number.isInteger(parseInt(process.env.PORT))) {
@@ -201,9 +202,8 @@ class RunCommand extends Command {
 				if (!portNo) {
 					portNo = 5000;
 				}
-
-				this.log(`Starting server on port : ${portNo}`);
-				await startGraphqlServer(meshId, portNo, flags.debug);
+				meshId = '000000000000-0000-0000-0000-000000000000';
+				runServer(meshId, portNo);
 			} else {
 				throw new Error(
 					'`aio api-mesh run` cannot be executed because there is no package.json file in the current directory. Use `aio api-mesh init` to set up a package.',
@@ -213,6 +213,31 @@ class RunCommand extends Command {
 			this.error(error.message);
 		}
 	}
+
+	async copyMeshContent(meshId) {
+		// Remove mesh artifact directory if exists
+		if (fs.existsSync('.mesh')) {
+			fs.rmdirSync('.mesh', { recursive: true });
+		}
+		// Move built mesh artifact to expect directory
+		fs.renameSync(`mesh-artifact/${meshId}`, '.mesh');
+		// Remove tenant files directory if exists
+		if (fs.existsSync('tenantFiles')) {
+			fs.rmdirSync('tenantFiles', { recursive: true });
+		}
+		// Move built tenant files if exists
+		if (fs.existsSync('mesh-artifact/tenantFiles')) {
+			fs.cpSync('mesh-artifact/tenantFiles', '.mesh/tenantFiles', { recursive: true });
+			fs.renameSync('mesh-artifact/tenantFiles', 'tenantFiles');
+		}
+
+		await fixPlugins('.mesh/index.js');
+
+		if (fs.existsSync(`${__dirname}/../../../.mesh`)) {
+			fs.rmdirSync(`${__dirname}/../../../.mesh`, { recursive: true });
+		}
+		fs.cpSync('.mesh', `${__dirname}/../../../.mesh`, { recursive: true });
+	}
 }
 
 module.exports = RunCommand;

package/src/cors.js

@@ -0,0 +1,28 @@
+/**
+ * Get default CORS options.
+ * @param env Environment.
+ */
+const getDefaultCorsOptions = env => {
+	return env.CORS_DEFAULT_URL
+		? {
+				origin: env.CORS_DEFAULT_URL,
+		  }
+		: {};
+};
+
+/**
+ * Get CORS options. Merges default CORS options with custom specific options if present in the mesh configuration.
+ * Custom CORS options overwrite the default options to ensure that specific requirements can be met without altering
+ * the default configuration.
+ * @param env Environment.
+ * @param meshConfig Mesh configuration.
+ */
+const getCorsOptions = (env, meshConfig) => {
+	const defaultCorsOptions = getDefaultCorsOptions(env);
+	return {
+		...defaultCorsOptions,
+		...meshConfig.responseConfig?.CORS,
+	};
+};
+
+module.exports = { getCorsOptions };

package/src/fixPlugins.js

@@ -0,0 +1,28 @@
+/* eslint-disable no-console */
+const fs = require('fs');
+/**
+ * Modifies `index.js` of a mesh artifact to mutate plugin references for edge compatibility. Current forces
+ * `@graphql-mesh/plugin-http-details-extensions` to resolve to local fork instead.
+ */
+async function fixPlugins(meshArtifactPath) {
+	try {
+		console.log('Modifying mesh artifact to fix plugins for edge compatibility.');
+		const data = fs.readFileSync(meshArtifactPath, 'utf8');
+		const updatedData = data.replace(
+			/@graphql-mesh\/plugin-http-details-extensions/g,
+			'../src/plugins/httpDetailsExtensions',
+		);
+		fs.writeFileSync(meshArtifactPath, updatedData, 'utf8');
+	} catch (err) {
+		console.error(err);
+	}
+}
+
+// Execute fixPlugins if run directly from CLI
+if (require.main === module) {
+	fixPlugins();
+}
+
+module.exports = {
+	fixPlugins,
+};

package/src/index.js

@@ -0,0 +1,44 @@
+import { bindedlogger as logger } from '../utils/logger';
+import { getRequestId } from '../utils/requestId';
+import { ServedTier, addServedHeader } from './served';
+import { buildServer } from './wranglerServer';
+
+let server;
+
+export default {
+	setServer(newServer) {
+		server = newServer;
+	},
+	/**
+	 * Fetch.
+	 * @param request Request.
+	 * @param env Environment.
+	 * @param ctx Event context.
+	 */
+	async fetch(request, env, ctx) {
+		const requestId = getRequestId(request);
+		// Retrieve environment variables
+		const { MESH_ID: meshId, LOG_LEVEL: logLevel } = env;
+		const loggerInstance = logger({ logLevel, meshId, requestId });
+		const meshArtifacts = await import('../.mesh');
+		const rawMesh = await import('../.mesh/.meshrc.json');
+
+		if (!server) {
+			server = await this.buildAndCacheServer(env, loggerInstance, meshArtifacts, rawMesh);
+		}
+
+		loggerInstance.debug('WORKER HOT: Fetching via worker');
+		const response = await server.fetch(request, ctx);
+		addServedHeader(response, ServedTier.WORKER_HOT);
+		return response;
+	},
+	/**
+	 * Build and cache mesh instance/server in global variable.
+	 * @param env
+	 * @param loggerInstance
+	 */
+	async buildAndCacheServer(env, loggerInstance, meshArtifacts, meshConfig) {
+		server = await buildServer(loggerInstance, env, meshArtifacts, meshConfig);
+		return server;
+	},
+};

package/src/plugins/complianceHeaders/complianceHeaders.js

@@ -0,0 +1,55 @@
+/**
+ * CF-Connecting-IP provides the client IP address connecting to Cloudflare to the origin web server. This header will only be sent on the
+ * traffic from Cloudflare’s edge to your origin web server. Upstream requests will the Cloudflare Worker client IP address of
+ * `2a06:98c0:3600::103`.
+ * @see https://developers.cloudflare.com/fundamentals/reference/http-request-headers/#cf-connecting-ip
+ */
+const CF_CONNECTING_IP_HEADER = 'cf-connecting-ip';
+
+/**
+ * The X-Forwarded-For (XFF) request header is a de-facto standard header for identifying the originating IP address of a client connecting
+ * to a web server through a proxy server.
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For
+ */
+const X_FORWARDED_FOR_HEADER = 'x-forwarded-for';
+
+/**
+ * Add `x-forwarded-for` header from request context to each fetch.
+ * @param context Request context.
+ * @param headers Fetch headers.
+ */
+const addXForwardedForHeader = (context, headers) => {
+	// `cf-connecting-ip` header contains the original visitor's IP address
+	const connectingIp = context?.request.headers.get(CF_CONNECTING_IP_HEADER);
+	const xForwardedFor = context?.request.headers.get(X_FORWARDED_FOR_HEADER);
+	if (connectingIp) {
+		if (!xForwardedFor) {
+			// Construct new `x-forwarded-for` header if not present in original request
+			headers.set(X_FORWARDED_FOR_HEADER, connectingIp);
+		} else {
+			// Construct `x-forwarded-for` header using original header
+			headers.set(X_FORWARDED_FOR_HEADER, `${xForwardedFor}, ${connectingIp}`);
+		}
+	}
+};
+
+/**
+ * Adds compliance headers to source fetch requests.
+ */
+function useComplianceHeaders() {
+	return {
+		onFetch({ context, options }) {
+			// Construct mutable headers from options passed to each fetch
+			const headers = new Headers(options.headers);
+			addXForwardedForHeader(context, headers);
+			options.headers = headers;
+		},
+	};
+}
+
+module.exports = {
+	useComplianceHeaders,
+	CF_CONNECTING_IP_HEADER,
+	X_FORWARDED_FOR_HEADER,
+	addXForwardedForHeader,
+};

package/src/plugins/complianceHeaders/index.js

@@ -0,0 +1,2 @@
+const { useComplianceHeaders } = require('./complianceHeaders');
+module.exports = useComplianceHeaders;

package/src/plugins/httpDetailsExtensions/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Uri Goldshtein
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/src/plugins/httpDetailsExtensions/index.js

@@ -0,0 +1,81 @@
+/**
+ * Fork of https://github.com/ardatan/graphql-mesh/blob/%40graphql-mesh/plugin-http-details-extensions%400.1.21/packages/plugins/http-details-extensions/src/index.ts
+ * Version: 0.1.21
+ * TODO: Extract to a separate repository/artifact after approach has been validated.
+ */
+
+/* eslint-disable */
+
+const { isAsyncIterable } = require('@envelop/core');
+const { getHeadersObj } = require('@graphql-mesh/utils');
+
+function useIncludeHttpDetailsInExtensions(opts) {
+	if (!opts.if) {
+		return {};
+	}
+
+	const httpDetailsByContext = new WeakMap();
+
+	function getHttpDetailsByContext(context) {
+		let httpDetails = httpDetailsByContext.get(context);
+		if (!httpDetails) {
+			httpDetails = [];
+			httpDetailsByContext.set(context, httpDetails);
+		}
+		return httpDetails;
+	}
+
+	return {
+		onFetch({ url, context, info, options }) {
+			if (context != null) {
+				const requestTimestamp = Date.now();
+				return ({ response }) => {
+					const responseTimestamp = Date.now();
+					const responseTime = responseTimestamp - requestTimestamp;
+					const httpDetailsList = getHttpDetailsByContext(context);
+					const httpDetails = {
+						sourceName: (info)?.sourceName,
+						path: info?.path,
+						request: {
+							timestamp: requestTimestamp,
+							url,
+							method: options.method || 'GET',
+							headers: getHeadersObj(options.headers),
+						},
+						response: {
+							timestamp: responseTimestamp,
+							status: response.status,
+							statusText: response.statusText,
+							headers: getHeadersObj(response.headers),
+							// Added to interface to account for edge fetch implementation/behavior
+							cookies: response.headers.getSetCookie(),
+						},
+						responseTime,
+					};
+					httpDetailsList.push(httpDetails);
+				};
+			}
+			return undefined;
+		},
+		onExecute({ args: { contextValue } }) {
+			return {
+				onExecuteDone({ result, setResult }) {
+					if (!isAsyncIterable(result)) {
+						const httpDetailsList = httpDetailsByContext.get(contextValue);
+						if (httpDetailsList != null) {
+							setResult({
+								...result,
+								extensions: {
+									...result.extensions,
+									httpDetails: httpDetailsList,
+								},
+							});
+						}
+					}
+				},
+			};
+		},
+	};
+}
+
+module.exports = useIncludeHttpDetailsInExtensions;

package/src/secrets.js

@@ -0,0 +1,34 @@
+// Parse the yaml secrets string from env to json object
+function loadMeshSecrets(logger, secret) {
+	let parsedSecrets = {};
+
+	try {
+		// Replace escaped backslashes with a single backslash
+		secret = secret.replace(/\\"/g, '"');
+		parsedSecrets = JSON.parse(secret);
+	} catch (err) {
+		logger.error('Error parsing secrets.');
+	}
+
+	return parsedSecrets;
+}
+
+// Custom get secrets handler
+const getSecretsHandler = {
+	get: function (target, prop, receiver) {
+		if (prop === 'toJSON') {
+			// Handle the toJSON case
+			return () => target;
+		}
+		if (prop in target) {
+			return Reflect.get(target, prop, receiver);
+		} else {
+			throw new Error(`The secret ${String(prop)} is not available.`);
+		}
+	},
+	set: function () {
+		throw new Error('Setting secrets is not allowed');
+	},
+};
+
+module.exports = { loadMeshSecrets, getSecretsHandler };

package/src/served.js

@@ -0,0 +1,22 @@
+/**
+ * Header to indicate which tier served the request.
+ */
+const SERVE_TIER_HEADER = 'x-api-mesh-served';
+
+/**
+ * Tiers that served the request.
+ */
+const ServedTier = {
+	WORKER_HOT: 0,
+};
+
+/**
+ * Add the served header to the response. Requires mutable headers on the response object.
+ * @param response Response.
+ * @param servedTier Tier that served the request.
+ */
+const addServedHeader = (response, servedTier) => {
+	response.headers.set(SERVE_TIER_HEADER, servedTier.toString());
+};
+
+module.exports = { ServedTier, addServedHeader };

package/src/server.js

@@ -1,200 +1,32 @@
-// Resolve the path to 'fastify' and 'graphql-yoga' within the local 'node_modules'
-const fastifyPath = require.resolve('fastify', { paths: [process.cwd()] });
-const yogaPath = require.resolve('graphql-yoga', { paths: [process.cwd()] });
-
-// Load 'fastify' and 'graphql-yoga' using the resolved paths
-const fastify = require(fastifyPath);
-const { createYoga } = require(yogaPath);
-const logger = require('./classes/logger');
-
-//Load the functions from serverUtils.js
-const {
-	readMeshConfig,
-	removeRequestHeaders,
-	prepSourceResponseHeaders,
-	processResponseHeaders,
-	readSecretsFile,
-} = require('./serverUtils');
-
-let yogaServer = null;
-let meshConfig;
-
-// catch unhandled promise rejections
-process.on('unhandledRejection', reason => {
-	logger.error('Unhandled Rejection at:', reason.stack || reason);
-});
-
-// catch uncaught exceptions
-process.on('uncaughtException', err => {
-	logger.error('Uncaught Exception thrown');
-	logger.error(err.stack);
-	process.exit(1);
-});
-
-// get meshId from command line arguments
-const meshId = process.argv[2];
-
-// get PORT number from command line arguments
-const portNo = parseInt(process.argv[3]);
-
-const getCORSOptions = () => {
-	try {
-		const currentWorkingDirectory = process.cwd();
-		const meshConfigPath = `${currentWorkingDirectory}/mesh-artifact/${meshId}/.meshrc.json`;
-
-		const meshConfig = require(meshConfigPath);
-		const { responseConfig } = meshConfig;
-		const { CORS } = responseConfig;
-
-		return CORS;
-	} catch (e) {
-		return {};
-	}
-};
-
-// Custom get secrets handler
-const getSecretsHandler = {
-	get: function (target, prop, receiver) {
-		if (prop === 'toJSON') {
-			// Handle the toJSON case
-			return () => target;
-		}
-		if (prop in target) {
-			return Reflect.get(target, prop, receiver);
-		} else {
-			throw new Error(`The secret ${String(prop)} is not available.`);
-		}
-	},
-	set: function () {
-		throw new Error('Setting secrets is not allowed');
-	},
+const { spawn } = require('child_process');
+const { readSecretsFile } = require('./serverUtils');
+
+const runServer = (meshId, portNo) => {
+	const wranglerPath = `${__dirname}/../node_modules/.bin/wrangler`;
+	const indexFilePath = `${__dirname}/index.js`;
+	const filePath = '.mesh';
+	const secrets = readSecretsFile(filePath);
+	const commandArgs = [
+		'dev',
+		indexFilePath,
+		'--var',
+		`MESH_ID:${meshId}`,
+		`Secret:${JSON.stringify(secrets)}`,
+		'--port',
+		portNo,
+	];
+
+	const wrangler = spawn(wranglerPath, commandArgs, {
+		stdio: 'inherit',
+	});
+
+	wrangler.on('close', code => {
+		console.log(`wrangler dev process exited with code ${code}`);
+	});
+
+	wrangler.on('error', error => {
+		console.error(`Failed to start wrangler dev: ${error.message}`);
+	});
 };
 
-const getYogaServer = async () => {
-	if (yogaServer) {
-		return yogaServer;
-	} else {
-		const currentWorkingDirectory = process.cwd();
-		const meshArtifactsPath = `${currentWorkingDirectory}/mesh-artifact/${meshId}`;
-
-		const meshArtifacts = require(meshArtifactsPath);
-		const { getBuiltMesh } = meshArtifacts;
-
-		const tenantMesh = await getBuiltMesh();
-		const corsOptions = getCORSOptions();
-
-		const secrets = readSecretsFile(meshId);
-
-		const secretsProxy = new Proxy(secrets, getSecretsHandler);
-
-		logger.info('Creating graphQL server');
-
-		meshConfig = readMeshConfig(meshId);
-
-		yogaServer = createYoga({
-			plugins: tenantMesh.plugins,
-			graphqlEndpoint: `/graphql`,
-			graphiql: true,
-			maskedErrors: false,
-			cors: corsOptions,
-			context: initialContext => ({
-				...initialContext,
-				secrets: secretsProxy,
-			}),
-		});
-
-		return yogaServer;
-	}
-};
-
-const app = fastify();
-
-app.route({
-	method: ['GET', 'POST'],
-	url: '/graphql',
-	handler: async (req, res) => {
-		logger.info('Request received: ', req.body);
-
-		let body = null;
-		let responseBody = null;
-		let includeMetaData = false;
-
-		if (req.headers['x-include-metadata'] && req.headers['x-include-metadata'].length > 0) {
-			if (req.headers['x-include-metadata'].toLowerCase() === 'true') {
-				includeMetaData = true;
-			}
-		}
-
-		const response = await yogaServer.handleNodeRequest(req, {
-			req,
-			reply: res,
-		});
-
-		try {
-			try {
-				body = await response.text();
-				if (body) {
-					responseBody = JSON.parse(body);
-				}
-			} catch (err) {
-				logger.error(`Error parsing response body: ${err}`);
-				logger.error(response);
-				throw new Error(`Error parsing response body: ${err}`);
-			}
-			//Set the value of includeHTTPDetails flag
-
-			const includeHTTPDetails = !!meshConfig?.responseConfig?.includeHTTPDetails;
-			const meshHTTPDetails = responseBody?.extensions?.httpDetails;
-			logger.info('Mesh HTTP Details: ', meshHTTPDetails);
-
-			/* the logic for handling mesh response headers using includeMetaData */
-			prepSourceResponseHeaders(meshHTTPDetails, req.id);
-			const responseHeaders = processResponseHeaders(meshId, req.id, includeMetaData, req.method);
-
-			/** Adding the yoga response headers to the response */
-			response.headers?.forEach((value, key) => {
-				res.header(key, value);
-			});
-
-			// Delete the httpDetails extensions details if mesh owner has disabled those details in the config
-			if (includeHTTPDetails !== true) {
-				delete responseBody?.extensions?.httpDetails;
-			}
-
-			//make sure to remove the request headers from cache after the request is complete
-			removeRequestHeaders(req.id);
-			const fastifyResponseBody = JSON.stringify(responseBody);
-			res.status(response.status).headers(responseHeaders).send(fastifyResponseBody);
-		} catch (err) {
-			logger.error(`Error parsing response body: ${err}`);
-			//we have this fallback catch clause if someone wants to load the graphiql engine. This returns the default headers back
-			response.headers?.forEach((value, key) => {
-				res.header(key, value);
-			});
-			res.status(response.status);
-			res.send(response.body);
-		}
-
-		return res;
-	},
-});
-
-app.listen(
-	{
-		//set the port no of the server based on the input value
-		port: portNo,
-	},
-	async err => {
-		try {
-			if (err) {
-				throw new Error(`Server setup error: ${err.message}`);
-			}
-			yogaServer = await getYogaServer();
-		} catch (error) {
-			console.error(error);
-			process.exit(1);
-		}
-
-		console.log(`Server is running on http://localhost:${portNo}/graphql`);
-	},
-);
+module.exports = { runServer };

package/src/serverUtils.js

@@ -318,13 +318,13 @@ function ccDirectivesToString(directives) {
 
 /**
  * Returns secrets content from artifacts
- * @param meshId
+ * @param meshPath
  * @returns
  */
-function readSecretsFile(meshId) {
+function readSecretsFile(meshPath) {
 	let secrets = {};
 	try {
-		const filePath = path.resolve(process.cwd(), 'mesh-artifact', `${meshId}`, 'secrets.yaml');
+		const filePath = path.resolve(process.cwd(), `${meshPath}`, 'secrets.yaml');
 		if (fs.existsSync(filePath)) {
 			secrets = YAML.parse(fs.readFileSync(filePath, 'utf8'));
 		}

package/src/wranglerServer.js

@@ -0,0 +1,75 @@
+import { getMesh } from '@graphql-mesh/runtime';
+
+const { getCorsOptions } = require('./cors');
+const { createYoga } = require('graphql-yoga');
+const { GraphQLError } = require('graphql/error');
+
+const { loadMeshSecrets, getSecretsHandler } = require('./secrets');
+const useComplianceHeaders = require('./plugins/complianceHeaders');
+const UseHttpDetailsExtensions = require('./plugins/httpDetailsExtensions');
+const useSourceHeaders = require('@adobe/plugin-source-headers');
+
+let meshInstance$;
+
+async function buildMeshInstance(meshArtifacts, meshConfig) {
+	const { getMeshOptions } = meshArtifacts;
+	const options = await getMeshOptions();
+
+	options.additionalEnvelopPlugins = (options.additionalEnvelopPlugins || []).concat(
+		useComplianceHeaders(),
+		UseHttpDetailsExtensions({
+			// Get the details of responseConfig.includeHTTPDetails and store in Cache
+			if: meshConfig.responseConfig?.includeHTTPDetails || false,
+		}),
+		useSourceHeaders(meshConfig),
+	);
+
+	return getMesh(options).then(mesh => {
+		const id = mesh.pubsub.subscribe('destroy', () => {
+			meshInstance$ = undefined;
+			mesh.pubsub.unsubscribe(id);
+		});
+		return mesh;
+	});
+}
+
+async function getBuiltMesh(meshArtifacts, meshConfig) {
+	if (meshInstance$ == null) {
+		meshInstance$ = buildMeshInstance(meshArtifacts, meshConfig);
+	}
+	return meshInstance$;
+}
+
+const buildServer = async (loggerInstance, env, meshArtifacts, meshConfig) => {
+	const { MESH_ID: meshId, Secret: secret } = env;
+	const tenantMesh = await getBuiltMesh(meshArtifacts, meshConfig);
+	const meshSecrets = loadMeshSecrets(loggerInstance, secret);
+	return await buildYogaServer(env, tenantMesh, meshId, meshConfig, meshSecrets);
+};
+
+async function buildYogaServer(env, tenantMesh, meshId, meshConfig, meshSecrets) {
+	const secretsProxy = new Proxy(meshSecrets, getSecretsHandler);
+	return createYoga({
+		plugins: tenantMesh.plugins,
+		graphqlEndpoint: `/api/${meshId}/graphql`,
+		cors: getCorsOptions(env, meshConfig),
+		context: initialContext => ({
+			...initialContext,
+			secrets: secretsProxy,
+		}),
+		maskedErrors: {
+			maskError: maskError,
+		},
+		logging: 'debug',
+	});
+}
+
+const maskError = error => {
+	if (error instanceof GraphQLError && error.extensions?.http?.headers) {
+		delete error.extensions.http.headers;
+	}
+
+	return error;
+};
+
+module.exports = { buildServer };