web: Active CodeWhisperer in Web Mode (#4444)

* browser: try activate codewhisperer on startup

This activates CW but there are still compilation errors.
We are trying to just get it to activate without throwing an error,
and this will be done in the following commits

Signed-off-by: nkomonen <[email protected]>

* browser: patch os.version()

This method does not exist in the browserfied version of
os, so we patch it with an arbitrary version

Signed-off-by: nkomonen <[email protected]>

---------

Signed-off-by: nkomonen <[email protected]>

Author: nkomonen-amazon

packages/toolkit/src/extension.ts

@@ -32,7 +32,6 @@ import { activate as activateEc2 } from './ec2/activation'
 import { activate as activateSam } from './shared/sam/activation'
 import { activate as activateS3 } from './s3/activation'
 import * as awsFiletypes from './shared/awsFiletypes'
-import { activate as activateCodeWhisperer, shutdown as codewhispererShutdown } from './codewhisperer/activation'
 import { activate as activateApiGateway } from './apigateway/activation'
 import { activate as activateStepFunctions } from './stepFunctions/activation'
 import { activate as activateSsmDocument } from './ssmDocument/activation'
@@ -133,8 +132,6 @@ export async function activate(context: vscode.ExtensionContext) {
             remoteInvokeOutputChannel: globals.invokeOutputChannel,
         })
 
-        await activateCodeWhisperer(extContext)
-
         await activateAppRunner(extContext)
 
         await activateApiGateway({
@@ -230,7 +227,6 @@ export async function activate(context: vscode.ExtensionContext) {
 
 export async function deactivate() {
     await deactivateShared()
-    await codewhispererShutdown()
     await globals.resourceManager.dispose()
 }
 

packages/toolkit/src/extensionShared.ts

@@ -18,6 +18,7 @@ import { documentationUrl, githubCreateIssueUrl, githubUrl } from './shared/cons
 import { getIdeProperties, aboutToolkit, isCloud9 } from './shared/extensionUtilities'
 import { telemetry } from './shared/telemetry/telemetry'
 import { openUrl } from './shared/utilities/vsCodeUtils'
+import { activate as activateCodeWhisperer, shutdown as codewhispererShutdown } from './codewhisperer/activation'
 
 import { activate as activateLogger } from './shared/logger/activation'
 import { initializeComputeRegion } from './shared/extensionUtilities'
@@ -134,13 +135,15 @@ export async function activateShared(
         credentialsStore: globals.loginManager.store,
     }
 
+    await activateCodeWhisperer(extContext)
+
     return extContext
 }
 
 /** Deactivation code that is shared between nodejs and browser implementations */
 export async function deactivateShared() {
     await globals.telemetry.shutdown()
-    // await codewhispererShutdown()
+    await codewhispererShutdown()
 }
 /**
  * Registers generic commands used by both browser and node versions of the toolkit.

packages/toolkit/src/extensionWeb.ts

@@ -8,6 +8,7 @@ import { setInBrowser } from './common/browserUtils'
 import { getLogger } from './shared/logger'
 import { activateShared, deactivateShared } from './extensionShared'
 import { RegionProvider, defaultRegion } from './shared/regions/regionProvider'
+import os from 'os'
 
 export async function activate(context: vscode.ExtensionContext) {
     setInBrowser(true) // THIS MUST ALWAYS BE FIRST
@@ -17,6 +18,8 @@ export async function activate(context: vscode.ExtensionContext) {
     )
 
     try {
+        patchOsVersion()
+
         // IMPORTANT: Any new activation code should be done in the function below unless
         // it is browser specific activation code.
         await activateShared(context, () => {
@@ -34,6 +37,14 @@ export async function activate(context: vscode.ExtensionContext) {
     }
 }
 
+/**
+ * The browserfied version of os does not have a `version()` method,
+ * so we patch it.
+ */
+function patchOsVersion() {
+    ;(os.version as any) = () => '1.0.0'
+}
+
 export async function deactivate() {
     await deactivateShared()
 }

packages/webpack.browser.config.js

@@ -47,6 +47,7 @@ const webConfig = {
             fs: false,
             crypto: require.resolve('crypto-browserify'),
             'fs-extra': false,
+            perf_hooks: false, // should be using globalThis.performance instead
 
             // *** If one of these modules actually gets used an error will be raised ***
             // You may see something like: "TypeError: path_ignored_0.join is not a function"