@forge/tunnel 0.0.0-experimental-c3d0263 → 0.0.0-experimental-869511d

package/CHANGELOG.md

@@ -1,6 +1,179 @@
 # @forge/tunnel
 
-## 0.0.0-experimental-c3d0263
+## 0.0.0-experimental-869511d
+
+### Minor Changes
+
+- f33aada: Fix vulnerability dependencies
+
+### Patch Changes
+
+- Updated dependencies [f33aada]
+- Updated dependencies [726ef79]
+  - @forge/cli-shared@0.0.0-experimental-869511d
+  - @forge/bundler@0.0.0-experimental-869511d
+  - @forge/runtime@0.0.0-experimental-869511d
+
+## 1.7.0-next.7
+
+### Patch Changes
+
+- @forge/cli-shared@2.4.0-next.7
+- @forge/bundler@3.0.3-next.7
+
+## 1.7.0-next.6
+
+### Patch Changes
+
+- @forge/cli-shared@2.4.0-next.6
+- @forge/bundler@3.0.3-next.6
+
+## 1.7.0-next.5
+
+### Patch Changes
+
+- @forge/cli-shared@2.4.0-next.5
+- @forge/bundler@3.0.3-next.5
+
+## 1.7.0-next.4
+
+### Patch Changes
+
+- @forge/cli-shared@2.4.0-next.4
+- @forge/bundler@3.0.3-next.4
+
+## 1.7.0-next.3
+
+### Minor Changes
+
+- f33aada8: Fix vulnerability dependencies
+
+### Patch Changes
+
+- Updated dependencies [f33aada8]
+- Updated dependencies [726ef79d]
+  - @forge/cli-shared@2.4.0-next.3
+  - @forge/bundler@3.0.3-next.3
+
+## 1.6.2-next.2
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.2-next.2
+- @forge/bundler@3.0.3-next.2
+
+## 1.6.2-next.1
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.2-next.1
+- @forge/bundler@3.0.3-next.1
+
+## 1.6.2-next.0
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.2-next.0
+- @forge/bundler@3.0.3-next.0
+
+## 1.6.1
+
+### Patch Changes
+
+- Updated dependencies [04cddca]
+- Updated dependencies [b820659]
+- Updated dependencies [0a1513e]
+  - @forge/bundler@3.0.2
+  - @forge/runtime@1.16.0
+  - @forge/cli-shared@2.3.1
+
+## 1.6.1-next.11
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.1-next.9
+- @forge/bundler@3.0.2-next.10
+
+## 1.6.1-next.10
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.1-next.8
+- @forge/bundler@3.0.2-next.9
+
+## 1.6.1-next.9
+
+### Patch Changes
+
+- Updated dependencies [0a1513e6]
+  - @forge/runtime@1.16.0-next.1
+  - @forge/cli-shared@2.3.1-next.7
+  - @forge/bundler@3.0.2-next.8
+
+## 1.6.1-next.8
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.1-next.6
+- @forge/bundler@3.0.2-next.7
+
+## 1.6.1-next.7
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.1-next.5
+- @forge/bundler@3.0.2-next.6
+
+## 1.6.1-next.6
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.1-next.4
+- @forge/bundler@3.0.2-next.5
+
+## 1.6.1-next.5
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.1-next.3
+- @forge/bundler@3.0.2-next.4
+
+## 1.6.1-next.4
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.1-next.2
+- @forge/bundler@3.0.2-next.3
+
+## 1.6.1-next.3
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.1-next.1
+- @forge/bundler@3.0.2-next.2
+
+## 1.6.1-next.2
+
+### Patch Changes
+
+- Updated dependencies [b820659]
+  - @forge/runtime@1.16.0-next.0
+
+## 1.6.1-next.1
+
+### Patch Changes
+
+- Updated dependencies [04cddcaa]
+  - @forge/bundler@3.0.2-next.1
+
+## 1.6.1-next.0
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.1-next.0
+- @forge/bundler@3.0.2-next.0
+
+## 1.6.0
 
 ### Minor Changes
 
@@ -8,16 +181,57 @@
 
 ### Patch Changes
 
+- 68c1a7f: Fix for observability
 - ca79652: Improve observability
+- Updated dependencies [b673009]
 - Updated dependencies [cee5eea1]
+- Updated dependencies [47a71a6]
 - Updated dependencies [e95919f]
 - Updated dependencies [56164fe]
 - Updated dependencies [949bd40]
+- Updated dependencies [cf2420d]
 - Updated dependencies [ca79652]
-  - @forge/runtime@0.0.0-experimental-c3d0263
-  - @forge/csp@0.0.0-experimental-c3d0263
-  - @forge/cli-shared@0.0.0-experimental-c3d0263
-  - @forge/bundler@0.0.0-experimental-c3d0263
+  - @forge/runtime@1.15.0
+  - @forge/cli-shared@2.3.0
+  - @forge/csp@1.10.0
+  - @forge/bundler@3.0.1
+
+## 1.6.0-next.14
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.0-next.11
+- @forge/bundler@3.0.1-next.12
+
+## 1.6.0-next.13
+
+### Patch Changes
+
+- 68c1a7f3: Fix for observability
+
+## 1.6.0-next.12
+
+### Patch Changes
+
+- Updated dependencies [47a71a62]
+  - @forge/cli-shared@2.3.0-next.10
+  - @forge/runtime@1.15.0-next.4
+  - @forge/bundler@3.0.1-next.11
+
+## 1.6.0-next.11
+
+### Patch Changes
+
+- Updated dependencies [cf2420d2]
+  - @forge/cli-shared@2.3.0-next.9
+  - @forge/bundler@3.0.1-next.10
+
+## 1.6.0-next.10
+
+### Patch Changes
+
+- Updated dependencies [b6730093]
+  - @forge/runtime@1.15.0-next.3
 
 ## 1.6.0-next.9
 

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

