Skip to content

Add assets digests handler #1709

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Aug 7, 2018
Merged

Add assets digests handler #1709

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3e374f
Add assets digests handler
samogot Aug 3, 2018
5d64302
Change path to $assetDigests
samogot Aug 7, 2018
d46d10b
Fix nit and test
samogot Aug 7, 2018
d81f3eb
Fix more nits
samogot Aug 7, 2018
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
22 changes: 22 additions & 0 deletions build_runner/lib/src/server/server.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import 'path_to_asset_id.dart';

const _performancePath = r'$perf';
final _graphPath = r'$graph';
final _assetsDigestPath = r'$assetDigests';
final _buildUpdatesProtocol = r'$livereload';
final _buildUpdatesMessage = 'update';
final entrypointExtensionMarker = '/* ENTRYPOINT_EXTENTION_MARKER */';
Expand Down Expand Up @@ -79,6 +80,9 @@ class ServeHandler implements BuildState {
if (request.url.path == _performancePath) {
return _performanceHandler(request);
}
if (request.url.path == _assetsDigestPath) {
return _assetsDigestHandler(request, rootDir);
}
if (request.url.path.startsWith(_graphPath)) {
var graphHandler = await _assetGraphHandler;
return await graphHandler.handle(
Expand Down Expand Up @@ -112,6 +116,24 @@ class ServeHandler implements BuildState {
headers: {HttpHeaders.contentTypeHeader: 'text/html'});
}

Future<shelf.Response> _assetsDigestHandler(
shelf.Request request, String rootDir) async {
var assertPathList = jsonDecode(await request.readAsString()) as List;
var rootPackage = _state.packageGraph.root.name;
var resultMap = <String, String>{};
Copy link
Member

Choose a reason for hiding this comment

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

[nit] How about results or digestsByPath

for (String path in assertPathList) {
try {
var assetId = pathToAssetId(rootPackage, rootDir, path.split('/'));
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: p.url.split()

var digest = await _state.reader.digest(assetId);
resultMap[path] = digest.toString();
} on AssetNotFoundException {
resultMap[path] = null;
Copy link
Member

Choose a reason for hiding this comment

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

do we need to store null? Should we instead resultMap.remove(path)?

}
}
return new shelf.Response.ok(jsonEncode(resultMap),
headers: {HttpHeaders.contentTypeHeader: 'application/json'});
}

void _warnForEmptyDirectory(String rootDir) {
if (!_state.assetGraph
.packageNodes(_rootPackage)
Expand Down
19 changes: 19 additions & 0 deletions build_runner/test/server/serve_handler_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// BSD-style license that can be found in the LICENSE file.

import 'dart:async';
import 'dart:convert';
import 'dart:io';

import 'package:logging/logging.dart';
Expand Down Expand Up @@ -165,6 +166,24 @@ void main() {
});
});

test('serve asset digests', () async {
_addSource('a|web/index.html', 'content1');
_addSource('a|lib/some.dart.js', 'content2');
_addSource('a|lib/another.dart.js', 'content3');
var response = await serveHandler.handlerFor('web')(new Request(
'GET', Uri.parse('http://server.com/\$assets'),
body: jsonEncode([
'index.html',
'packages/a/some.dart.js',
'packages/a/absent.dart.js'
])));
expect(jsonDecode(await response.readAsString()), {
'index.html': '7e55db001d319a94b0b713529a756623',
'packages/a/some.dart.js': 'eea670f4ac941df71a3b5f268ebe3eac',
'packages/a/absent.dart.js': null
});
});

group('build updates', () {
test('injects client code if enabled', () async {
_addSource('a|web/some.js', entrypointExtensionMarker + '\nalert(1)');
Expand Down