@forge/tunnel 5.0.1-next.4 → 5.0.1-next.6

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @forge/tunnel
 
+## 5.0.1-next.6
+
+### Patch Changes
+
+- @forge/bundler@4.15.10-next.5
+
+## 5.0.1-next.5
+
+### Patch Changes
+
+- eb06eca: Break more dependencies between SDK and runtime
+- Updated dependencies [eb06eca]
+  - @forge/bundler@4.15.10-next.4
+  - @forge/runtime@5.6.1-next.1
+
 ## 5.0.1-next.4
 
 ### Patch Changes

package/out/index.d.ts

@@ -5,4 +5,5 @@ export * from './servers';
 export * from './command';
 export * from './graphql';
 export * from './util';
+export * from './sandbox';
 //# sourceMappingURL=index.d.ts.map

package/out/index.d.ts.map

@@ -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"}
+{"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"}

package/out/index.js

@@ -14,3 +14,4 @@ tslib_1.__exportStar(require("./servers"), exports);
 tslib_1.__exportStar(require("./command"), exports);
 tslib_1.__exportStar(require("./graphql"), exports);
 tslib_1.__exportStar(require("./util"), exports);
+tslib_1.__exportStar(require("./sandbox"), exports);

package/out/sandbox/index.d.ts

@@ -0,0 +1,2 @@
+export * from './node-sandbox';
+//# sourceMappingURL=index.d.ts.map

package/out/sandbox/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sandbox/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC"}

package/out/sandbox/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./node-sandbox"), exports);

package/out/sandbox/node-sandbox.d.ts

@@ -0,0 +1,11 @@
+import { XenInvocationRequest, LimitsTracker, InvocationResult, Sandbox, SandboxConfig, Inspector } from '@forge/runtime';
+export declare class NodeSandbox implements Sandbox {
+    readonly name: string;
+    private readonly process;
+    private readonly callbacks;
+    constructor({ appPath, modName, handler, debugPort }: SandboxConfig);
+    private handleOutput;
+    execute(xenInvocationRequest: XenInvocationRequest, invocationLimits: LimitsTracker, inspector?: Inspector | undefined): Promise<InvocationResult>;
+    stop(): void;
+}
+//# sourceMappingURL=node-sandbox.d.ts.map

package/out/sandbox/node-sandbox.d.ts.map

@@ -0,0 +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;IA2BnE,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"}

package/out/sandbox/node-sandbox.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeSandbox = void 0;
+const tslib_1 = require("tslib");
+const child_process_1 = require("child_process");
+const path_1 = require("path");
+const readline_1 = tslib_1.__importDefault(require("readline"));
+const uuid_1 = require("uuid");
+const runtime_1 = require("@forge/runtime");
+const RUNNER = (0, path_1.join)(__dirname, '..', '..', 'out', 'sandbox', 'sandbox-runner.js');
+class NodeSandbox {
+    name;
+    process;
+    callbacks;
+    constructor({ appPath, modName, handler, debugPort }) {
+        this.name = `${modName}.${handler}`;
+        const fileName = `${appPath}/${modName}.cjs`;
+        this.callbacks = new Map();
+        this.process = (0, child_process_1.fork)(RUNNER, [fileName, handler], {
+            stdio: ['ignore', 'pipe', 2, 'ipc'],
+            env: {
+                _HANDLER: this.name
+            },
+            execArgv: debugPort ? [`--inspect=0.0.0.0:${debugPort}`] : undefined
+        });
+        readline_1.default.createInterface(this.process.stdout).on('line', (line) => {
+            const message = JSON.parse(line);
+            this.handleOutput(message);
+        });
+        this.process.on('message', (message) => {
+            const requestId = message.requestId;
+            const result = message.result;
+            this.callbacks.get(requestId)?.(result);
+        });
+    }
+    handleOutput(output) {
+        if (output.invocationId) {
+            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(),
+            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 });
+        });
+    }
+    stop() {
+        this.process.kill();
+    }
+}
+exports.NodeSandbox = NodeSandbox;

package/out/sandbox/sandbox-runner.d.ts

@@ -0,0 +1,3 @@
+declare const _nodeBinary: string, _thisScript: string, fileName: string, handlerName: string;
+declare const handler: any;
+//# sourceMappingURL=sandbox-runner.d.ts.map

package/out/sandbox/sandbox-runner.d.ts.map

@@ -0,0 +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"}

package/out/sandbox/sandbox-runner.js

@@ -0,0 +1,9 @@
+"use strict";
+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;
+    const result = await handler(lambdaEvent, lambdaContext);
+    process.send?.({ requestId, result });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/tunnel",
-  "version": "5.0.1-next.4",
+  "version": "5.0.1-next.6",
   "description": "Tunnel functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -11,10 +11,10 @@
     "compile": "tsc -b -v"
   },
   "dependencies": {
-    "@forge/bundler": "4.15.10-next.3",
+    "@forge/bundler": "4.15.10-next.5",
     "@forge/cli-shared": "4.0.0-next.3",
     "@forge/csp": "3.2.1",
-    "@forge/runtime": "5.6.1-next.0",
+    "@forge/runtime": "5.6.1-next.1",
     "express": "^4.18.3",
     "express-intercept": "^1.1.0",
     "http-proxy-middleware": "^2.0.6",