Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a server endpoint for serving devtools extensions #6094

Merged
merged 6 commits into from
Jul 26, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

import 'dart:async';

import 'package:devtools_shared/devtools_extensions.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';

import 'example/conditional_screen.dart';
import 'extensions/extension_model.dart';
import 'extensions/extension_screen.dart';
import 'framework/framework_core.dart';
import 'framework/home_screen.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// found in the LICENSE file.

import 'package:devtools_extensions/api.dart';
import 'package:devtools_shared/devtools_extensions.dart';

import '../../shared/primitives/auto_dispose.dart';
import '../extension_model.dart';
import '_controller_desktop.dart' if (dart.library.html) '_controller_web.dart';

EmbeddedExtensionControllerImpl createEmbeddedExtensionController(
Expand Down
83 changes: 0 additions & 83 deletions packages/devtools_app/lib/src/extensions/extension_model.dart

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'package:devtools_shared/devtools_extensions.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';

Expand All @@ -13,7 +14,6 @@ import '../shared/screen.dart';
import '../shared/theme.dart';
import 'embedded/controller.dart';
import 'embedded/view.dart';
import 'extension_model.dart';

class ExtensionScreen extends Screen {
ExtensionScreen(this.extensionConfig)
Expand Down Expand Up @@ -155,3 +155,10 @@ class EmbeddedExtensionHeader extends StatelessWidget {
);
}
}

