npm package diff
Package: @forge/tunnel
Versions: 6.0.0-next.13 - 6.0.0-next.14
Modified: package/out/command/interactors/function-change-watcher.js
Index: package/out/command/interactors/function-change-watcher.js
===================================================================
--- package/out/command/interactors/function-change-watcher.js
+++ package/out/command/interactors/function-change-watcher.js
@@ -40,9 +40,8 @@
sandboxes[`${module}.${func}`] = await this.createSandbox({
modName: module,
appPath: srcPath,
handler: func,
- isolateMemory: exports.MEMORY_LIMIT,
debugPort: LocalFunctionHost.getDebuggerPort(module, func, tunnelOptions)
});
}));
util_1.SandboxesContainer.updateSandboxes(sandboxes);Modified: package/out/index.js
Index: package/out/index.js
===================================================================
--- package/out/index.js
+++ package/out/index.js
@@ -1,15 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.isInspectorEnabled = exports.INSPECTOR_PORT = void 0;
const tslib_1 = require("tslib");
-exports.INSPECTOR_PORT = process.env.TUNNEL_INSPECTOR_PORT
- ? parseInt(process.env.TUNNEL_INSPECTOR_PORT, 10)
- : 3000;
-function isInspectorEnabled() {
- return process.env.TUNNEL_INSPECTOR_ENABLED === 'true';
-}
-exports.isInspectorEnabled = isInspectorEnabled;
tslib_1.__exportStar(require("./services"), exports);
tslib_1.__exportStar(require("./servers"), exports);
tslib_1.__exportStar(require("./command"), exports);
tslib_1.__exportStar(require("./graphql"), exports);Modified: package/out/util/invocation-utils.js
Index: package/out/util/invocation-utils.js
===================================================================
--- package/out/util/invocation-utils.js
+++ package/out/util/invocation-utils.js
@@ -1,7 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapLogLevel = exports.formatRuntimeLog = exports.formatTimestamp = exports.formatInvocation = exports.getRequestId = exports.toLambdaError = void 0;
+exports.formatRuntimeLog = exports.formatTimestamp = exports.formatInvocation = exports.getRequestId = exports.toLambdaError = void 0;
const cli_shared_1 = require("@forge/cli-shared");
const toLambdaError = (error) => {
return {
errorMessage: error.message,
@@ -49,18 +49,4 @@
' ' +
(0, cli_shared_1.formatRuntimeLogArgs)(event.logArguments));
};
exports.formatRuntimeLog = formatRuntimeLog;
-const mapLogLevel = (level) => {
- switch (level) {
- case 'warning':
- return cli_shared_1.AppDeploymentEventLogLevel.Warning;
- case 'error':
- return cli_shared_1.AppDeploymentEventLogLevel.Error;
- case 'info':
- case 'debug':
- return cli_shared_1.AppDeploymentEventLogLevel.Info;
- default:
- throw new Error('Unexpected snapshot log level: ' + level);
- }
-};
-exports.mapLogLevel = mapLogLevel;Modified: package/out/services/local-invocation-service.js
Index: package/out/services/local-invocation-service.js
===================================================================
--- package/out/services/local-invocation-service.js
+++ package/out/services/local-invocation-service.js
@@ -2,58 +2,35 @@
Object.defineProperty(exports, "__esModule", { value: true });
exports.LocalInvocationService = void 0;
const tslib_1 = require("tslib");
const util_1 = require("../util");
-const index_1 = require("../index");
-const uuid_1 = require("uuid");
-const runtime_1 = require("@forge/runtime");
const cli_shared_1 = require("@forge/cli-shared");
const zlib = tslib_1.__importStar(require("node:zlib"));
const DEFAULT_INVOCATION_TIMEOUT = 25;
class LocalInvocationService {
logger;
- inspector;
- constructor(logger, inspector) {
+ constructor(logger) {
this.logger = logger;
- this.inspector = inspector;
}
async invoke(handler, request) {
this.logger.info('');
this.logger.info((0, util_1.formatInvocation)(handler, request));
const sandbox = util_1.SandboxesContainer.get()[handler];
if (!sandbox) {
throw new cli_shared_1.ValidationError(cli_shared_1.Text.tunnel.error.handler.notFound(handler));
}
- const inspect = (0, index_1.isInspectorEnabled)();
- if (inspect && this.inspector.isServerStopped()) {
- const inspectorUrl = this.inspector.startServer(index_1.INSPECTOR_PORT);
- this.logger.info(cli_shared_1.Text.tunnel.startedInspector(inspectorUrl));
- }
- const variables = request.variables || [];
- const requestId = (0, util_1.getRequestId)(request, (0, uuid_1.v4)());
const timeout = request._meta.timeout ?? DEFAULT_INVOCATION_TIMEOUT;
- const xenInvocationRequest = (0, runtime_1.xenInvocationRequestFactory)({
- request: { ...request, variables },
- ctx: { requestId, traceId: requestId, timeout }
- });
- const invocationLimits = (0, runtime_1.perInvocationLimitsTrackerFactory)(xenInvocationRequest);
const tunnelWarningTimeout = setTimeout(() => {
this.logger.warn(cli_shared_1.Text.tunnel.invocationTimeout(timeout));
}, timeout * 1000);
- const { body, metrics, success, error, metricsCompressed } = await (0, runtime_1.invoke)({
- sandbox,
- xenInvocationRequest,
- invocationLimits,
- inspector: inspect ? this.inspector : undefined
- });
+ const { body, metrics, success, error, metricsCompressed } = await sandbox.execute(request);
clearTimeout(tunnelWarningTimeout);
- const reportMetrics = xenInvocationRequest.isFeatureFlagEnabled(runtime_1.XEN_RUNTIME_SHOULD_REPORT_METRICS);
- LocalInvocationService.printMetrics(reportMetrics, metrics, metricsCompressed, this.logger);
- return reportMetrics ? { body, metrics, success, error, metricsCompressed } : body;
+ LocalInvocationService.printMetrics(metrics, metricsCompressed, this.logger);
+ return { body, metrics, success, error, metricsCompressed };
}
static INTERNAL_METRICS = ['execute.setup-request-context', 'invoke.setup-isolate'];
- static printMetrics = (shouldReportMetrics, metrics, metricsCompressed, logger) => {
- if (shouldReportMetrics && metrics?.length) {
+ static printMetrics = (metrics, metricsCompressed, logger) => {
+ if (metrics?.length) {
if (metricsCompressed) {
metrics = JSON.parse(zlib.unzipSync(Buffer.from(metricsCompressed, 'base64')).toString());
}
logger.debug(`Metrics: ${JSON.stringify(metrics?.filter((m) => !LocalInvocationService.INTERNAL_METRICS.includes(m.name)), null, 2)}`);Modified: package/out/servers/native-ui-tunnel-server.js
Index: package/out/servers/native-ui-tunnel-server.js
===================================================================
--- package/out/servers/native-ui-tunnel-server.js
+++ package/out/servers/native-ui-tunnel-server.js
@@ -31,9 +31,9 @@
}
});
this.server = new webpack_dev_server_1.default({
port,
- host: process.env.FORGE_DEV_TUNNEL ? 'localhost' : '0.0.0.0',
+ host: '0.0.0.0',
setupMiddlewares: (middlewares) => {
const index = middlewares.findIndex((middleware) => middleware.name === 'webpack-dev-middleware');
middlewares.splice(index, 0, {
name: 'custom-ui-scripts-middleware',Modified: package/out/sandbox/node-sandbox.js
Index: package/out/sandbox/node-sandbox.js
===================================================================
--- package/out/sandbox/node-sandbox.js
+++ package/out/sandbox/node-sandbox.js
@@ -44,28 +44,22 @@
const p3LogEvent = output;
runtime_1.StaticInvocationEventEmitter.emit(runtime_1.EVENT_P3_LOG, p3LogEvent);
}
}
- async execute(xenInvocationRequest, invocationLimits, inspector) {
- const lambdaEvent = {
- _meta: xenInvocationRequest.__deprecatedGetMeta(),
- body: xenInvocationRequest.getBody(),
- handler: xenInvocationRequest.getHandler(),
- variables: xenInvocationRequest.getUserVariables()
- };
+ async execute(request) {
const requestId = (0, uuid_1.v4)();
return new Promise((resolve, reject) => {
this.callbacks.set(requestId, (result) => {
this.callbacks.delete(requestId);
resolve(result);
});
- const timeout = xenInvocationRequest.__deprecatedGetMeta().timeout ?? 25;
+ const timeout = request._meta.timeout ?? 25;
const deadline = Date.now() + timeout * 1000;
const tunnelContext = {
requestId,
deadline
};
- const message = { lambdaEvent, tunnelContext };
+ const message = { lambdaEvent: request, tunnelContext };
this.process.send(message);
});
}
stop() {Modified: package/out/command/start-tunnel-command.js
Index: package/out/command/start-tunnel-command.js
===================================================================
--- package/out/command/start-tunnel-command.js
+++ package/out/command/start-tunnel-command.js
@@ -1,32 +1,27 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.StartTunnelCommand = void 0;
const tslib_1 = require("tslib");
-const cli_shared_1 = require("@forge/cli-shared");
-const runtime_1 = require("@forge/runtime");
const node_cache_1 = tslib_1.__importDefault(require("node-cache"));
const portfinder_1 = require("portfinder");
const servers_1 = require("../servers");
-const index_1 = require("../index");
class StartTunnelCommand {
getAppConfig;
devServer;
tunnelFactory;
tunnelClient;
functionHost;
- inspector;
logger;
configFile;
tunnelServers = {};
cspReporterServer;
- constructor(getAppConfig, devServer, tunnelFactory, tunnelClient, functionHost, inspector, logger, configFile) {
+ constructor(getAppConfig, devServer, tunnelFactory, tunnelClient, functionHost, logger, configFile) {
this.getAppConfig = getAppConfig;
this.devServer = devServer;
this.tunnelFactory = tunnelFactory;
this.tunnelClient = tunnelClient;
this.functionHost = functionHost;
- this.inspector = inspector;
this.logger = logger;
this.configFile = configFile;
}
stopServices = async (appId, environmentKey) => {
@@ -34,9 +29,8 @@
this.functionHost.stopWatching(),
this.tunnelClient.unregisterTunnels(appId, environmentKey),
this.tunnelFactory.closeTunnel(),
this.devServer.stop(),
- this.inspector.stopServer(),
...Object.values(this.tunnelServers).map((server) => server.stop()),
this.cspReporterServer?.stop()
]);
};
@@ -99,28 +93,16 @@
resourceKey
}))
};
await this.tunnelClient.registerTunnels(appId, environmentKey, tunnelDefinitions);
- const inspectorAddress = (0, index_1.isInspectorEnabled)() ? this.inspector.startServer(index_1.INSPECTOR_PORT) : undefined;
const stopFunction = async () => this.stopServices(appId, environmentKey);
const reloadSandboxes = async (bundledCode, tunnelOptions) => {
await this.functionHost.stopWatching();
- try {
- await this.functionHost.startWatching(bundledCode, tunnelOptions);
- }
- catch (e) {
- if (e instanceof runtime_1.SnapshotCodeError) {
- this.logger.error(new Error(cli_shared_1.Text.snapshot.error('App code snapshot error', e.message)));
- }
- else {
- throw e;
- }
- }
+ await this.functionHost.startWatching(bundledCode, tunnelOptions);
};
return {
localPort: faasTunnelServer.port,
tunnelDefinitions,
- inspectorAddress,
stopFunction,
reloadSandboxes,
faasServer: faasTunnelServer.devServer,
uiServers: customUITunnelsServers.map(({ devServer }) => devServer)Modified: package/out/command/interactors/tunnel-interactor.js
Index: package/out/command/interactors/tunnel-interactor.js
===================================================================
--- package/out/command/interactors/tunnel-interactor.js
+++ package/out/command/interactors/tunnel-interactor.js
@@ -56,12 +56,9 @@
}
});
}
watchApp = async (startTunnelResult, tunnelOptions = cli_shared_1.defaultNoDebugTunnelOptions) => {
- const { localPort, inspectorAddress, reloadSandboxes, faasServer, uiServers } = startTunnelResult;
- if (inspectorAddress) {
- this.logger.info(cli_shared_1.Text.tunnel.startedInspector(inspectorAddress));
- }
+ const { localPort, reloadSandboxes, faasServer, uiServers } = startTunnelResult;
const onBuildWillStart = async () => {
this.logger.info('');
this.logger.info(cli_shared_1.Text.bundle.detectedChanges);
if (tunnelOptions.verify) {Modified: package/package.json
Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,7 +1,7 @@
{
"name": "@forge/tunnel",
- "version": "6.0.0-next.13",
+ "version": "6.0.0-next.14",
"description": "Tunnel functionality for Forge CLI",
"author": "Atlassian",
"license": "SEE LICENSE IN LICENSE.txt",
"main": "out/index.js",
@@ -10,12 +10,12 @@
"clean": "rm -rf ./out && rm -f tsconfig.tsbuildinfo",
"compile": "tsc -b -v"
},
"dependencies": {
- "@forge/bundler": "6.0.0-next.13",
- "@forge/cli-shared": "8.0.0-next.13",
+ "@forge/bundler": "6.0.0-next.14",
+ "@forge/cli-shared": "8.0.0-next.14",
"@forge/csp": "4.0.0-next.0",
- "@forge/runtime": "6.0.0-next.0",
+ "@forge/runtime": "6.0.0-next.1",
"cloudflared": "^0.7.0",
"chokidar": "^3.6.0",
"express": "^4.18.3",
"express-intercept": "^1.1.0",
@@ -29,9 +29,9 @@
"which": "^3.0.1"
},
"devDependencies": {
"@atlassian/xen-test-util": "^4.2.0",
- "@forge/manifest": "10.0.0-next.11",
+ "@forge/manifest": "10.0.0-next.12",
"@types/express": "^4.17.21",
"@types/jest": "^29.5.12",
"@types/node": "20.19.0",
"@types/supertest": "^2.0.16",Modified: package/out/command/interactors/function-change-watcher.d.ts.map
Index: package/out/command/interactors/function-change-watcher.d.ts.map
===================================================================
--- package/out/command/interactors/function-change-watcher.d.ts.map
+++ package/out/command/interactors/function-change-watcher.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"function-change-watcher.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/function-change-watcher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAoB,MAAM,EAAE,aAAa,EAA+B,MAAM,mBAAmB,CAAC;AACrH,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAIL,OAAO,EACP,aAAa,EACd,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,qBAAqB;IACpC,aAAa,CAAC,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvF,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,eAAO,MAAM,YAAY,MAAM,CAAC;AAEhC,qBAAa,iBAAkB,YAAW,qBAAqB;IAE3D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAFb,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC;IAG7D,aAAa,CACxB,WAAW,EAAE,aAAa,EAC1B,aAAa,GAAE,aAA2C,GACzD,OAAO,CAAC,IAAI,CAAC;IAYH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C,OAAO,CAAC,YAAY,CAElB;YAEY,mBAAmB;WAwBnB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa;CAY7F"}
\ No newline at end of file
+{"version":3,"file":"function-change-watcher.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/function-change-watcher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAoB,MAAM,EAAE,aAAa,EAA+B,MAAM,mBAAmB,CAAC;AACrH,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAIL,OAAO,EACP,aAAa,EACd,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,qBAAqB;IACpC,aAAa,CAAC,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvF,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,eAAO,MAAM,YAAY,MAAM,CAAC;AAEhC,qBAAa,iBAAkB,YAAW,qBAAqB;IAE3D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAFb,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC;IAG7D,aAAa,CACxB,WAAW,EAAE,aAAa,EAC1B,aAAa,GAAE,aAA2C,GACzD,OAAO,CAAC,IAAI,CAAC;IAYH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C,OAAO,CAAC,YAAY,CAElB;YAEY,mBAAmB;WAuBnB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa;CAY7F"}
\ No newline at end of fileModified: package/out/index.d.ts.map
Index: package/out/index.d.ts.map
===================================================================
--- package/out/index.d.ts.map
+++ package/out/index.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc,QAEnB,CAAC;AAET,wBAAgB,kBAAkB,YAEjC;AAED,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC"}
\ No newline at end of file
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC"}
\ No newline at end of fileModified: package/out/util/invocation-utils.d.ts.map
Index: package/out/util/invocation-utils.d.ts.map
===================================================================
--- package/out/util/invocation-utils.d.ts.map
+++ package/out/util/invocation-utils.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"invocation-utils.d.ts","sourceRoot":"","sources":["../../src/util/invocation-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAK3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,UAAU,WAAW;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,UAAU,oBAAqB,SAAQ,KAAK;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,aAAa,UAAW,oBAAoB,KAAG,WAS3D,CAAC;AAEF,eAAO,MAAM,YAAY,YAAa,GAAG,qBAAsB,MAU9D,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAa,MAAM,WAAW,GAAG,KAAG,MAGhE,CAAC;AAMF,eAAO,MAAM,eAAe,QAAO,MAOlC,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,UAAU,KAAG,MAUpD,CAAC;AAEF,eAAO,MAAM,WAAW,UAAW,MAAM,KAAG,0BAY3C,CAAC"}
\ No newline at end of file
+{"version":3,"file":"invocation-utils.d.ts","sourceRoot":"","sources":["../../src/util/invocation-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,UAAU,WAAW;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,UAAU,oBAAqB,SAAQ,KAAK;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,aAAa,UAAW,oBAAoB,KAAG,WAS3D,CAAC;AAEF,eAAO,MAAM,YAAY,YAAa,GAAG,qBAAsB,MAU9D,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAa,MAAM,WAAW,GAAG,KAAG,MAGhE,CAAC;AAMF,eAAO,MAAM,eAAe,QAAO,MAOlC,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,UAAU,KAAG,MAUpD,CAAC"}
\ No newline at end of fileModified: package/out/services/local-invocation-service.d.ts.map
Index: package/out/services/local-invocation-service.d.ts.map
===================================================================
--- package/out/services/local-invocation-service.d.ts.map
+++ package/out/services/local-invocation-service.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"local-invocation-service.d.ts","sourceRoot":"","sources":["../../src/services/local-invocation-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EACL,mBAAmB,EACnB,SAAS,EAKV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,MAAM,EAAyB,MAAM,mBAAmB,CAAC;AAKlE,qBAAa,sBAAuB,YAAW,iBAAiB;IAE5D,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBADT,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS;IAG1B,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC;IAgDhF,MAAM,CAAC,gBAAgB,WAA6D;IAEpF,MAAM,CAAC,YAAY,wBACI,OAAO;;wCAET,MAAM,GAAG,SAAS,UAC7B,MAAM,KACb,IAAI,CAcL;CACH"}
\ No newline at end of file
+{"version":3,"file":"local-invocation-service.d.ts","sourceRoot":"","sources":["../../src/services/local-invocation-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAyB,MAAM,mBAAmB,CAAC;AAKlE,qBAAa,sBAAuB,YAAW,iBAAiB;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAE9B,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC;IAyBhF,MAAM,CAAC,gBAAgB,WAA6D;IAEpF,MAAM,CAAC,YAAY;;wCAEE,MAAM,GAAG,SAAS,UAC7B,MAAM,KACb,IAAI,CAcL;CACH"}
\ No newline at end of fileModified: package/out/sandbox/node-sandbox.d.ts.map
Index: package/out/sandbox/node-sandbox.d.ts.map
===================================================================
--- package/out/sandbox/node-sandbox.d.ts.map
+++ package/out/sandbox/node-sandbox.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"node-sandbox.d.ts","sourceRoot":"","sources":["../../src/sandbox/node-sandbox.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,gBAAgB,EAChB,OAAO,EACP,aAAa,EACb,SAAS,EAIV,MAAM,gBAAgB,CAAC;AAMxB,qBAAa,WAAY,YAAW,OAAO;IACzC,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkD;gBAEhE,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,aAAa;IAgCnE,OAAO,CAAC,YAAY;IAOd,OAAO,CACX,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,aAAa,EAC/B,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,GAChC,OAAO,CAAC,gBAAgB,CAAC;IA+B5B,IAAI,IAAI,IAAI;CAGb"}
\ No newline at end of file
+{"version":3,"file":"node-sandbox.d.ts","sourceRoot":"","sources":["../../src/sandbox/node-sandbox.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,OAAO,EACP,aAAa,EAId,MAAM,gBAAgB,CAAC;AAMxB,qBAAa,WAAY,YAAW,OAAO;IACzC,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkD;gBAEhE,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,aAAa;IAgCnE,OAAO,CAAC,YAAY;IAOd,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAyBtE,IAAI,IAAI,IAAI;CAGb"}
\ No newline at end of fileModified: package/out/command/start-tunnel-command.d.ts.map
Index: package/out/command/start-tunnel-command.d.ts.map
===================================================================
--- package/out/command/start-tunnel-command.d.ts.map
+++ package/out/command/start-tunnel-command.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"start-tunnel-command.d.ts","sourceRoot":"","sources":["../../src/command/start-tunnel-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAyB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAChH,OAAO,EAAE,SAAS,EAAqB,MAAM,gBAAgB,CAAC;AAI9D,OAAO,EACL,iBAAiB,EAKlB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAsC,iBAAiB,EAAE,MAAM,UAAU,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACzE,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,eAAe,CAAC,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1F;AAED,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAX7B,OAAO,CAAC,aAAa,CAAmE;IACxF,OAAO,CAAC,iBAAiB,CAAgC;gBAGtC,YAAY,EAAE,iBAAiB,EAC/B,SAAS,EAAE,iBAAiB,EAC5B,aAAa,EAAE,mBAAmB,EAClC,YAAY,EAAE,qBAAqB,EACnC,YAAY,EAAE,qBAAqB,EACnC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU;IAGzC,OAAO,CAAC,YAAY,CAUlB;IAEF,OAAO,CAAC,qBAAqB,CAuB3B;IAEF,OAAO,CAAC,gCAAgC,CAoCtC;IAEW,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAyD9E"}
\ No newline at end of file
+{"version":3,"file":"start-tunnel-command.d.ts","sourceRoot":"","sources":["../../src/command/start-tunnel-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAmB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAI1G,OAAO,EACL,iBAAiB,EAKlB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACzE,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,UAAU,EAAE,iBAAiB,CAAC;IAC9B,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,eAAe,CAAC,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1F;AAED,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAV7B,OAAO,CAAC,aAAa,CAAmE;IACxF,OAAO,CAAC,iBAAiB,CAAgC;gBAGtC,YAAY,EAAE,iBAAiB,EAC/B,SAAS,EAAE,iBAAiB,EAC5B,aAAa,EAAE,mBAAmB,EAClC,YAAY,EAAE,qBAAqB,EACnC,YAAY,EAAE,qBAAqB,EACnC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU;IAGzC,OAAO,CAAC,YAAY,CASlB;IAEF,OAAO,CAAC,qBAAqB,CAuB3B;IAEF,OAAO,CAAC,gCAAgC,CAoCtC;IAEW,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CA8C9E"}
\ No newline at end of fileModified: package/out/command/interactors/tunnel-interactor.d.ts.map
Index: package/out/command/interactors/tunnel-interactor.d.ts.map
===================================================================
--- package/out/command/interactors/tunnel-interactor.d.ts.map
+++ package/out/command/interactors/tunnel-interactor.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"tunnel-interactor.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/tunnel-interactor.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAyC,MAAM,EAAQ,aAAa,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACvH,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,qBAAa,gBAAgB;IAGzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAE7B,MAAM,EAAE,MAAM,EAC/B,cAAc,EAAE,cAAc;IAKzB,mBAAmB,CACxB,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACjC,aAAa,EAAE,cAAc,GAAG,SAAS,EACzC,mBAAmB,EAAE,SAAS,GAC7B,OAAO,CAAC,IAAI,CAAC;IAsCT,6BAA6B,CAAC,gBAAgB,EAAE,MAAM;IAUtD,QAAQ,sBACM,iBAAiB,kBACrB,aAAa,KAC3B,QAAQ,cAAc,GAAG,SAAS,CAAC,CA4DpC;CACH"}
\ No newline at end of file
+{"version":3,"file":"tunnel-interactor.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/tunnel-interactor.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAyC,MAAM,EAAQ,aAAa,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACvH,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,qBAAa,gBAAgB;IAGzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAE7B,MAAM,EAAE,MAAM,EAC/B,cAAc,EAAE,cAAc;IAKzB,mBAAmB,CACxB,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACjC,aAAa,EAAE,cAAc,GAAG,SAAS,EACzC,mBAAmB,EAAE,SAAS,GAC7B,OAAO,CAAC,IAAI,CAAC;IAsCT,6BAA6B,CAAC,gBAAgB,EAAE,MAAM;IAUtD,QAAQ,sBACM,iBAAiB,kBACrB,aAAa,KAC3B,QAAQ,cAAc,GAAG,SAAS,CAAC,CAwDpC;CACH"}
\ No newline at end of fileModified: package/CHANGELOG.md
Large diffs are not rendered by default.
Modified: package/out/index.d.ts
Index: package/out/index.d.ts
===================================================================
--- package/out/index.d.ts
+++ package/out/index.d.ts
@@ -1,6 +1,4 @@
-export declare const INSPECTOR_PORT: number;
-export declare function isInspectorEnabled(): boolean;
export * from './services';
export * from './servers';
export * from './command';
export * from './graphql';Modified: package/out/util/invocation-utils.d.ts
Index: package/out/util/invocation-utils.d.ts
===================================================================
--- package/out/util/invocation-utils.d.ts
+++ package/out/util/invocation-utils.d.ts
@@ -1,5 +1,4 @@
-import { AppDeploymentEventLogLevel } from '@forge/cli-shared';
import { P3LogEvent } from '@forge/runtime';
interface LambdaError {
errorType: string;
errorMessage: string;
@@ -21,7 +20,6 @@
export declare const getRequestId: (request: any, value?: string) => string;
export declare const formatInvocation: (handler: string, request: any) => string;
export declare const formatTimestamp: () => string;
export declare const formatRuntimeLog: (event: P3LogEvent) => string;
-export declare const mapLogLevel: (level: string) => AppDeploymentEventLogLevel;
export {};
//# sourceMappingURL=invocation-utils.d.ts.map
\ No newline at end of fileModified: package/out/services/local-invocation-service.d.ts
Index: package/out/services/local-invocation-service.d.ts
===================================================================
--- package/out/services/local-invocation-service.d.ts
+++ package/out/services/local-invocation-service.d.ts
@@ -1,14 +1,13 @@
import { InvocationService } from '../servers';
-import { ExternalRequestBody, Inspector } from '@forge/runtime';
+import { ExternalRequestBody } from '@forge/runtime';
import { Logger } from '@forge/cli-shared';
export declare class LocalInvocationService implements InvocationService {
private readonly logger;
- private readonly inspector;
- constructor(logger: Logger, inspector: Inspector);
+ constructor(logger: Logger);
invoke(handler: string, request: ExternalRequestBody): Promise<any>;
static INTERNAL_METRICS: string[];
- static printMetrics: (shouldReportMetrics: boolean, metrics: {
+ static printMetrics: (metrics: {
[key: string]: any;
}[] | undefined, metricsCompressed: string | undefined, logger: Logger) => void;
}
//# sourceMappingURL=local-invocation-service.d.ts.map
\ No newline at end of fileModified: package/out/sandbox/node-sandbox.d.ts
Index: package/out/sandbox/node-sandbox.d.ts
===================================================================
--- package/out/sandbox/node-sandbox.d.ts
+++ package/out/sandbox/node-sandbox.d.ts
@@ -1,11 +1,11 @@
-import { XenInvocationRequest, LimitsTracker, InvocationResult, Sandbox, SandboxConfig, Inspector } from '@forge/runtime';
+import { ExternalRequestBody, InvocationResult, Sandbox, SandboxConfig } from '@forge/runtime';
export declare class NodeSandbox implements Sandbox {
readonly name: string;
private process;
private readonly callbacks;
constructor({ appPath, modName, handler, debugPort }: SandboxConfig);
private handleOutput;
- execute(xenInvocationRequest: XenInvocationRequest, invocationLimits: LimitsTracker, inspector?: Inspector | undefined): Promise<InvocationResult>;
+ execute(request: ExternalRequestBody): Promise<InvocationResult>;
stop(): void;
}
//# sourceMappingURL=node-sandbox.d.ts.map
\ No newline at end of fileModified: package/out/command/start-tunnel-command.d.ts
Index: package/out/command/start-tunnel-command.d.ts
===================================================================
--- package/out/command/start-tunnel-command.d.ts
+++ package/out/command/start-tunnel-command.d.ts
@@ -1,7 +1,6 @@
import { BundlerOutput } from '@forge/bundler';
import { AppConfigProvider, ConfigFile, Logger, TunnelOptions } from '@forge/cli-shared';
-import { Inspector } from '@forge/runtime';
import { DevelopmentServer } from '../servers';
import { FunctionChangeWatcher } from './interactors';
import { TunnelDefinitions } from '../index';
import { RegisterTunnelService, CreateTunnelService } from '../services';
@@ -13,9 +12,8 @@
}
export interface StartTunnelResult {
localPort: number;
tunnelDefinitions: TunnelDefinitions;
- inspectorAddress?: string;
faasServer: DevelopmentServer;
uiServers: DevelopmentServer[];
stopFunction(): Promise<void>;
reloadSandboxes(bundledCode: BundlerOutput, tunnelOptions: TunnelOptions): Promise<void>;
@@ -25,14 +23,13 @@
private readonly devServer;
private readonly tunnelFactory;
private readonly tunnelClient;
private readonly functionHost;
- private readonly inspector;
private readonly logger;
private readonly configFile;
private tunnelServers;
private cspReporterServer;
- constructor(getAppConfig: AppConfigProvider, devServer: DevelopmentServer, tunnelFactory: CreateTunnelService, tunnelClient: RegisterTunnelService, functionHost: FunctionChangeWatcher, inspector: Inspector, logger: Logger, configFile: ConfigFile);
+ constructor(getAppConfig: AppConfigProvider, devServer: DevelopmentServer, tunnelFactory: CreateTunnelService, tunnelClient: RegisterTunnelService, functionHost: FunctionChangeWatcher, logger: Logger, configFile: ConfigFile);
private stopServices;
private startFaaSTunnelServer;
private startResourceBasedTunnelsServers;
execute(options: StartTunnelOptions): Promise<StartTunnelResult>;