@forge/tunnel 2.2.1-next.12 → 2.2.1-next.14

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @forge/tunnel
 
+## 2.2.1-next.14
+
+### Patch Changes
+
+- a36488fc: Bundle Node runtime wrapper using Webpack
+- Updated dependencies [b7428f75]
+- Updated dependencies [a36488fc]
+- Updated dependencies [8d0dc104]
+- Updated dependencies [bbca9bed]
+  - @forge/cli-shared@3.5.0-next.5
+  - @forge/bundler@4.2.0-next.9
+  - @forge/runtime@3.0.0-next.6
+
+## 2.2.1-next.13
+
+### Patch Changes
+
+- Updated dependencies [1ad9503]
+  - @forge/bundler@4.1.1-next.8
+  - @forge/cli-shared@3.4.1-next.4
+
 ## 2.2.1-next.12
 
 ### Patch Changes

package/out/tunnelling/command/interactors/function-change-watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function-change-watcher.d.ts","sourceRoot":"","sources":["../../../../src/tunnelling/command/interactors/function-change-watcher.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAG1C,OAAO,EAAE,UAAU,EAA8B,MAAM,EAAyB,MAAM,mBAAmB,CAAC;AAC1G,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAML,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,qBAAqB;IACpC,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACxE;AASD,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,YAAY,MAAM,CAAC;AAEhC,qBAAa,iBAAkB,YAAW,qBAAqB;IAI3D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAN/B,OAAO,CAAC,YAAY,CAA8C;gBAG/C,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,eAAe,EACzB,YAAY,EAAE,YAAY;YAG/B,mBAAmB;IAuBpB,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA8CxD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C,OAAO,CAAC,YAAY,CAElB;YAEY,8BAA8B;YAgB9B,mBAAmB;CAoBlC"}
+{"version":3,"file":"function-change-watcher.d.ts","sourceRoot":"","sources":["../../../../src/tunnelling/command/interactors/function-change-watcher.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAG1C,OAAO,EAAE,UAAU,EAA8B,MAAM,EAAiB,MAAM,mBAAmB,CAAC;AAClG,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAML,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,qBAAqB;IACpC,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACxE;AASD,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,YAAY,MAAM,CAAC;AAEhC,qBAAa,iBAAkB,YAAW,qBAAqB;IAI3D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAN/B,OAAO,CAAC,YAAY,CAA8C;gBAG/C,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,eAAe,EACzB,YAAY,EAAE,YAAY;YAG/B,mBAAmB;IAuBpB,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA8CxD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C,OAAO,CAAC,YAAY,CAElB;YAEY,8BAA8B;YAU9B,mBAAmB;CAiBlC"}

package/out/tunnelling/command/interactors/function-change-watcher.js

@@ -77,33 +77,24 @@ class LocalFunctionHost {
     async stopWatching() {
         runtime_1.InvocationEventEmitter.removeAllListeners();
     }
-    async initializeSandboxForDefinition(srcPath, handler) {
-        const parts = handler.split('.');
-        if (parts.length !== 2) {
-            throw new cli_shared_1.ValidationError(cli_shared_1.Text.tunnel.error.handler.format(handler));
-        }
-        const [mod, func] = parts;
+    async initializeSandboxForDefinition(srcPath, { module, func }) {
         return await (0, runtime_1.initializeSandbox)({
             appPath: srcPath,
-            modName: mod,
+            modName: module,
             handler: func,
             timeout: exports.INVOCATION_TIMEOUT,
             isolateMemory: exports.MEMORY_LIMIT
         });
     }
     async initializeSandboxes(srcPath) {
-        var _a;
         try {
-            const manifest = await this.configFile.readConfig();
-            const functions = (_a = manifest.modules) === null || _a === void 0 ? void 0 : _a.function;
-            const handlers = functions === null || functions === void 0 ? void 0 : functions.map((fn) => fn.handler);
-            const uniqueHandlers = Array.from(new Set(handlers));
-            const promises = uniqueHandlers.map(async (handler) => {
+            const handlers = await this.configFile.getAppHandlers();
+            const sandboxes = {};
+            await Promise.all(handlers.map(async (handler) => {
                 const sandbox = await this.initializeSandboxForDefinition(srcPath, handler);
-                return { [handler]: sandbox };
-            });
-            const resolveds = await Promise.all(promises);
-            util_1.SandboxesContainer.updateSandboxes(resolveds.reduce((acc, obj) => Object.assign(acc, obj), {}));
+                sandboxes[`${handler.module}.${handler.func}`] = sandbox;
+            }));
+            util_1.SandboxesContainer.updateSandboxes(sandboxes);
         }
         catch (error) {
             this.logger.error(error);

package/out/tunnelling/servers/dev-server.d.ts

@@ -4,6 +4,7 @@ import { URL } from 'url';
 import { ConfigFile, Logger } from '@forge/cli-shared';
 import { ExternalRequestBody } from '@forge/runtime';
 import { Permissions, Remotes } from '@forge/manifest';
+import { BundlerOutput } from '@forge/bundler';
 export interface WatchHooks<T = any> {
     onBuildWillStart: () => Promise<void>;
     onBuildFinished: (err: Error | null, result?: T) => Promise<void>;
@@ -11,7 +12,7 @@ export interface WatchHooks<T = any> {
 export interface DevelopmentServer {
     start(port?: number, permissions?: Permissions, remotes?: Remotes): Promise<StartDevServerResult>;
     stop(): Promise<void>;
-    compileAndWatch<T = any>(hooks: WatchHooks<T>): Promise<any>;
+    compileAndWatch(hooks: WatchHooks<BundlerOutput>): Promise<any>;
 }
 export interface StartDevServerResult {
     port: number;
@@ -33,10 +34,8 @@ export declare class LocalDevelopmentServer implements DevelopmentServer {
     constructor(invocationService: InvocationService, logger: Logger, configFile: ConfigFile);
     start(port?: number, permissions?: Permissions, remotes?: Remotes): Promise<StartDevServerResult>;
     stop(): Promise<void>;
-    compileAndWatch<BundlerOutput>({ onBuildWillStart, onBuildFinished }: WatchHooks<BundlerOutput>): Promise<BundlerOutput | undefined>;
+    compileAndWatch({ onBuildWillStart, onBuildFinished }: WatchHooks<BundlerOutput>): Promise<BundlerOutput | undefined>;
     getApp(): express.Application;
     handleInvocation: express.Handler;
-    private getEntryPoints;
-    private getRuntimeCompiler;
 }
 //# sourceMappingURL=dev-server.d.ts.map

package/out/tunnelling/servers/dev-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/servers/dev-server.ts"],"names":[],"mappings":";AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAI9B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAY,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAe,MAAM,gBAAgB,CAAC;AAGlE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAQvD,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,GAAG;IACjC,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,eAAe,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE;AACD,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAClG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,eAAe,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC9D;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,iBAAiB,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACrE;AAED,qBAAa,sBAAuB,YAAW,iBAAiB;IAO5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,OAAO,CAAsB;gBAGlB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU;IAQ5B,KAAK,CAAC,IAAI,SAAI,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAe5F,IAAI;IAUJ,eAAe,CAAC,aAAa,EAAE,EAC1C,gBAAgB,EAChB,eAAe,EAChB,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAwC1D,MAAM,IAAI,OAAO,CAAC,WAAW;IAI7B,gBAAgB,EAAE,OAAO,CAAC,OAAO,CAsCtC;IAEF,OAAO,CAAC,cAAc,CAepB;IAEF,OAAO,CAAC,kBAAkB,CAsBxB;CACH"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/servers/dev-server.ts"],"names":[],"mappings":";AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAY,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAe,MAAM,gBAAgB,CAAC;AAGlE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,aAAa,EAKd,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,GAAG;IACjC,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,eAAe,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE;AACD,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAClG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,iBAAiB,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACrE;AAED,qBAAa,sBAAuB,YAAW,iBAAiB;IAO5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,OAAO,CAAsB;gBAGlB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU;IAQ5B,KAAK,CAAC,IAAI,SAAI,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAe5F,IAAI;IAUJ,eAAe,CAAC,EAC3B,gBAAgB,EAChB,eAAe,EAChB,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAiD1D,MAAM,IAAI,OAAO,CAAC,WAAW;IAI7B,gBAAgB,EAAE,OAAO,CAAC,OAAO,CAsCtC;CACH"}

package/out/tunnelling/servers/dev-server.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalDevelopmentServer = void 0;
 const tslib_1 = require("tslib");
 const express_1 = tslib_1.__importDefault(require("express"));
-const path_1 = tslib_1.__importDefault(require("path"));
+const bundler_1 = require("@forge/bundler");
 const cli_shared_1 = require("@forge/cli-shared");
 const runtime_1 = require("@forge/runtime");
 const __1 = require("../");
 const util_1 = require("../util");
-const bundler_1 = require("@forge/bundler");
+const bundler_2 = require("@forge/bundler");
 class LocalDevelopmentServer {
     constructor(invocationService, logger, configFile) {
         this.invocationService = invocationService;
@@ -44,36 +44,6 @@ class LocalDevelopmentServer {
                 }
             }
         };
-        this.getEntryPoints = async () => {
-            const handlers = await this.configFile.getAppHandlers();
-            const currentDirectory = process.cwd();
-            const entryPoints = [];
-            for (const handler of handlers) {
-                entryPoints.push({
-                    name: handler,
-                    path: path_1.default.join(currentDirectory, 'src', handler)
-                });
-            }
-            return entryPoints;
-        };
-        this.getRuntimeCompiler = async () => {
-            const entryPoints = await this.getEntryPoints();
-            if (!entryPoints.length) {
-                return {
-                    compiler: undefined,
-                    entryPoints
-                };
-            }
-            const config = (0, bundler_1.getSandboxedRuntimeBuildConfig)(entryPoints, {
-                isWatchMode: true,
-                isDebugMode: (0, __1.isInspectorEnabled)(),
-                appDirectory: process.cwd()
-            });
-            return {
-                compiler: (0, bundler_1.getCompiler)(config),
-                entryPoints
-            };
-        };
         this.app = (0, express_1.default)();
         this.app.use(express_1.default.json({ limit: '6mb' }));
         this.app.post(`/:fnKey`, this.handleInvocation);
@@ -99,10 +69,17 @@ class LocalDevelopmentServer {
         await new Promise((resolve, reject) => server.close((err) => (err ? reject(err) : resolve())));
     }
     async compileAndWatch({ onBuildWillStart, onBuildFinished }) {
-        const { compiler, entryPoints } = await this.getRuntimeCompiler();
-        if (!compiler) {
+        const handlers = await this.configFile.getAppHandlers();
+        const entryPoints = (0, bundler_1.getEntryPoints)(handlers);
+        if (!entryPoints.length) {
             return;
         }
+        const config = (0, bundler_2.getSandboxedRuntimeBuildConfig)(entryPoints, {
+            isWatchMode: true,
+            isDebugMode: (0, __1.isInspectorEnabled)(),
+            appDirectory: process.cwd()
+        });
+        const compiler = (0, bundler_2.getCompiler)(config);
         let isFirstRun = true;
         compiler.hooks.watchRun.tapAsync('watchRun', async (_, watchRunCallback) => {
             if (!isFirstRun) {
@@ -113,9 +90,9 @@ class LocalDevelopmentServer {
         return new Promise((resolve, reject) => {
             compiler.watch({ poll: 1000 }, async (compilerError, stats) => {
                 try {
-                    (0, bundler_1.handleWebpackCompilationResult)(compilerError, stats);
+                    (0, bundler_2.handleWebpackCompilationResult)(compilerError, stats);
                     this.logger.info(cli_shared_1.LogColor.trace(cli_shared_1.Text.tunnel.functionsBundlingSucceeded));
-                    const bundle = (0, bundler_1.getInMemoryBundle)(entryPoints);
+                    const bundle = (0, bundler_2.getInMemoryBundle)(config);
                     if (!isFirstRun) {
                         await onBuildFinished(null, bundle);
                     }

package/out/tunnelling/servers/native-ui-tunnel-server.js

@@ -12,7 +12,7 @@ class NativeUITunnelServer extends resource_tunnel_server_1.ResourceTunnelServer
         super(tunnelArgs);
         this.tunnelArgs = tunnelArgs;
         const { key, path, port, permissions, remotes } = tunnelArgs;
-        const entrypoint = { name: key, path };
+        const entrypoint = { name: key, path, functions: [] };
         const config = (0, bundler_1.getNativeUiBuildConfig)([entrypoint]);
         const compiler = (0, bundler_1.getCompiler)(Object.assign(Object.assign({}, config), { infrastructureLogging: {
                 level: 'error'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/tunnel",
-  "version": "2.2.1-next.12",
+  "version": "2.2.1-next.14",
   "description": "Tunnel functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -16,11 +16,11 @@
     "postbuild": "chmod +x out/*.js"
   },
   "dependencies": {
-    "@forge/bundler": "4.1.1-next.7",
-    "@forge/cli-shared": "3.4.1-next.3",
+    "@forge/bundler": "4.2.0-next.9",
+    "@forge/cli-shared": "3.5.0-next.5",
     "@forge/csp": "^2.1.0",
     "@forge/isolated-vm": "4.0.0-next.0",
-    "@forge/runtime": "3.0.0-next.5",
+    "@forge/runtime": "3.0.0-next.6",
     "express": "^4.17.1",
     "express-intercept": "^0.8.10",
     "http-proxy-middleware": "^1.0.6",
@@ -32,7 +32,7 @@
     "webpack-dev-server": "^4.11.1"
   },
   "devDependencies": {
-    "@forge/manifest": "^4.5.3-next.0",
+    "@forge/manifest": "^4.5.3-next.1",
     "@types/express": "^4.17.2",
     "@types/jest": "^29.1.2",
     "@types/node": "^12.12.63",