@forge/bundler 4.6.6 → 4.6.7-next.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @forge/bundler
 
+## 4.6.7-next.1
+
+### Patch Changes
+
+- 9610487: Simplify logs handling on Node runtime
+- Updated dependencies [9610487]
+  - @forge/runtime@4.3.3-next.0
+
+## 4.6.7-next.0
+
+### Patch Changes
+
+- @forge/cli-shared@3.11.1-next.0
+- @forge/lint@3.3.1-next.0
+
 ## 4.6.6
 
 ### Patch Changes

package/out/stubs/console.d.ts

@@ -1,6 +1,7 @@
-import { ConsoleMethod, LogHeader } from '@forge/runtime';
-export declare const starSerializer: (arg: any[]) => any;
-export declare function forgeConsole(consoleMethod: ConsoleMethod, header: LogHeader): (...rawData: any[]) => void;
+import { ConsoleMethod, P3LogEvent, LogHeader, LogFooter, HeadedLogLine } from '@forge/runtime';
+export declare function emitTunnelEvent(event: P3LogEvent): void;
+export declare function emitLogEvent(event: LogHeader | HeadedLogLine | LogFooter): void;
+export declare function forgeConsole(consoleMethod: ConsoleMethod, header: LogHeader): (...rawData: unknown[]) => void;
 export declare function replaceConsole(header: LogHeader): void;
 export declare function restoreConsole(): void;
 //# 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":"AAQA,OAAO,EAEL,aAAa,EAIb,SAAS,EAGV,MAAM,gBAAgB,CAAC;AA2CxB,eAAO,MAAM,cAAc,QAAS,GAAG,EAAE,KAAG,GAAoC,CAAC;AAoDjF,wBAAgB,YAAY,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,+BAW3E;AAMD,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,QAI/C;AAED,wBAAgB,cAAc,SAI7B"}
