@forge/runtime 5.6.1-next.0 → 5.6.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @forge/runtime
 
+## 5.6.1
+
+### Patch Changes
+
+- eb06eca: Break more dependencies between SDK and runtime
+- f8a4714: Use InMemoryMetrics from the Node monorepo
+- Updated dependencies [f8a4714]
+  - @forge/util@1.4.3
+
+## 5.6.1-next.1
+
+### Patch Changes
+
+- eb06eca: Break more dependencies between SDK and runtime
+
 ## 5.6.1-next.0
 
 ### Patch Changes

package/out/app-manifest.js

@@ -45,6 +45,14 @@ const AppManifestRequiredFields = t.type({
 });
 const AppManifestType = t.intersection([AppManifestRequiredFields, AppManifestOptionalFields]);
 class AppManifest {
+    static FILE_NAME = 'manifest.yml';
+    static async fromFile(filePath) {
+        const fullPath = path_1.default.join(filePath, AppManifest.FILE_NAME);
+        const manifestContents = (0, fs_1.readFileSync)(fullPath, 'utf-8');
+        const manifest = yaml_1.default.parse(manifestContents);
+        return new AppManifest(manifest);
+    }
+    manifest;
     constructor(manifest) {
         if (!AppManifestType.is(manifest)) {
             throw new Error('invalid manifest');
@@ -53,32 +61,23 @@ class AppManifest {
             this.manifest = manifest;
         }
     }
-    static async fromFile(filePath) {
-        const fullPath = path_1.default.join(filePath, AppManifest.FILE_NAME);
-        const manifestContents = (0, fs_1.readFileSync)(fullPath, 'utf-8');
-        const manifest = yaml_1.default.parse(manifestContents);
-        return new AppManifest(manifest);
-    }
     getHostForRemote(remote) {
-        var _a;
-        const found = (_a = this.manifest.remotes) === null || _a === void 0 ? void 0 : _a.find(({ key }) => key === remote);
-        return found === null || found === void 0 ? void 0 : found.baseUrl;
+        const found = this.manifest.remotes?.find(({ key }) => key === remote);
+        return found?.baseUrl;
     }
     getDefaultRemoteForProvider(provider) {
         const providerConfig = this.getExternalAuthProviderConfig(provider);
-        const remotes = providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.remotes;
+        const remotes = providerConfig?.remotes;
         if (remotes && remotes.length > 0) {
             return remotes[0];
         }
         return undefined;
     }
     getExternalAuthProviderConfig(provider) {
-        var _a;
-        return (_a = this.manifest.providers) === null || _a === void 0 ? void 0 : _a.auth.find((v) => v.key === provider);
+        return this.manifest.providers?.auth.find((v) => v.key === provider);
     }
     getEgressAllowlist() {
         return this.manifest.egress || [];
     }
 }
 exports.AppManifest = AppManifest;
-AppManifest.FILE_NAME = 'manifest.yml';

package/out/context.js

@@ -31,18 +31,21 @@ function createPrincipal(cfg) {
 }
 exports.createPrincipal = createPrincipal;
 function createLicenseContext(cfg) {
-    var _a;
     const { license } = cfg.meta;
     if (license) {
         return {
             license: {
-                isActive: (_a = license.isActive) !== null && _a !== void 0 ? _a : false
+                isActive: license.isActive ?? false
             }
         };
     }
 }
 exports.createLicenseContext = createLicenseContext;
 function setupRequestContext(cfg) {
-    return Object.assign(Object.assign({ principal: createPrincipal(cfg) }, createLicenseContext(cfg)), createInstallationContext(cfg));
+    return {
+        principal: createPrincipal(cfg),
+        ...createLicenseContext(cfg),
+        ...createInstallationContext(cfg)
+    };
 }
 exports.setupRequestContext = setupRequestContext;

package/out/feature-flag.js

@@ -10,12 +10,13 @@ exports.XEN_RUNTIME_ENABLE_NETWORK_LIMITS = 'xen-runtime-enable-network-limits';
 exports.XEN_RUNTIME_SHOULD_BLOCK_EXTERNAL_FETCH = 'xen-runtime-should-block-external-fetch';
 exports.XEN_RUNTIME_SHOULD_REPORT_METRICS = 'xen-runtime-should-report-metrics';
 class FeatureFlags {
-    constructor(flags) {
-        this.flags = flags;
-    }
+    flags;
     static fromRequestMetaData(metaData) {
         return new FeatureFlags(metaData.featureFlags || []);
     }
+    constructor(flags) {
+        this.flags = flags;
+    }
     isFeatureFlagEnabled(flag) {
         return this.flags.includes(flag);
     }

package/out/limits/tracker.js

@@ -6,9 +6,9 @@ exports.Limit = {
     FetchRequestLimit: 'forge-fetch-request-count'
 };
 class PerInvocationLimitsTracker {
+    limits = {};
+    limitCount = {};
     constructor(limits) {
-        this.limits = {};
-        this.limitCount = {};
         this.limits = limits || {};
     }
     incrementCount(limitKey, by = 1) {

package/out/metrics/metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/metrics/metrics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAa,MAAM,wCAAwC,CAAC;AAElF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAGtE,oBAAY,UAAU;IACpB,WAAW,UAAU;IACrB,aAAa,YAAY;IACzB,WAAW,UAAU;CACtB;AAED,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,IAAI,EAAE,IAAI,CAAC;CACZ;AAKD,qBAAa,gBAAgB;IACf,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,OAAO;IAEvC,OAAO,IAAI,OAAO;IAIlB,cAAc,IAAI,MAAM,EAAE;IAIjC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,MAAM,EAAE;IAuCrE,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,IAAI,CAAA;KAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;CASpH;AAED,eAAO,MAAM,sBAAsB,yBACX,qBAAqB,KAC1C;IAAE,SAAS,EAAE,gBAAgB,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CASjD,CAAC"}
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/metrics/metrics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAa,MAAM,wCAAwC,CAAC;AAElF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAGtE,oBAAY,UAAU;IACpB,WAAW,UAAU;IACrB,aAAa,YAAY;IACzB,WAAW,UAAU;CACtB;AAED,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,IAAI,EAAE,IAAI,CAAC;CACZ;AAYD,qBAAa,gBAAgB;IACf,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,OAAO;IAEvC,OAAO,IAAI,OAAO;IAIlB,cAAc,IAAI,MAAM,EAAE;IAIjC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,MAAM,EAAE;IAuCrE,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,IAAI,CAAA;KAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;CASpH;AAED,eAAO,MAAM,sBAAsB,yBACX,qBAAqB,KAC1C;IAAE,SAAS,EAAE,gBAAgB,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CASjD,CAAC"}

package/out/metrics/metrics.js

@@ -10,7 +10,11 @@ var MetricType;
     MetricType["CounterMetric"] = "counter";
     MetricType["GaugeMetric"] = "gauge";
 })(MetricType = exports.MetricType || (exports.MetricType = {}));
+function isInMemoryMetrics(metrics) {
+    return metrics.constructor.name === in_memory_metrics_1.InMemoryMetrics.name;
+}
 class MetricsCollector {
+    _metrics;
     constructor(_metrics) {
         this._metrics = _metrics;
     }
@@ -21,7 +25,7 @@ class MetricsCollector {
         return MetricsCollector.collect(this._metrics);
     }
     static collect(metrics, prefix = undefined) {
-        if (!(metrics instanceof in_memory_metrics_1.InMemoryMetrics)) {
+        if (!isInMemoryMetrics(metrics)) {
             return [];
         }
         const addPrefix = (p, value) => {

package/out/sandbox/inspector.js

@@ -62,37 +62,24 @@ function processArgForLogConsole(arg) {
     }
     const className = type === 'object' ? arg.constructor.name : undefined;
     const subtype = inspectorSubtypeEntries.find((a) => a[1](arg));
-    return Object.assign(Object.assign(Object.assign({ type }, (className ? { className } : undefined)), (subtype ? { subtype: subtype[0] } : undefined)), { value: arg, description: (0, util_1.inspect)(arg) });
+    return {
+        type,
+        ...(className ? { className } : undefined),
+        ...(subtype ? { subtype: subtype[0] } : undefined),
+        value: arg,
+        description: (0, util_1.inspect)(arg)
+    };
 }
 class ChromeInspector {
-    constructor() {
-        this.frontendMsgsForNewSandbox = [];
-        this.sendMessageToFrontend = (message) => {
-            const wss = this.wss;
-            if (!wss) {
-                return;
-            }
-            if (VERBOSE_LOG) {
-                log('Message to frontend:\n' + message);
-            }
-            wss.clients.forEach((ws) => ws.send(message));
-        };
-        this.stopSession = () => {
-            const wss = this.wss;
-            if (!wss) {
-                return;
-            }
-            if (CLOSE_CONNECTION_ON_SESSION_STOP) {
-                wss.clients.forEach((ws) => ws.close());
-            }
-            const callbacks = this.callbacks;
-            if (!callbacks) {
-                return;
-            }
-            this.callbacks = undefined;
-            callbacks.onSessionStop();
-        };
-    }
+    static DENY_CODE = 1011;
+    static DENY_REASON = 'Only one frontend is allowed';
+    static FORCE_RESET_FRONTEND_STATE_EVENTS = [
+        '{"method":"Runtime.executionContextsCleared"}',
+        '{"method":"Inspector.targetReloadedAfterCrash"}'
+    ];
+    wss;
+    callbacks;
+    frontendMsgsForNewSandbox = [];
     startServer(port = 0) {
         const wss = new ws_1.default.Server({ port });
         wss.on('connection', (ws) => {
@@ -203,6 +190,31 @@ class ChromeInspector {
             throw Error('Unable to find port for inspector server');
         }
     }
+    sendMessageToFrontend = (message) => {
+        const wss = this.wss;
+        if (!wss) {
+            return;
+        }
+        if (VERBOSE_LOG) {
+            log('Message to frontend:\n' + message);
+        }
+        wss.clients.forEach((ws) => ws.send(message));
+    };
+    stopSession = () => {
+        const wss = this.wss;
+        if (!wss) {
+            return;
+        }
+        if (CLOSE_CONNECTION_ON_SESSION_STOP) {
+            wss.clients.forEach((ws) => ws.close());
+        }
+        const callbacks = this.callbacks;
+        if (!callbacks) {
+            return;
+        }
+        this.callbacks = undefined;
+        callbacks.onSessionStop();
+    };
     forceResetFrontendState() {
         for (const evt of ChromeInspector.FORCE_RESET_FRONTEND_STATE_EVENTS) {
             this.sendMessageToFrontend(evt);
@@ -231,12 +243,6 @@ class ChromeInspector {
     }
 }
 exports.ChromeInspector = ChromeInspector;
-ChromeInspector.DENY_CODE = 1011;
-ChromeInspector.DENY_REASON = 'Only one frontend is allowed';
-ChromeInspector.FORCE_RESET_FRONTEND_STATE_EVENTS = [
-    '{"method":"Runtime.executionContextsCleared"}',
-    '{"method":"Inspector.targetReloadedAfterCrash"}'
-];
 exports.notImplementedInspector = {
     startServer: () => {
         throw new Error('Not implemented');

package/out/sandbox/invocation-request.js

@@ -6,10 +6,13 @@ const feature_flag_1 = require("../feature-flag");
 const ari_1 = require("@forge/util/packages/ari");
 const __1 = require("..");
 class XenInvocationRequestImpl {
+    request;
+    invocationId;
+    featureFlags;
+    serviceTokens = [];
     constructor(request, invocationId) {
         this.request = request;
         this.invocationId = invocationId;
-        this.serviceTokens = [];
         this.serviceTokens = this.buildServiceTokens(request._meta.tokens);
     }
     buildServiceTokens(tokens) {
@@ -77,11 +80,10 @@ class XenInvocationRequestImpl {
         return this.request._meta.appToken;
     }
     getProxy() {
-        var _a;
         if (!this.isFeatureFlagEnabled(feature_flag_1.XEN_RUNTIME_ENABLE_EGRESS_PROXY)) {
             return undefined;
         }
-        return (_a = this.request._meta) === null || _a === void 0 ? void 0 : _a.proxy;
+        return this.request._meta?.proxy;
     }
     getAllTokens() {
         return this.serviceTokens;
@@ -115,12 +117,9 @@ function xenInvocationRequestFactory(invocation) {
 }
 exports.xenInvocationRequestFactory = xenInvocationRequestFactory;
 class InvocationRequest {
-    constructor(sandboxConfig, xenInvocationRequest, manifest) {
-        this.sandboxConfig = sandboxConfig;
-        this.xenInvocationRequest = xenInvocationRequest;
-        this.manifest = manifest;
-        this.thirdPartyAuthTokenReferences = this.getThirdPartyTokenReferences();
-    }
+    sandboxConfig;
+    xenInvocationRequest;
+    manifest;
     static async setup(sandboxConfig, xenInvocationRequest) {
         const manifest = await app_manifest_1.AppManifest.fromFile(sandboxConfig.appPath);
         return this.setupSync(sandboxConfig, xenInvocationRequest, manifest);
@@ -128,6 +127,13 @@ class InvocationRequest {
     static setupSync(sandboxConfig, xenInvocationRequest, manifest) {
         return new InvocationRequest(sandboxConfig, xenInvocationRequest, manifest);
     }
+    thirdPartyAuthTokenReferences;
+    constructor(sandboxConfig, xenInvocationRequest, manifest) {
+        this.sandboxConfig = sandboxConfig;
+        this.xenInvocationRequest = xenInvocationRequest;
+        this.manifest = manifest;
+        this.thirdPartyAuthTokenReferences = this.getThirdPartyTokenReferences();
+    }
     getAppAri() {
         return this.manifest.manifest.app.id;
     }
@@ -225,16 +231,16 @@ class InvocationRequest {
         return serviceTokens ? serviceTokens[0] : undefined;
     }
     getAtlassianServiceToken() {
-        var _a;
         const atlassianTokens = this.getAllTokens(this.getAtlassianTokenServiceKey());
-        return (_a = this.pickTokenToUse(atlassianTokens)) === null || _a === void 0 ? void 0 : _a.token;
+        return this.pickTokenToUse(atlassianTokens)?.token;
     }
     getAppTokenKey() {
         return '__atlassian-app-token';
     }
     getThirdPartyTokenReferenceList(serviceKey) {
-        var _a;
-        return (((_a = this.thirdPartyAuthTokenReferences) === null || _a === void 0 ? void 0 : _a.filter((ref) => ref.serviceKey === serviceKey).map((service) => service.reference)) || []);
+        return (this.thirdPartyAuthTokenReferences
+            ?.filter((ref) => ref.serviceKey === serviceKey)
+            .map((service) => service.reference) || []);
     }
     getThirdPartyTokenReferences() {
         return this.getThirdPartyTokens().map(({ service, token }, index) => {
@@ -250,8 +256,7 @@ class InvocationRequest {
         return this.getAllTokens().filter(({ service }) => service !== this.getAtlassianTokenServiceKey());
     }
     getThirdPartyToken(serviceKey) {
-        var _a, _b;
-        return (_b = (_a = this.thirdPartyAuthTokenReferences) === null || _a === void 0 ? void 0 : _a.find((ref) => ref.reference === serviceKey || ref.serviceKey === serviceKey)) === null || _b === void 0 ? void 0 : _b.token;
+        return this.thirdPartyAuthTokenReferences?.find((ref) => ref.reference === serviceKey || ref.serviceKey === serviceKey)?.token;
     }
     getAppVersion() {
         return this.xenInvocationRequest.getAppVersion();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/runtime",
-  "version": "5.6.1-next.0",
+  "version": "5.6.1",
   "description": "A Node.js runtime for Atlassian app functions",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -26,7 +26,7 @@
     "typescript": "4.8.4"
   },
   "dependencies": {
-    "@forge/util": "1.4.3-next.0",
+    "@forge/util": "1.4.3",
     "fp-ts": "^2.16.2",
     "io-ts": "^2.2.21",
     "io-ts-reporters": "^2.0.1",