@forge/tunnel 4.0.5-next.2 → 4.0.5-next.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @forge/tunnel
 
+## 4.0.5-next.4
+
+### Patch Changes
+
+- @forge/bundler@4.15.5-next.4
+
+## 4.0.5-next.3
+
+### Patch Changes
+
+- Updated dependencies [734b9b8]
+  - @forge/cli-shared@3.24.0-next.3
+  - @forge/bundler@4.15.5-next.3
+
 ## 4.0.5-next.2
 
 ### Patch Changes

package/out/services/create-tunnel-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-tunnel-service.d.ts","sourceRoot":"","sources":["../../src/services/create-tunnel-service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAGjD,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAClH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAQD,qBAAa,wBAAyB,YAAW,mBAAmB;IAGtD,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,QAAQ,CAAqB;gBAER,MAAM,EAAE,MAAM;IAE9B,eAAe,CAAC,EAC3B,IAAI,EACJ,gBAAgB,EACjB,EAAE;QACD,IAAI,EAAE,MAAM,CAAC;QACb,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;KACtC,GAAG,OAAO,CAAC,GAAG,CAAC;IAwBH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAkB1C"}
+{"version":3,"file":"create-tunnel-service.d.ts","sourceRoot":"","sources":["../../src/services/create-tunnel-service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAGjD,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAClH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAQD,qBAAa,wBAAyB,YAAW,mBAAmB;IAGtD,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,QAAQ,CAAqB;gBAER,MAAM,EAAE,MAAM;IAE9B,eAAe,CAAC,EAC3B,IAAI,EACJ,gBAAgB,EACjB,EAAE;QACD,IAAI,EAAE,MAAM,CAAC;QACb,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;KACtC,GAAG,OAAO,CAAC,GAAG,CAAC;IAsCH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAkB1C"}

package/out/services/create-tunnel-service.js

@@ -7,8 +7,8 @@ const url_1 = require("url");
 const cli_shared_1 = require("@forge/cli-shared");
 const path_1 = tslib_1.__importDefault(require("path"));
 class NgrokError extends Error {
-    constructor() {
-        super(cli_shared_1.Text.tunnel.error.ngrok);
+    constructor(message) {
+        super(cli_shared_1.Text.tunnel.error.ngrok(message));
     }
 }
 class NgrokCreateTunnelService {
@@ -17,6 +17,7 @@ class NgrokCreateTunnelService {
     }
     async establishTunnel({ port, tunnelConfigPath }) {
         const defaultConfigPath = path_1.default.join(__dirname, '..', '..', 'config', 'ngrok.yml');
+        let ngrokErrorMessage = undefined;
         try {
             const options = {
                 addr: port,
@@ -25,7 +26,15 @@ class NgrokCreateTunnelService {
                     this.logger.debug(cli_shared_1.Text.tunnel.tunnelStatusChange(status));
                 },
                 onLogEvent: (data) => {
-                    this.logger.debug(`${data}`);
+                    const errorMatch = /err=(".+")$/m.exec(data);
+                    if (errorMatch && !data.includes('obj=updater')) {
+                        ngrokErrorMessage = errorMatch[1];
+                        try {
+                            ngrokErrorMessage = JSON.parse(ngrokErrorMessage);
+                        }
+                        catch (_a) { }
+                    }
+                    this.logger.debug(data);
                 }
             };
             this.endpoint = await ngrok.connect(options);
@@ -33,10 +42,7 @@ class NgrokCreateTunnelService {
             return new url_1.URL(this.endpoint);
         }
         catch (e) {
-            if (e instanceof Error) {
-                this.logger.debug(e.message);
-            }
-            throw new NgrokError();
+            throw new NgrokError(ngrokErrorMessage);
         }
     }
     async closeTunnel() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/tunnel",
-  "version": "4.0.5-next.2",
+  "version": "4.0.5-next.4",
   "description": "Tunnel functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -11,8 +11,8 @@
     "compile": "tsc -b -v"
   },
   "dependencies": {
-    "@forge/bundler": "4.15.5-next.2",
-    "@forge/cli-shared": "3.24.0-next.2",
+    "@forge/bundler": "4.15.5-next.4",
+    "@forge/cli-shared": "3.24.0-next.3",
     "@forge/csp": "3.1.6",
     "@forge/runtime": "5.4.1",
     "express": "^4.18.2",