Detect whether the Debug Extension was built for dev or release

dwds/debug_extension_mv3/tool/update_dev_files.dart

@@ -9,7 +9,7 @@ void main() async {
   await _updateManifestJson();
 }
 
-/// Adds the Googler extension key.
+/// Adds the Googler extension key, and prefixes the extension name with "DEV".
 Future<void> _updateManifestJson() async {
   final manifestJson = File('compiled/manifest.json');
   final extensionKeyTxt = File('extension_key.txt');
@@ -19,7 +19,11 @@ Future<void> _updateManifestJson() async {
   return _transformDevFile(manifestJson, (line) {
     if (_matchesKey(line: line, key: 'name')) {
       return [
-        line,
+        _newKeyValue(
+          oldLine: line,
+          newKey: 'name',
+          newValue: '[DEV] MV3 Dart Debug Extension',
+        ),
         if (extensionKey != null)
           _newKeyValue(
             oldLine: line,

dwds/debug_extension_mv3/web/background.dart

@@ -18,6 +18,7 @@ import 'lifeline_ports.dart';
 import 'logger.dart';
 import 'messaging.dart';
 import 'storage.dart';
+import 'utils.dart';
 import 'web_api.dart';
 
 const _authSuccessResponse = 'Dart Debug Authentication Success!';
@@ -69,7 +70,10 @@ Future<bool> _authenticateUser(String extensionUrl, int tabId) async {
   final response = await fetchRequest(authUrl);
   final responseBody = response.body ?? '';
   if (!responseBody.contains(_authSuccessResponse)) {
-    debugWarn('Not authenticated: ${response.status} / $responseBody');
+    debugError(
+      'Not authenticated: ${response.status} / $responseBody',
+      devOnly: false,
+    );
     _showWarningNotification('Please re-authenticate and try again.');
     await _createTab(authUrl, inNewWindow: false);
     return false;
@@ -128,7 +132,8 @@ void _setDebuggableIcon() {
 }
 
 void _setDefaultIcon() {
-  chrome.action.setIcon(IconInfo(path: 'dart_grey.png'), /*callback*/ null);
+  final iconPath = isDevMode() ? 'dart_dev.png' : 'dart_grey.png';
+  chrome.action.setIcon(IconInfo(path: iconPath), /*callback*/ null);
 }
 
 Future<DebugInfo?> _fetchDebugInfo(int tabId) {

dwds/debug_extension_mv3/web/chrome_api.dart

@@ -75,6 +75,8 @@ class Runtime {
   external void sendMessage(
       String? id, Object? message, Object? options, Function? callback);
 
+  external Object getManifest();
+
   external ConnectionHandler get onConnect;
 
   external OnMessageHandler get onMessage;

dwds/debug_extension_mv3/web/detector.dart

@@ -24,7 +24,7 @@ void _registerListeners() {
 void _onDartAppReadyEvent(Event event) {
   final debugInfo = getProperty(event, 'detail') as String?;
   if (debugInfo == null) {
-    debugWarn('Can\'t debug Dart app without debug info.');
+    debugError('Can\'t debug Dart app without debug info.', devOnly: false);
     return;
   }
   _sendMessageToBackgroundScript(

dwds/debug_extension_mv3/web/logger.dart

@@ -7,41 +7,71 @@ library logger;
 
 import 'package:js/js.dart';
 
-import 'web_api.dart';
-
-// Switch to true for debug logging.
-bool _enableDebugLogging = true;
+import 'utils.dart';
 
 enum _LogLevel {
   info,
   warn,
   error,
 }
 
-debugLog(String msg, {String? prefix}) {
+debugLog(
+  String msg, {
+  String? prefix,
+  bool devOnly = true,
+}) {
   _log(msg, prefix: prefix);
 }
 
-debugWarn(String msg, {String? prefix}) {
+debugWarn(
+  String msg, {
+  String? prefix,
+  bool devOnly = true,
+}) {
   _log(msg, prefix: prefix, level: _LogLevel.warn);
 }
 
-debugError(String msg, {String? prefix}) {
+debugError(
+  String msg, {
+  String? prefix,
+  bool devOnly = true,
+}) {
   _log(msg, prefix: prefix, level: _LogLevel.error);
 }
 
-void _log(String msg, {_LogLevel? level, String? prefix}) {
-  if (!_enableDebugLogging) return;
+void _log(
+  String msg, {
+  bool devOnly = true,
+  _LogLevel? level,
+  String? prefix,
+}) {
+  if (devOnly && !isDevMode()) return;
   final logMsg = prefix != null ? '[$prefix] $msg' : msg;
   final logLevel = level ?? _LogLevel.info;
   switch (logLevel) {
     case _LogLevel.error:
-      console.error(logMsg);
+      _console.error(logMsg);
       break;
     case _LogLevel.warn:
-      console.warn(logMsg);
+      _console.warn(logMsg);
       break;
     case _LogLevel.info:
-      console.log(logMsg);
+      _console.log(logMsg);
   }
 }
+
+@JS('console')
+external _Console get _console;
+
+@JS()
+@anonymous
+class _Console {
+  external void log(String header,
+      [String style1, String style2, String style3]);
+
+  external void warn(String header,
+      [String style1, String style2, String style3]);
+
+  external void error(String header,
+      [String style1, String style2, String style3]);
+}

dwds/debug_extension_mv3/web/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name": "[MV3] Dart Debug Extension",
+    "name": "MV3 Dart Debug Extension",
     "version": "1.0",
     "manifest_version": 3,
     "action": {

dwds/debug_extension_mv3/web/utils.dart

@@ -0,0 +1,23 @@
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+@JS()
+library utils;
+
+import 'dart:js_util';
+
+import 'package:js/js.dart';
+
+import 'chrome_api.dart';
+
+bool? _isDevMode;
+
+bool isDevMode() {
+  if (_isDevMode != null) {
+    return _isDevMode!;
+  }
+  final extensionManifest = chrome.runtime.getManifest();
+  final extensionName = getProperty(extensionManifest, 'name') ?? '';
+  return extensionName.contains('DEV');
+}