extension ExtensionConfigExtension on DevToolsExtensionConfig {
IconData get icon => IconData(
bkonyi marked this conversation as resolved.
Show resolved Hide resolved
materialIconCodePoint,
fontFamily: 'MaterialIcons',
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'package:devtools_shared/devtools_extensions.dart';
import 'package:flutter/foundation.dart';

import '../shared/globals.dart';
import '../shared/primitives/auto_dispose.dart';
import 'extension_model.dart';

class ExtensionService extends DisposableController
with AutoDisposeControllerMixin {
Expand All @@ -28,3 +28,28 @@ class ExtensionService extends DisposableController
debugExtensions.sublist(0, _count++ % (debugExtensions.length + 1));
}
}

// TODO(kenz): remove these once the DevTools extensions feature has shipped.
final List<DevToolsExtensionConfig> debugExtensions = [
DevToolsExtensionConfig.parse({
DevToolsExtensionConfig.nameKey: 'foo',
DevToolsExtensionConfig.issueTrackerKey: 'www.google.com',
DevToolsExtensionConfig.versionKey: '1.0.0',
DevToolsExtensionConfig.pathKey: '/path/to/foo',
}),
DevToolsExtensionConfig.parse({
DevToolsExtensionConfig.nameKey: 'bar',
DevToolsExtensionConfig.issueTrackerKey: 'www.google.com',
DevToolsExtensionConfig.versionKey: '2.0.0',
DevToolsExtensionConfig.materialIconCodePointKey: 0xe638,
DevToolsExtensionConfig.pathKey: '/path/to/bar',
}),
DevToolsExtensionConfig.parse({
DevToolsExtensionConfig.nameKey: 'provider',
DevToolsExtensionConfig.issueTrackerKey:
'https://github.com/rrousselGit/provider/issues',
DevToolsExtensionConfig.versionKey: '3.0.0',
DevToolsExtensionConfig.materialIconCodePointKey: 0xe50a,
DevToolsExtensionConfig.pathKey: '/path/to/provider',
}),
];
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// ignore_for_file: avoid-unused-parameters
import 'dart:async';

import 'package:devtools_shared/devtools_extensions.dart';

import '../../primitives/utils.dart';

const unsupportedMessage =
Expand Down Expand Up @@ -75,6 +77,12 @@ Future<DevToolsJsonFile?> requestTestAppSizeFile(String path) async {
throw Exception(unsupportedMessage);
}

Future<List<DevToolsExtensionConfig>> refreshAvailableExtensions(
String? rootPath,
) async {
return [];
}

void logWarning() {
throw Exception(unsupportedMessage);
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'dart:convert';
// ignore: avoid_web_libraries_in_flutter, as designed
import 'dart:html';

import 'package:devtools_shared/devtools_extensions.dart';
import 'package:devtools_shared/devtools_shared.dart';
import 'package:logging/logging.dart';

Expand Down Expand Up @@ -337,6 +338,31 @@ DevToolsJsonFile _devToolsJsonFileFromResponse(
);
}

Future<List<DevToolsExtensionConfig>> refreshAvailableExtensions(
String? rootPath,
) async {
if (isDevToolsServerAvailable) {
final uri = Uri(
path: apiServeAvailableExtensions,
queryParameters: {extensionRootPathPropertyName: rootPath},
);
final resp = await request(uri.toString());
if (resp?.status == HttpStatus.ok) {
final parsedResult = json.decode(resp!.responseText!);
final extensionsAsJson =
(parsedResult[extensionsResultPropertyName]! as List<Object?>)
.cast<Map<String, Object?>>();
bkonyi marked this conversation as resolved.
Show resolved Hide resolved
return extensionsAsJson
.map((p) => DevToolsExtensionConfig.parse(p))
.toList();
} else {
logWarning(resp, apiServeAvailableExtensions);
return [];
}
}
return [];
}

void logWarning(HttpRequest? response, String apiType, [String? respText]) {
_log.warning(
'HttpRequest $apiType failed status = ${response?.status}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import 'package:devtools_app/devtools_app.dart';
import 'package:devtools_app/src/extensions/embedded/view.dart';
import 'package:devtools_app/src/extensions/extension_model.dart';
import 'package:devtools_app/src/extensions/extension_screen.dart';
import 'package:devtools_shared/src/extensions/extension_model.dart';
import 'package:devtools_test/devtools_test.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
Expand Down
6 changes: 6 additions & 0 deletions packages/devtools_shared/lib/devtools_extensions.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright 2023 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

export 'src/extensions/extension_manager.dart';
export 'src/extensions/extension_model.dart';
9 changes: 9 additions & 0 deletions packages/devtools_shared/lib/src/devtools_api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,12 @@ const String apiGetTestAppSizeFile = '${apiPrefix}getTestAppSizeFile';
const String baseAppSizeFilePropertyName = 'appSizeBase';

const String testAppSizeFilePropertyName = 'appSizeTest';

/// Serves any available extensions and returns a list of their configurations
/// to DevTools.
const String apiServeAvailableExtensions =
'${apiPrefix}serveAvailableExtensions';

const extensionRootPathPropertyName = 'rootPath';
kenzieschmoll marked this conversation as resolved.
Show resolved Hide resolved

const extensionsResultPropertyName = 'extensions';
129 changes: 129 additions & 0 deletions packages/devtools_shared/lib/src/extensions/extension_manager.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
// Copyright (c) 2023, 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.

import 'dart:io';

import 'package:io/io.dart';
import 'package:path/path.dart' as path;

import 'extension_model.dart';

/// Location where DevTools extension assets will be served, relative to where
/// DevTools assets are served (build/).
const extensionRequestPath = 'devtools_extensions';

/// The location for the DevTools extension, relative to the parent package's
/// root.
const extensionLocation = 'extension/devtools';

/// The default location for the DevTools extension, relative to
/// `<parent_package_root>/extension/devtools/`.
const extensionBuildDefault = 'build';

class ExtensionsManager {
kenzieschmoll marked this conversation as resolved.
Show resolved Hide resolved
ExtensionsManager({required this.buildDir});

final String buildDir;
kenzieschmoll marked this conversation as resolved.
Show resolved Hide resolved

String get servedExtensionsPath => path.join(buildDir, extensionRequestPath);

final devtoolsExtensions = <DevToolsExtensionConfig>[];

void serveAvailableExtensions(String? rootPath) {
kenzieschmoll marked this conversation as resolved.
Show resolved Hide resolved
devtoolsExtensions.clear();

if (rootPath != null) {
// TODO(kenz): use 'findExtensions' from package:extension_discovery once it
// is published.
// final extensions = findExtensions(
// 'devtools',
// packageConfig: '$rootPath/.dart_tool/package_config.json',
// );
final extensions = <Extension>[];
kenzieschmoll marked this conversation as resolved.
Show resolved Hide resolved
for (final extension in extensions) {
final config = extension.config;
if (config is! Map) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If config is always expected to be Map, why don't we restrict it to Map<Object, Object?> in Extension?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See discussion at dart-lang/tools#129 (comment)

// Fail gracefully. Invalid content in the extension's config.json.
continue;
}
final configAsMap = config as Map<String, Object?>;

// This should be relative to the 'extension/devtools/' directory and
// defaults to 'build';
final relativeExtensionLocation =
configAsMap['buildLocation'] as String? ?? 'build';

// TODO(kenz): this is hacky. Unclear if this will work for windows.
var rootWithoutFile = extension.rootUri.toString();
if (rootWithoutFile.startsWith('file:///Users')) {
rootWithoutFile = rootWithoutFile.replaceFirst('file:///', '/');
}

final location = path.join(
rootWithoutFile,
extensionLocation,
relativeExtensionLocation,
);

try {
final pluginConfig = DevToolsExtensionConfig.parse({
...configAsMap,
DevToolsExtensionConfig.pathKey: location,
});
devtoolsExtensions.add(pluginConfig);
} on StateError catch (e) {
print(e.message);
continue;
}
}
}

_resetServedPluginsDir();
for (final extension in devtoolsExtensions) {
_moveToServedExtensionsDir(extension.name, extension.path);
}
}

void _resetServedPluginsDir() {
final buildDirectory = Directory(buildDir);
if (!buildDirectory.existsSync()) {
throw Exception('The build directory does not exist.');
kenzieschmoll marked this conversation as resolved.
Show resolved Hide resolved
}

// Destroy and recreate the 'devtools_extensions' directory where extension
// assets are served.
final servedExtensionsDir = Directory(servedExtensionsPath);
if (servedExtensionsDir.existsSync()) {
servedExtensionsDir.deleteSync(recursive: true);
}
servedExtensionsDir.createSync();
}

void _moveToServedExtensionsDir(
String extensionPackageName,
String extensionPath,
) {
final newExtensionPath =
path.join(servedExtensionsPath, extensionPackageName);
kenzieschmoll marked this conversation as resolved.
Show resolved Hide resolved
copyPathSync(extensionPath, newExtensionPath);
kenzieschmoll marked this conversation as resolved.
Show resolved Hide resolved
}
}

/// TODO(kenz): remove this class. This is copied from
/// package:extension_discovery, which is drafed here:
/// https://github.com/dart-lang/tools/pull/129. Remove this temporary copy once
/// package:extension_discovery is published.
class _Extension {
_Extension._({
required this.package,
required this.rootUri,
required this.packageUri,
required this.config,
});

final String package;
final Uri rootUri;
final Uri packageUri;
final Object? config;
}
Loading
Loading