@@ -49,7 +49,7 @@ class LocalFunctionHost {
             bundleFileSourceMapPath: path_1.resolve(directory, `${bundleName}.js.map`),
             bundleFileSourceMap: bundledCode.sourceMap ? bundledCode.sourceMap[bundleName] : undefined
         }));
-        const manifestFilePath = path_1.resolve(directory, cli_shared_1.manifestFilename);
+        const manifestFilePath = path_1.resolve(directory, cli_shared_1.manifestFileName);
         const manifestContents = JSON.stringify(await this.configFile.readConfig());
         const allPromises = [];
         bundles.forEach((bundle) => allPromises.push(this.generateBundleFiles(bundle, isSnapshotEnabled)));

package/out/tunnelling/services/local-invocation-service.d.ts

@@ -7,5 +7,9 @@ export declare class LocalInvocationService implements InvocationService {
     private readonly inspector;
     constructor(configFile: ConfigFile, logger: Logger, inspector: Inspector);
     invoke(handler: string, request: ExternalRequestBody): Promise<any>;
+    static INTERNAL_METRICS: string[];
+    static printMetrics: (shouldReportMetrics: boolean, metrics: {
+        [key: string]: any;
+    }[] | undefined, logger: Logger) => void;
 }
 //# sourceMappingURL=local-invocation-service.d.ts.map

package/out/tunnelling/services/local-invocation-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-invocation-service.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/services/local-invocation-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EACL,mBAAmB,EACnB,SAAS,EAIV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,EAAyB,MAAM,mBAAmB,CAAC;AAG9E,qBAAa,sBAAuB,YAAW,iBAAiB;IAE5D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS;IAG1B,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC;CAsDjF"}
+{"version":3,"file":"local-invocation-service.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/services/local-invocation-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EACL,mBAAmB,EACnB,SAAS,EAIV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,EAAyB,MAAM,mBAAmB,CAAC;AAI9E,qBAAa,sBAAuB,YAAW,iBAAiB;IAE5D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS;IAG1B,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC;IAqDhF,MAAM,CAAC,gBAAgB,WAA6D;IAEpF,MAAM,CAAC,YAAY,wBACI,OAAO;;6BAEpB,MAAM,KACb,IAAI,CAUL;CACH"}

package/out/tunnelling/services/local-invocation-service.js

@@ -51,10 +51,14 @@ class LocalInvocationService {
             inspector: inspect ? this.inspector : undefined
         });
         const reportMetrics = xenInvocationRequest.isFeatureFlagEnabled(feature_flag_1.XEN_RUNTIME_SHOULD_REPORT_METRICS);
-        if (reportMetrics && metrics) {
-            this.logger.debug(`Metrics: ${JSON.stringify(metrics, null, 2)}`);
-        }
+        LocalInvocationService.printMetrics(reportMetrics, metrics, this.logger);
         return reportMetrics ? { body, metrics } : body;
     }
 }
 exports.LocalInvocationService = LocalInvocationService;
+LocalInvocationService.INTERNAL_METRICS = ['execute.setup-request-context', 'invoke.setup-isolate'];
+LocalInvocationService.printMetrics = (shouldReportMetrics, metrics, logger) => {
+    if (shouldReportMetrics && (metrics === null || metrics === void 0 ? void 0 : metrics.length)) {
+        logger.debug(`Metrics: ${JSON.stringify(metrics.filter((m) => !LocalInvocationService.INTERNAL_METRICS.includes(m.name)), null, 2)}`);
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/tunnel",
-  "version": "0.0.0-experimental-c3d0263",
+  "version": "0.0.0-experimental-869511d",
   "description": "Tunnel functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -16,11 +16,11 @@
     "postbuild": "chmod +x out/*.js"
   },
   "dependencies": {
-    "@forge/bundler": "0.0.0-experimental-c3d0263",
-    "@forge/cli-shared": "0.0.0-experimental-c3d0263",
-    "@forge/csp": "^0.0.0-experimental-c3d0263",
+    "@forge/bundler": "0.0.0-experimental-869511d",
+    "@forge/cli-shared": "0.0.0-experimental-869511d",
+    "@forge/csp": "^1.10.0",
     "@forge/isolated-vm": "3.3.10",
-    "@forge/runtime": "0.0.0-experimental-c3d0263",
+    "@forge/runtime": "0.0.0-experimental-869511d",
     "express": "^4.17.1",
     "express-mung": "^0.5.1",
     "http-proxy-middleware": "^1.0.6",
@@ -31,7 +31,7 @@
     "uuid": "^3.4.0"
   },
   "devDependencies": {
-    "@forge/manifest": "^0.0.0-experimental-c3d0263",
+    "@forge/manifest": "^0.0.0-experimental-869511d",
     "@types/express": "^4.17.2",
     "@types/express-mung": "^0.5.2",
     "@types/jest": "^26.0.0",
@@ -44,6 +44,6 @@
     "supertest": "^6.1.3"
   },
   "optionalDependencies": {
-    "keytar": "^5.0.0"
+    "keytar": "^7.0.0"
   }
 }