@forge/bundler 4.4.0-next.2 → 4.4.0-next.4

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @forge/bundler
 
+## 4.4.0-next.4
+
+### Minor Changes
+
+- e25c75e8: Update Node runtime response payload
+
+### Patch Changes
+
+- Updated dependencies [e25c75e8]
+  - @forge/runtime@4.1.0-next.1
+
+## 4.4.0-next.3
+
+### Patch Changes
+
+- d98339a: Non-Docker tunnel for Node runtime
+- Updated dependencies [d98339a]
+  - @forge/runtime@4.0.1-next.0
+
 ## 4.4.0-next.2
 
 ### Minor Changes

package/out/config/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/config/node.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,mBAAmB,EAIpB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,wBAAwB,iBAAiB,CAAC;AAEvD,eAAO,MAAM,yBAAyB,gBACvB,mBAAmB,EAAE,UAC1B,aAAa,KACpB,mBA8CF,CAAC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/config/node.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,mBAAmB,EAIpB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,wBAAwB,iBAAiB,CAAC;AAEvD,eAAO,MAAM,yBAAyB,gBACvB,mBAAmB,EAAE,UAC1B,aAAa,KACpB,mBAwCF,CAAC"}

package/out/config/node.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNodeRuntimeBuildConfig = exports.NODE_WEBPACK_CONFIG_NAME = void 0;
-const tslib_1 = require("tslib");
-const webpack_1 = tslib_1.__importStar(require("webpack"));
+const webpack_1 = require("webpack");
 const common_1 = require("./common");
 exports.NODE_WEBPACK_CONFIG_NAME = 'node-runtime';
 const getNodeRuntimeBuildConfig = (entrypoints, config) => {
@@ -14,12 +13,7 @@ const getNodeRuntimeBuildConfig = (entrypoints, config) => {
         newEntries[entryKey] = wrapperPath;
     }
     webpackConfig.entry = newEntries;
-    const nodeConfigPlugin = new webpack_1.default.ProvidePlugin({
-        console: (0, common_1.resolveStubPath)('console'),
-        'global.console': (0, common_1.resolveStubPath)('console')
-    });
-    webpackConfig.plugins.push(nodeConfigPlugin);
-    webpackConfig.target = 'node14';
+    webpackConfig.target = 'node18';
     const defineExports = ({ filename }) => {
         const entryName = filename.replace(/\.js$/, '');
         const entrypoint = entrypoints.find((e) => e.name === entryName);

package/out/index.d.ts

@@ -2,5 +2,6 @@ export { Bundler, InDiskBundler, Watcher, WatcherMonitor, BundlerOutput } from '
 export { sandboxBundle, nodeBundle, nativeUiBundle, watch, getCompiler, getInMemoryBundle, handleWebpackCompilationResult, runLinter } from './webpack';
 export { EntryPoint, FunctionsEntryPoint, getEntryPoints } from './config/common';
 export { getNativeUiBuildConfig } from './config/nativeui';
+export { getNodeRuntimeBuildConfig } from './config/node';
 export { getSandboxedRuntimeBuildConfig } from './config/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":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,EACL,aAAa,EACb,UAAU,EACV,cAAc,EACd,KAAK,EACL,WAAW,EACX,iBAAiB,EACjB,8BAA8B,EAC9B,SAAS,EACV,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,EACL,aAAa,EACb,UAAU,EACV,cAAc,EACd,KAAK,EACL,WAAW,EACX,iBAAiB,EACjB,8BAA8B,EAC9B,SAAS,EACV,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC"}

package/out/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSandboxedRuntimeBuildConfig = exports.getNativeUiBuildConfig = exports.getEntryPoints = exports.runLinter = exports.handleWebpackCompilationResult = exports.getInMemoryBundle = exports.getCompiler = exports.watch = exports.nativeUiBundle = exports.nodeBundle = exports.sandboxBundle = void 0;
+exports.getSandboxedRuntimeBuildConfig = exports.getNodeRuntimeBuildConfig = exports.getNativeUiBuildConfig = exports.getEntryPoints = exports.runLinter = exports.handleWebpackCompilationResult = exports.getInMemoryBundle = exports.getCompiler = exports.watch = exports.nativeUiBundle = exports.nodeBundle = exports.sandboxBundle = void 0;
 var webpack_1 = require("./webpack");
 Object.defineProperty(exports, "sandboxBundle", { enumerable: true, get: function () { return webpack_1.sandboxBundle; } });
 Object.defineProperty(exports, "nodeBundle", { enumerable: true, get: function () { return webpack_1.nodeBundle; } });
@@ -14,5 +14,7 @@ var common_1 = require("./config/common");
 Object.defineProperty(exports, "getEntryPoints", { enumerable: true, get: function () { return common_1.getEntryPoints; } });
 var nativeui_1 = require("./config/nativeui");
 Object.defineProperty(exports, "getNativeUiBuildConfig", { enumerable: true, get: function () { return nativeui_1.getNativeUiBuildConfig; } });
+var node_1 = require("./config/node");
+Object.defineProperty(exports, "getNodeRuntimeBuildConfig", { enumerable: true, get: function () { return node_1.getNodeRuntimeBuildConfig; } });
 var sandbox_1 = require("./config/sandbox");
 Object.defineProperty(exports, "getSandboxedRuntimeBuildConfig", { enumerable: true, get: function () { return sandbox_1.getSandboxedRuntimeBuildConfig; } });

package/out/stubs/console.d.ts

@@ -1,2 +1,5 @@
+/// <reference types="node" />
+import { ConsoleMethod } from '@forge/runtime';
 export declare const starSerializer: (arg: any) => any;
+export declare const forgeConsole: Pick<Console, ConsoleMethod>;
 //# sourceMappingURL=console.d.ts.map

package/out/stubs/console.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../src/stubs/console.ts"],"names":[],"mappings":"AAoDA,eAAO,MAAM,cAAc,QAAS,GAAG,KAAG,GAsBzC,CAAC"}
+{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../src/stubs/console.ts"],"names":[],"mappings":";AAEA,OAAO,EAAsB,aAAa,EAA+B,MAAM,gBAAgB,CAAC;AAyChG,eAAO,MAAM,cAAc,QAAS,GAAG,KAAG,GAsBzC,CAAC;AAgDF,eAAO,MAAM,YAAY,EAAE,IAAI,CAAC,OAAO,EAAE,aAAa,CAMrD,CAAC"}

package/out/stubs/console.js

@@ -1,29 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.starSerializer = void 0;
+exports.forgeConsole = exports.starSerializer = void 0;
 const bunyan_1 = require("bunyan");
 const api_1 = require("@forge/api");
-const isNonEmptyArray = (arr) => arr.length > 0;
-function transformSandBoxLogMessage(message) {
-    let msg = '', starval = [];
-    if (typeof message === 'string') {
-        msg = message;
+const runtime_1 = require("@forge/runtime");
+function stringMessage(arg) {
+    if (typeof arg === 'string') {
+        return arg;
+    }
+    else if (arg instanceof Error) {
+        return arg.toString();
     }
     else {
-        if (Array.isArray(message) && message.length > 0) {
-            const first = message[0];
-            if (typeof first === 'string') {
-                msg = first;
-                starval = message.slice(1);
-            }
-            else {
-                starval = message;
-            }
+        return null;
+    }
+}
+function transformSandBoxLogMessage(arg) {
+    let msg = stringMessage(arg);
+    if (msg === null && Array.isArray(arg) && arg.length > 0) {
+        msg = stringMessage(arg[0]);
+        if (msg !== null) {
+            arg = arg.slice(1);
         }
     }
+    if (msg === null) {
+        msg = '';
+    }
     return {
-        msg: msg,
-        '*': starval
+        msg,
+        '*': arg
     };
 }
 const starSerializer = (arg) => {
@@ -37,7 +42,7 @@ const starSerializer = (arg) => {
     if (arg instanceof Error) {
         return {
             message: arg.message,
-            name: arg.name,
+            name: (0, api_1.isForgePlatformError)(arg) ? arg.name : api_1.FUNCTION_ERR,
             stack: (_a = arg.stack) !== null && _a !== void 0 ? _a : ''
         };
     }
@@ -66,23 +71,30 @@ function formatLogMessage(requestId, logEventData) {
 const logger = (0, bunyan_1.createLogger)({
     name: 'node-runtime',
     level: bunyan_1.levelFromName.info,
-    serializers: { err: bunyan_1.stdSerializers.err, '*': exports.starSerializer }
+    serializers: { '*': exports.starSerializer }
 });
 function customConsole(logMethod) {
     return (...rawData) => {
-        const context = (0, api_1.getRuntime)().lambdaContext;
-        if (isNonEmptyArray(rawData)) {
+        var _a;
+        const runtime = (0, api_1.getRuntime)();
+        if ((0, runtime_1.isNonEmptyArray)(rawData)) {
+            const awsRequestId = (_a = runtime.lambdaContext) === null || _a === void 0 ? void 0 : _a.awsRequestId;
             const logEventData = {
-                invocationId: context === null || context === void 0 ? void 0 : context.awsRequestId,
+                invocationId: awsRequestId,
                 logLevel: bunyan_1.levelFromName[logMethod],
                 logArguments: rawData
             };
-            const data = formatLogMessage(context === null || context === void 0 ? void 0 : context.awsRequestId, logEventData);
-            logger.info(data, data.msg);
+            if (global.__forge_tunnel__) {
+                process.stdout.write(JSON.stringify((0, exports.starSerializer)(logEventData)) + '\n');
+            }
+            else {
+                const data = formatLogMessage(awsRequestId, logEventData);
+                logger.info(data, data.msg);
+            }
         }
     };
 }
-module.exports = {
+exports.forgeConsole = {
     log: customConsole('info'),
     info: customConsole('info'),
     warn: customConsole('warn'),

package/out/stubs/wrapper.js

@@ -1,60 +1,12 @@
 "use strict";
 var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
+const bunyan_1 = require("bunyan");
 const api_1 = require("@forge/api");
-const ARI = tslib_1.__importStar(require("@forge/util/packages/cs-ari"));
-function createInstallationContext({ contextAri }) {
-    const ari = ARI.parse(contextAri);
-    if (ari.resourceType === 'project') {
-        return { projectId: ari.resourceId, installContext: contextAri };
-    }
-    if (ari.resourceType === 'repository') {
-        return { repositoryId: ari.resourceId, installContext: contextAri };
-    }
-    return { installContext: contextAri };
-}
-function isAccountIdDefined(accountId) {
-    return accountId !== undefined && accountId !== 'undefined';
-}
-function createPrincipal({ aaid: accountId }) {
-    return isAccountIdDefined(accountId) ? { accountId } : undefined;
-}
-function createLicenseContext({ license }) {
-    if (license) {
-        return {
-            license: {
-                isActive: license.isActive ? true : false
-            }
-        };
-    }
-}
-function setupRequestContext(meta) {
-    return Object.assign(Object.assign({ principal: createPrincipal(meta) }, createLicenseContext(meta)), createInstallationContext(meta));
-}
-function serializeThrownObjects(arg) {
-    var _a, _b;
-    if (typeof arg !== 'object') {
-        return arg;
-    }
-    if (Array.isArray(arg)) {
-        return arg.map(serializeThrownObjects);
-    }
-    if (arg instanceof Error) {
-        return {
-            message: arg.message,
-            name: (0, api_1.isForgePlatformError)(arg) ? arg.name : api_1.FUNCTION_ERR,
-            stack: (_a = arg.stack) !== null && _a !== void 0 ? _a : ''
-        };
-    }
-    if (((_b = arg === null || arg === void 0 ? void 0 : arg.constructor) === null || _b === void 0 ? void 0 : _b.name) !== 'Object') {
-        return arg;
-    }
-    const res = {};
-    for (const prop in arg) {
-        res[prop] = serializeThrownObjects(arg[prop]);
-    }
-    return res;
+const runtime_1 = require("@forge/runtime");
+const console_1 = require("./console");
+for (const method of runtime_1.CONSOLE_METHODS) {
+    global.console[method] = console_1.forgeConsole[method];
 }
 function invocationHeaderLogs(lambdaEvent) {
     const { featureFlags, contextAri, appContext, tracing } = lambdaEvent === null || lambdaEvent === void 0 ? void 0 : lambdaEvent._meta;
@@ -97,43 +49,39 @@ function invocationFooterLogs(successfulInvocation) {
         }
     };
 }
-var BunyanCoreLogEventTypes;
-(function (BunyanCoreLogEventTypes) {
-    BunyanCoreLogEventTypes["HEADER"] = "header";
-    BunyanCoreLogEventTypes["FOOTER"] = "footer";
-    BunyanCoreLogEventTypes["LOG"] = "log";
-})(BunyanCoreLogEventTypes || (BunyanCoreLogEventTypes = {}));
-var BunyanCoreLogEventLevels;
-(function (BunyanCoreLogEventLevels) {
-    BunyanCoreLogEventLevels[BunyanCoreLogEventLevels["ERROR"] = 50] = "ERROR";
-    BunyanCoreLogEventLevels[BunyanCoreLogEventLevels["INFO"] = 30] = "INFO";
-})(BunyanCoreLogEventLevels || (BunyanCoreLogEventLevels = {}));
-function simpleBunyanLogEvent(eventType, eventLevel, invocationId, data) {
+var EventType;
+(function (EventType) {
+    EventType["HEADER"] = "header";
+    EventType["FOOTER"] = "footer";
+    EventType["LOG"] = "log";
+})(EventType || (EventType = {}));
+function simpleBunyanLogEvent(eventType, eventLevel, data) {
     function groupLogData(logData) {
         if (eventType === 'footer' || eventType === 'header') {
             return logData;
         }
         return {
-            '*': [serializeThrownObjects(logData)],
+            '*': [(0, console_1.starSerializer)(logData)],
             P: 3,
             lvl: eventLevel,
             ts: Date.now()
         };
     }
+    const invocationId = (0, api_1.getRuntime)().lambdaContext.awsRequestId;
     const logEvent = Object.assign({ name: 'node-runtime', id: invocationId, hostname: 'some-runtime-hostname', pid: process.pid, level: 30, msg: '', time: new Date().toISOString(), v: 0, type: eventType }, groupLogData(data));
     process.stdout.write(JSON.stringify(logEvent) + '\n');
 }
 function emitHeaderEvent(lambdaEvent) {
-    simpleBunyanLogEvent(BunyanCoreLogEventTypes.HEADER, BunyanCoreLogEventLevels.INFO, (0, api_1.getRuntime)().lambdaContext.awsRequestId, invocationHeaderLogs(lambdaEvent));
+    simpleBunyanLogEvent(EventType.HEADER, bunyan_1.levelFromName.info, invocationHeaderLogs(lambdaEvent));
 }
 function emitSuccessfulFooterEvent() {
-    simpleBunyanLogEvent(BunyanCoreLogEventTypes.FOOTER, BunyanCoreLogEventLevels.INFO, (0, api_1.getRuntime)().lambdaContext.awsRequestId, invocationFooterLogs(true));
+    simpleBunyanLogEvent(EventType.FOOTER, bunyan_1.levelFromName.info, invocationFooterLogs(true));
 }
 function emitFailedFooterEvent() {
-    simpleBunyanLogEvent(BunyanCoreLogEventTypes.FOOTER, BunyanCoreLogEventLevels.INFO, (0, api_1.getRuntime)().lambdaContext.awsRequestId, invocationFooterLogs(false));
+    simpleBunyanLogEvent(EventType.FOOTER, bunyan_1.levelFromName.info, invocationFooterLogs(false));
 }
 function emitErrorEvent(caughtObject) {
-    simpleBunyanLogEvent(BunyanCoreLogEventTypes.LOG, BunyanCoreLogEventLevels.ERROR, (0, api_1.getRuntime)().lambdaContext.awsRequestId, caughtObject);
+    simpleBunyanLogEvent(EventType.LOG, bunyan_1.levelFromName.error, caughtObject);
 }
 const wrappedFilename = __filename.replace(/\/[^/]+.js$/, (name) => '/bundled' + name);
 const realRequire = eval('require');
@@ -146,17 +94,17 @@ if (!bundledExports || bundledExports.length === 0) {
 }
 const adapter = (name) => {
     return async (lambdaEvent, lambdaContext) => {
-        var _a;
+        var _a, _b;
         const event = lambdaEvent.body;
-        const context = setupRequestContext(lambdaEvent._meta);
+        const context = (0, runtime_1.setupRequestContext)({ meta: lambdaEvent._meta, handler: lambdaEvent.handler });
         const runtime = {
             proxy: lambdaEvent._meta.proxy,
             contextAri: lambdaEvent._meta.contextAri,
-            allowedEgress: lambdaEvent._meta.fetchAllowList,
+            allowedEgress: (_a = lambdaEvent._meta.fetchAllowList) !== null && _a !== void 0 ? _a : [],
             lambdaContext: lambdaContext
         };
         global.__forge_runtime__ = runtime;
-        for (const { key, value } of (_a = lambdaEvent.variables) !== null && _a !== void 0 ? _a : []) {
+        for (const { key, value } of (_b = lambdaEvent.variables) !== null && _b !== void 0 ? _b : []) {
             process.env[key] = value;
         }
         try {
@@ -165,6 +113,7 @@ const adapter = (name) => {
             const result = await bundled[name](event, context);
             emitSuccessfulFooterEvent();
             return {
+                success: true,
                 body: result,
                 metrics: []
             };
@@ -173,11 +122,14 @@ const adapter = (name) => {
             emitErrorEvent(err);
             emitFailedFooterEvent();
             return {
-                errorMessage: err.message,
-                errorType: err.name,
-                isHostedCodeError: (0, api_1.isHostedCodeError)(err),
-                stack: (err.stack || '').split('\n'),
-                serviceKey: err.serviceKey,
+                success: false,
+                error: {
+                    errorMessage: err.message,
+                    errorType: err.name,
+                    isHostedCodeError: (0, api_1.isHostedCodeError)(err),
+                    stack: (err.stack || '').split('\n'),
+                    serviceKey: err.serviceKey
+                },
                 metrics: []
             };
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.4.0-next.2",
+  "version": "4.4.0-next.4",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -22,6 +22,7 @@
     "@forge/babel-plugin-transform-ui": "1.1.0",
     "@forge/cli-shared": "3.5.1",
     "@forge/lint": "3.2.14-next.0",
+    "@forge/runtime": "4.1.0-next.1",
     "@forge/util": "1.2.0",
     "assert": "^1.1.1",
     "babel-loader": "^8.2.3",