update sentry, init sentry before noNVC

Author: mloginov

app/codio-sentry.js

@@ -0,0 +1,18 @@
+export const init = () => {
+    const prodRe = /https:\/\/.+\.codio\.io$/;
+    const prodUkRe = /https:\/\/.+\.codio-box\.uk$/;
+    const isProd = prodRe.test(location.origin) || prodUkRe.test(location.origin);
+
+    window.Sentry?.init({
+        // No need to configure DSN here, it is already configured in the loader script
+        // You can add any additional configuration here
+        dsn: "https://d08e273c89d12afcde41b3ec30d37ace@o108517.ingest.us.sentry.io/4505750448439296",
+        release: 'TAG_VERSION',
+        environment: isProd ? 'production' : 'development',
+        ignoreErrors: [
+            'ResizeObserver loop completed with undelivered notifications' // https://bugzilla.mozilla.org/show_bug.cgi?id=1685038
+        ]
+    });
+};
+
+

core/input/keyboard.js

@@ -85,6 +85,7 @@ export default class Keyboard {
     }
 
     _handleKeyDown(e) {
+        Log.Debug("_handleKeyDown", e, this._target);
         const code = this._getKeyCode(e);
         let keysym = KeyboardUtil.getKeysym(e);
         let numlock = e.getModifierState('NumLock');
@@ -268,19 +269,19 @@ export default class Keyboard {
     // ===== PUBLIC METHODS =====
 
     grab() {
-        //Log.Debug(">> Keyboard.grab");
+        Log.Debug(">> Keyboard.grab", this._target);
 
         this._target.addEventListener('keydown', this._eventHandlers.keydown);
         this._target.addEventListener('keyup', this._eventHandlers.keyup);
 
         // Release (key up) if window loses focus
         window.addEventListener('blur', this._eventHandlers.blur);
 
-        //Log.Debug("<< Keyboard.grab");
+        Log.Debug("<< Keyboard.grab");
     }
 
     ungrab() {
-        //Log.Debug(">> Keyboard.ungrab");
+        Log.Debug(">> Keyboard.ungrab", this._target);
 
         this._target.removeEventListener('keydown', this._eventHandlers.keydown);
         this._target.removeEventListener('keyup', this._eventHandlers.keyup);
@@ -289,6 +290,6 @@ export default class Keyboard {
         // Release (key up) all keys that are in a down state
         this._allKeysUp();
 
-        //Log.Debug(">> Keyboard.ungrab");
+        Log.Debug(">> Keyboard.ungrab");
     }
 }

uploadToS3.sh

@@ -10,7 +10,7 @@ replaceHtmlUrls () {
 }
 
 replaceTagVersion () {
-  sed -i "s/TAG_VERSION/${tag}/" "./vnc.html"
+  sed -i "s/TAG_VERSION/${tag}/" "./app/codio-sentry.js"
 }
 
 replaceJsUrls () {

vnc.html

@@ -46,37 +46,25 @@
     <link rel="preload" as="image" href="app/images/error.svg">
     <link rel="preload" as="image" href="app/images/warning.svg">
     <script
-      src="https://js.sentry-cdn.com/d08e273c89d12afcde41b3ec30d37ace.min.js"
-      crossorigin="anonymous"
+        src="https://browser.sentry-cdn.com/10.53.1/bundle.min.js"
+        integrity="sha384-jbb7+utXq5l+9udWjHUovKZyfWANLtC8QnVwrXU9YoCcldAlU6XJFdTHWdn2wFjk"
+        crossorigin="anonymous"
     ></script>
-    <script>
-        const prodRe = /https:\/\/.+\.codio\.io$/
-        const prodUkRe = /https:\/\/.+\.codio-box\.uk$/
-        const isProd = prodRe.test(location.origin) || prodUkRe.test(location.origin)
-        Sentry.onLoad(function() {
-            Sentry.init({
-                // No need to configure DSN here, it is already configured in the loader script
-                // You can add any additional configuration here
-                release: 'TAG_VERSION',
-                environment: isProd ? 'production' : 'development',
-                ignoreErrors: [
-                    'ResizeObserver loop completed with undelivered notifications' // https://bugzilla.mozilla.org/show_bug.cgi?id=1685038
-                ]
-            });
-        });
-    </script>
     <script type="module" crossorigin="anonymous" src="app/error-handler.js"></script>
 
     <script type="module">
         import UI from "./app/ui.js";
         import * as Log from './core/util/logging.js';
         import * as CodioUtils from './app/codio-utils.js';
+        import * as CodioSentry from './app/codio-sentry.js';
 
         let response;
 
         let defaults = {};
         let mandatory = {};
 
+        CodioSentry.init()
+
         // Default settings will be loaded from defaults.json. Mandatory
         // settings will be loaded from mandatory.json, which the user
         // cannot change.