+{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../src/stubs/console.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,SAAS,EACT,SAAS,EAET,aAAa,EAEd,MAAM,gBAAgB,CAAC;AAQxB,wBAAgB,eAAe,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAEvD;AAOD,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,aAAa,GAAG,SAAS,GAAG,IAAI,CAE/E;AA6BD,wBAAgB,YAAY,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,mCAY3E;AAMD,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,QAI/C;AAED,wBAAgB,cAAc,SAI7B"}

package/out/stubs/console.js

@@ -1,86 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.restoreConsole = exports.replaceConsole = exports.forgeConsole = exports.starSerializer = void 0;
-const bunyan_1 = require("bunyan");
+exports.restoreConsole = exports.replaceConsole = exports.forgeConsole = exports.emitLogEvent = exports.emitTunnelEvent = void 0;
 const api_1 = require("@forge/api");
 const runtime_1 = require("@forge/runtime");
 const util_1 = require("util");
-function stringMessage(arg) {
-    if (typeof arg === 'string') {
-        return arg;
-    }
-    else if (arg instanceof Error) {
-        return arg.toString();
-    }
-    else {
-        return null;
-    }
-}
-function transformSandBoxLogMessage(arg) {
-    let msg = null;
-    if (Array.isArray(arg) && arg.length > 0) {
-        msg = stringMessage(arg[0]);
-        if (msg !== null) {
-            arg = arg.slice(1);
-        }
-    }
-    if (msg === null) {
-        msg = '';
-    }
-    return {
-        msg,
-        '*': arg
-    };
+function emitTunnelEvent(event) {
+    process.stdout.write(JSON.stringify(event) + '\n');
 }
-const starSerializer = (arg) => arg.map((val) => (0, util_1.format)(val));
-exports.starSerializer = starSerializer;
-function formatLogMessage(requestId, logEventData) {
-    const transformedMessage = transformSandBoxLogMessage(logEventData.logArguments);
-    return {
-        type: 'log',
-        id: requestId,
-        msg: transformedMessage.msg,
-        P: 3,
-        ts: Date.now(),
-        lvl: logEventData.logLevel,
-        '*': transformedMessage['*']
-    };
+exports.emitTunnelEvent = emitTunnelEvent;
+function emitLogEvent(event) {
+    process.stdout.write(JSON.stringify(event) + '\n');
 }
-const logger = (0, bunyan_1.createLogger)({
-    name: 'node-runtime',
-    level: bunyan_1.levelFromName.info,
-    serializers: { '*': exports.starSerializer }
-});
-function customConsole(logMethod, header) {
+exports.emitLogEvent = emitLogEvent;
+function customConsole(logLevel, header) {
     return (...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: awsRequestId,
-                logLevel: bunyan_1.levelFromName[logMethod],
-                logArguments: rawData
-            };
-            if (global.__forge_tunnel__) {
-                process.stdout.write(JSON.stringify(Object.assign(Object.assign({}, logEventData), { logArguments: (0, exports.starSerializer)(logEventData.logArguments) })) + '\n');
-            }
-            else {
-                const logLine = formatLogMessage(awsRequestId, logEventData);
-                const headedLogLine = Object.assign(Object.assign({}, header), logLine);
-                logger.info(headedLogLine, logLine.msg);
-            }
+        const msg = (0, util_1.format)((_a = rawData[0]) !== null && _a !== void 0 ? _a : '');
+        const rest = rawData.slice(1).map((val) => (0, util_1.format)(val));
+        const invocationId = (0, api_1.getRuntime)().lambdaContext.awsRequestId;
+        if (global.__forge_tunnel__) {
+            const logEventData = { invocationId, logLevel, logArguments: [msg, ...rest] };
+            emitTunnelEvent(logEventData);
+        }
+        else {
+            const logLine = Object.assign(Object.assign({}, header), { type: runtime_1.LogType.LOG, id: invocationId, P: 3, ts: Date.now(), lvl: logLevel, msg, '*': rest });
+            emitLogEvent(logLine);
         }
     };
 }
 function forgeConsole(consoleMethod, header) {
     switch (consoleMethod) {
         case 'debug':
+            return customConsole(runtime_1.LogLevel.DEBUG, header);
         case 'warn':
+            return customConsole(runtime_1.LogLevel.WARN, header);
         case 'error':
-            return customConsole(consoleMethod, header);
+            return customConsole(runtime_1.LogLevel.ERROR, header);
         default:
-            return customConsole('info', header);
+            return customConsole(runtime_1.LogLevel.INFO, header);
     }
 }
 exports.forgeConsole = forgeConsole;

package/out/stubs/log-events.d.ts

@@ -1,30 +1,8 @@
+import { ExternalRequestBody, LogHeader } from '@forge/runtime';
 export declare const AWS_EXECUTION_ENV_PREFIX = "AWS_Lambda_";
 export declare const RUNTIME_NAME_FALLBACK = "node";
 export declare function getRuntimeName(): string;
-declare enum EventType {
-    HEADER = "header",
-    FOOTER = "footer",
-    LOG = "log"
-}
-export declare function emitHeaderEvent(lambdaEvent: any): {
-    type: EventType;
-    id: string;
-    time: string;
-};
-export declare function emitSuccessfulFooterEvent(): {
-    type: EventType;
-    id: string;
-    time: string;
-};
-export declare function emitFailedFooterEvent(): {
-    type: EventType;
-    id: string;
-    time: string;
-};
-export declare function emitErrorEvent(caughtObject: any): {
-    type: EventType;
-    id: string;
-    time: string;
-};
-export {};
+export declare function emitHeaderEvent(lambdaEvent: ExternalRequestBody): LogHeader;
+export declare function emitSuccessfulFooterEvent(): void;
+export declare function emitFailedFooterEvent(): void;
 //# sourceMappingURL=log-events.d.ts.map

package/out/stubs/log-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log-events.d.ts","sourceRoot":"","sources":["../../src/stubs/log-events.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,wBAAwB,gBAAgB,CAAC;AACtD,eAAO,MAAM,qBAAqB,SAAS,CAAC;AAE5C,wBAAgB,cAAc,IAAI,MAAM,CAavC;AA4CD,aAAK,SAAS;IACZ,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,GAAG,QAAQ;CACZ;AA4CD,wBAAgB,eAAe,CAAC,WAAW,EAAE,GAAG;;;;EAE/C;AAED,wBAAgB,yBAAyB;;;;EAExC;AAED,wBAAgB,qBAAqB;;;;EAEpC;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,GAAG;;;;EAG/C"}
+{"version":3,"file":"log-events.d.ts","sourceRoot":"","sources":["../../src/stubs/log-events.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAa,SAAS,EAAW,MAAM,gBAAgB,CAAC;AAIpF,eAAO,MAAM,wBAAwB,gBAAgB,CAAC;AACtD,eAAO,MAAM,qBAAqB,SAAS,CAAC;AAE5C,wBAAgB,cAAc,IAAI,MAAM,CAavC;AAmDD,wBAAgB,eAAe,CAAC,WAAW,EAAE,mBAAmB,GAAG,SAAS,CAI3E;AAED,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD;AAED,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C"}

package/out/stubs/log-events.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.emitErrorEvent = exports.emitFailedFooterEvent = exports.emitSuccessfulFooterEvent = exports.emitHeaderEvent = exports.getRuntimeName = exports.RUNTIME_NAME_FALLBACK = exports.AWS_EXECUTION_ENV_PREFIX = void 0;
+exports.emitFailedFooterEvent = exports.emitSuccessfulFooterEvent = exports.emitHeaderEvent = exports.getRuntimeName = exports.RUNTIME_NAME_FALLBACK = exports.AWS_EXECUTION_ENV_PREFIX = void 0;
 const api_1 = require("@forge/api");
-const bunyan_1 = require("bunyan");
-const console_1 = require("./console");
 const runtime_1 = require("@forge/runtime");
+const console_1 = require("./console");
 exports.AWS_EXECUTION_ENV_PREFIX = 'AWS_Lambda_';
 exports.RUNTIME_NAME_FALLBACK = 'node';
 function getRuntimeName() {
@@ -22,6 +21,8 @@ function invocationHeaderLogs(lambdaEvent) {
     const { featureFlags, contextAri, appContext, tracing } = lambdaEvent === null || lambdaEvent === void 0 ? void 0 : lambdaEvent._meta;
     const { appId, environmentId, appVersion, functionKey, moduleKey, moduleType } = appContext !== null && appContext !== void 0 ? appContext : {};
     return {
+        id: (0, api_1.getRuntime)().lambdaContext.awsRequestId,
+        type: runtime_1.LogType.HEADER,
         appId,
         environmentId,
         appVersion,
@@ -36,6 +37,8 @@ function invocationHeaderLogs(lambdaEvent) {
 }
 function invocationFooterLogs(successfulInvocation) {
     return {
+        id: (0, api_1.getRuntime)().lambdaContext.awsRequestId,
+        type: runtime_1.LogType.FOOTER,
         success: successfulInvocation,
         logMetadata: {
             bytes: 0,
@@ -59,53 +62,17 @@ function invocationFooterLogs(successfulInvocation) {
         }
     };
 }
-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 {
-            '*': (0, console_1.starSerializer)([logData]),
-            P: 3,
-            lvl: eventLevel,
-            ts: Date.now()
-        };
-    }
-    const invocationId = (0, api_1.getRuntime)().lambdaContext.awsRequestId;
-    const logEvent = Object.assign({ type: eventType, id: invocationId, time: new Date().toISOString() }, groupLogData(data));
-    process.stdout.write(JSON.stringify(logEvent) + '\n');
-    return logEvent;
-}
-function logErrorToTunnelProcess(caughtObject) {
-    if (global.__forge_tunnel__) {
-        const logEventData = {
-            invocationId: (0, api_1.getRuntime)().lambdaContext.awsRequestId,
-            logLevel: runtime_1.LogLevel.ERROR,
-            logArguments: [caughtObject]
-        };
-        process.stdout.write(JSON.stringify(Object.assign(Object.assign({}, logEventData), { logArguments: (0, console_1.starSerializer)(logEventData.logArguments) })) + '\n');
-    }
-}
 function emitHeaderEvent(lambdaEvent) {
-    return simpleBunyanLogEvent(EventType.HEADER, bunyan_1.levelFromName.info, invocationHeaderLogs(lambdaEvent));
+    const event = invocationHeaderLogs(lambdaEvent);
+    (0, console_1.emitLogEvent)(event);
+    return event;
 }
 exports.emitHeaderEvent = emitHeaderEvent;
 function emitSuccessfulFooterEvent() {
-    return simpleBunyanLogEvent(EventType.FOOTER, bunyan_1.levelFromName.info, invocationFooterLogs(true));
+    (0, console_1.emitLogEvent)(invocationFooterLogs(true));
 }
 exports.emitSuccessfulFooterEvent = emitSuccessfulFooterEvent;
 function emitFailedFooterEvent() {
-    return simpleBunyanLogEvent(EventType.FOOTER, bunyan_1.levelFromName.info, invocationFooterLogs(false));
+    (0, console_1.emitLogEvent)(invocationFooterLogs(false));
 }
 exports.emitFailedFooterEvent = emitFailedFooterEvent;
-function emitErrorEvent(caughtObject) {
-    logErrorToTunnelProcess(caughtObject);
-    return simpleBunyanLogEvent(EventType.LOG, bunyan_1.levelFromName.error, caughtObject);
-}
-exports.emitErrorEvent = emitErrorEvent;

package/out/stubs/wrapper.js

@@ -55,7 +55,7 @@ const adapter = (name) => {
             };
         }
         catch (err) {
-            (0, log_events_1.emitErrorEvent)(err);
+            console.error(err);
             (0, log_events_1.emitFailedFooterEvent)();
             const errorName = (0, api_1.isForgePlatformError)(err) ? err.name : api_1.FUNCTION_ERR;
             return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.6.6",
+  "version": "4.6.7-next.1",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -20,15 +20,14 @@
     "@babel/preset-typescript": "^7.16.7",
     "@forge/api": "2.15.2",
     "@forge/babel-plugin-transform-ui": "1.1.2",
-    "@forge/cli-shared": "3.11.0",
-    "@forge/lint": "3.3.0",
-    "@forge/runtime": "4.3.2",
+    "@forge/cli-shared": "3.11.1-next.0",
+    "@forge/lint": "3.3.1-next.0",
+    "@forge/runtime": "4.3.3-next.0",
     "@forge/util": "1.2.3",
     "assert": "^1.1.1",
     "babel-loader": "^8.2.3",
     "browserify-zlib": "^0.2.0",
     "buffer": "^4.3.0",
-    "bunyan": "^1.8.15",
     "chalk": "^2.4.2",
     "console-browserify": "^1.1.0",
     "crypto-browserify": "^3.11.0",
@@ -56,7 +55,6 @@
   },
   "devDependencies": {
     "@atlassian/xen-test-util": "^1.1.1",
-    "@types/bunyan": "^1.8.8",
     "@types/jest": "^29.1.2",
     "@types/node": "14.18.42",
     "@types/react": "^17.0.53",