npm package diff
Package: @forge/tunnel
Versions: 5.7.3-next.4 - 5.8.0-next.5
Added: package/out/sandbox/types.js
Added: package/out/sandbox/types.d.ts.map
Added: package/out/sandbox/types.d.ts
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,18 +44,25 @@
async execute(xenInvocationRequest, invocationLimits, inspector) {
const lambdaEvent = {
_meta: xenInvocationRequest.__deprecatedGetMeta(),
body: xenInvocationRequest.getBody(),
+ handler: xenInvocationRequest.getHandler(),
variables: xenInvocationRequest.getUserVariables()
};
const requestId = (0, uuid_1.v4)();
return new Promise((resolve, reject) => {
this.callbacks.set(requestId, (result) => {
this.callbacks.delete(requestId);
resolve(result);
});
- const lambdaContext = { awsRequestId: requestId };
- this.process.send({ lambdaEvent, lambdaContext });
+ const timeout = xenInvocationRequest.__deprecatedGetMeta().timeout ?? 25;
+ const deadline = Date.now() + timeout * 1000;
+ const tunnelContext = {
+ requestId,
+ deadline
+ };
+ const message = { lambdaEvent, tunnelContext };
+ this.process.send(message);
});
}
stop() {
this.process.kill();
Modified: package/out/sandbox/sandbox-runner.js
Index: package/out/sandbox/sandbox-runner.js
===================================================================
--- package/out/sandbox/sandbox-runner.js
+++ package/out/sandbox/sandbox-runner.js
@@ -1,9 +1,13 @@
"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
const [_nodeBinary, _thisScript, fileName, handlerName] = process.argv;
global.__forge_tunnel__ = true;
const handler = require(fileName)[handlerName];
-process.on('message', async ({ lambdaEvent, lambdaContext }) => {
- const requestId = lambdaContext.awsRequestId;
+process.on('message', async ({ lambdaEvent, tunnelContext: { requestId, deadline } }) => {
+ const lambdaContext = {
+ awsRequestId: requestId,
+ getRemainingTimeInMillis: () => deadline - Date.now()
+ };
const result = await handler(lambdaEvent, lambdaContext);
process.send?.({ requestId, result });
});
Modified: package/package.json
Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,7 +1,7 @@
{
"name": "@forge/tunnel",
- "version": "5.7.3-next.4",
+ "version": "5.8.0-next.5",
"description": "Tunnel functionality for Forge CLI",
"author": "Atlassian",
"license": "UNLICENSED",
"main": "out/index.js",
@@ -10,9 +10,9 @@
"clean": "rm -rf ./out && rm -f tsconfig.tsbuildinfo",
"compile": "tsc -b -v"
},
"dependencies": {
- "@forge/bundler": "4.20.4-next.3",
+ "@forge/bundler": "4.20.4-next.4",
"@forge/cli-shared": "6.5.1-next.2",
"@forge/csp": "3.5.0",
"@forge/runtime": "5.10.3",
"chokidar": "^3.6.0",
Modified: 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":"AAKA,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,gBAAgB,EAChB,OAAO,EACP,aAAa,EACb,SAAS,EAIV,MAAM,gBAAgB,CAAC;AAIxB,qBAAa,WAAY,YAAW,OAAO;IACzC,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkD;gBAEhE,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,aAAa;IA6BnE,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;IAmB5B,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":"AAKA,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,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkD;gBAEhE,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,aAAa;IA6BnE,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
Modified: package/out/sandbox/sandbox-runner.d.ts.map
Index: package/out/sandbox/sandbox-runner.d.ts.map
===================================================================
--- package/out/sandbox/sandbox-runner.d.ts.map
+++ package/out/sandbox/sandbox-runner.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"sandbox-runner.d.ts","sourceRoot":"","sources":["../../src/sandbox/sandbox-runner.ts"],"names":[],"mappings":"AAAA,QAAA,MAAO,WAAW,UAAE,WAAW,UAAE,QAAQ,UAAE,WAAW,QAAgB,CAAC;AAMvE,QAAA,MAAM,OAAO,KAAiC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sandbox-runner.d.ts","sourceRoot":"","sources":["../../src/sandbox/sandbox-runner.ts"],"names":[],"mappings":""}
\ No newline at end of file
Modified: package/CHANGELOG.md
Large diffs are not rendered by default.
Modified: package/out/sandbox/sandbox-runner.d.ts
Index: package/out/sandbox/sandbox-runner.d.ts
===================================================================
--- package/out/sandbox/sandbox-runner.d.ts
+++ package/out/sandbox/sandbox-runner.d.ts
@@ -1,3 +1,2 @@
-declare const _nodeBinary: string, _thisScript: string, fileName: string, handlerName: string;
-declare const handler: any;
+export {};
//# sourceMappingURL=sandbox-runner.d.ts.map
\ No newline at end of file