Remove NGrok. Configure Tunnel URL (#2461)

* Rido/ngrok removal (#1) * update fileMenu * add tunnelUrl * get serviceUrl from settings * showPort * rm ngrok settings * showPort * rm ngrokdebugger * rm ngroddebug from editor * rm ngrokService * rm nGrokTab * rm ngrok sagas, actions, styles * rm ngrok settings * upd version, and deps * get server port * update changelog * fix lint issues * PR feedback * Update packages/app/client/src/ui/editor/appSettingsEditor/appSettingsEditor.tsx Co-authored-by: Eugene <EOlonov@gmail.com> * Update tsconfig.json Co-authored-by: Eugene <EOlonov@gmail.com> * rm ngroc from tests --------- Co-authored-by: Eugene <EOlonov@gmail.com>
microsoft · Sep 16, 2024 · ffc00bd · ffc00bd
1 parent e554dc4
commit ffc00bd
Show file tree

Hide file tree

Showing 87 changed files with 107 additions and 4,742 deletions.
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-v10.14.2
+v16.13.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## v4.15.1 - 2024 - 09 - 12
+## Update Tunnels
+- [client/main] Remove NGrok dependency. Allow to paste the Tunnel URL in settings to enable remote bots. 
+
 ## v4.14.1 - 2021 - 11 - 12
 ## Added
 - [main] Bumped `electron` to v13.6.1 in PR [2318](https://github.com/microsoft/BotFramework-Emulator/pull/2318) (fixes electron bug caused by [Let's Encrypt root certificate expiration](https://github.com/electron/electron/issues/31212))

diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
   "overrides": {
     "minimist@<1.2.6": ">=1.2.6",
     "follow-redirects@<1.14.8": ">=1.14.8",
-    "serialize-javascript@<3.1.0": ">=3.1.0",
+    "serialize-javascript@<6.0.2": ">=6.0.2",
     "postcss@<7.0.36": ">=7.0.36",
     "trim-newlines@<3.0.1": ">=3.0.1",
     "parse-path@<5.0.0": ">=5.0.0",

diff --git a/packages/app/client/src/constants.ts b/packages/app/client/src/constants.ts
@@ -39,13 +39,11 @@ export const CONTENT_TYPE_APP_SETTINGS = 'application/vnd.microsoft.bfemulator.d
 export const CONTENT_TYPE_WELCOME_PAGE = 'application/vnd.microsoft.bfemulator.document.welcome';
 export const CONTENT_TYPE_TRANSCRIPT = 'application/vnd.microsoft.bfemulator.document.transcript';
 export const CONTENT_TYPE_LIVE_CHAT = SharedConstants.ContentTypes.CONTENT_TYPE_LIVE_CHAT;
-export const CONTENT_TYPE_NGROK_DEBUGGER = SharedConstants.ContentTypes.CONTENT_TYPE_NGROK_DEBUGGER;
 
 export const NAVBAR_BOT_EXPLORER = 'navbar.botExplorer';
 export const NAVBAR_SETTINGS = 'navbar.settings';
 export const NAVBAR_NOTIFICATIONS = 'navbar.notifications';
 export const NAVBAR_RESOURCES = 'navbar.resources';
-export const NAVBAR_NGROK_DEBUGGER = 'navbar.ngrokDebugger';
 
 export const EDITOR_KEY_PRIMARY = 'primary';
 export const EDITOR_KEY_SECONDARY = 'secondary';

diff --git a/packages/app/client/src/state/sagas/botSagas.ts b/packages/app/client/src/state/sagas/botSagas.ts
@@ -149,7 +149,6 @@ export class BotSagas {
       })
     );
 
-    // call emulator to report proper status to chat panel (listening / ngrok)
     res = yield ConversationService.sendInitialLogReport(serverUrl, conversationId, action.payload.endpoint);
     if (!res.ok) {
       yield* throwErrorFromResponse('Error occurred while sending the initial log report', res);

diff --git a/packages/app/client/src/state/sagas/frameworkSettingsSagas.spec.ts b/packages/app/client/src/state/sagas/frameworkSettingsSagas.spec.ts
@@ -120,14 +120,12 @@ describe('The frameworkSettingsSagas', () => {
       useCustomId: false,
       usePrereleases: false,
       userGUID: '',
-      ngrokPath: 'some/path/to/ngrok',
     };
     const updatedSettings: Partial<FrameworkSettings> = {
       autoUpdate: true,
       useCustomId: true,
       usePrereleases: false,
       userGUID: 'some-user-id',
-      ngrokPath: 'some/different/path/to/ngrok',
     };
     const gen = FrameworkSettingsSagas.saveFrameworkSettings(saveFrameworkSettingsAction(updatedSettings));
     // selector to get the active document from the state
@@ -147,7 +145,6 @@ describe('The frameworkSettingsSagas', () => {
           autoUpdate: true,
           useCustomId: true,
           userGUID: 'some-user-id',
-          ngrokPath: 'some/different/path/to/ngrok',
         }
       )
     );

diff --git a/packages/app/client/src/state/store.ts b/packages/app/client/src/state/store.ts
@@ -73,8 +73,6 @@ import {
   Settings,
   ThemeState,
   UpdateState,
-  ngrokTunnel,
-  NgrokTunnelState,
 } from '@bfemulator/app-shared';
 
 import { forwardToMain } from './middleware/forwardToMain';
@@ -98,7 +96,6 @@ export interface RootState {
   settings?: Settings;
   theme?: ThemeState;
   update?: UpdateState;
-  ngrokTunnel?: NgrokTunnelState;
 }
 
 const DEFAULT_STATE = {};
@@ -137,7 +134,6 @@ function initStore(): Store<RootState> {
       settings: settingsReducer,
       theme,
       update,
-      ngrokTunnel,
     }),
     DEFAULT_STATE,
     storeEnhancer

diff --git a/packages/app/client/src/ui/editor/appSettingsEditor/appSettingsEditor.spec.tsx b/packages/app/client/src/ui/editor/appSettingsEditor/appSettingsEditor.spec.tsx