Fix issue where resource-checker.js couldn't be found

Rick Butterfield · Rick Butterfield · commit 3de9f2b96e1c · 2024-02-01T16:34:16.000Z
diff --git a/src/Umbraco.Community.Sustainability/Controllers/SustainabilityController.cs b/src/Umbraco.Community.Sustainability/Controllers/SustainabilityController.cs
@@ -2,15 +2,15 @@
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Web.Common.Controllers;
+using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Community.Sustainability.Models;
 using Umbraco.Community.Sustainability.Schemas;
 using Umbraco.Community.Sustainability.Services;
 using Umbraco.Extensions;
 
 namespace Umbraco.Community.Sustainability.Controllers
 {
-    public class SustainabilityController : UmbracoApiController
+    public class SustainabilityController : UmbracoAuthorizedApiController
     {
         private readonly IPublishedContentQuery _contentQuery;
         private readonly IPageMetricService _pageMetricService;
@@ -27,9 +27,9 @@ public SustainabilityController(
         }
 
         [HttpGet]
-        public IActionResult GetPageData([FromQuery] int pageId)
+        public async Task<IActionResult> GetPageData([FromQuery] int pageId)
         {
-            var pageMetrics = _pageMetricService.GetPageMetrics(pageId);
+            var pageMetrics = await _pageMetricService.GetPageMetrics(pageId);
             var mostRecent = pageMetrics.OrderByDescending(x => x.RequestDate).FirstOrDefault();
             if (mostRecent?.PageData == null)
             {
@@ -56,7 +56,7 @@ public async Task<IActionResult> CheckPage([FromQuery] int pageId)
         }
 
         [HttpPost]
-        public IActionResult SavePageData([FromQuery] int pageId, [FromBody] SustainabilityResponse data)
+        public async Task<IActionResult> SavePageData([FromQuery] int pageId, [FromBody] SustainabilityResponse data)
         {
             if (data.TotalSize == 0)
             {
@@ -74,7 +74,7 @@ public IActionResult SavePageData([FromQuery] int pageId, [FromBody] Sustainabil
                 PageData = JsonSerializer.Serialize(data),
             };
 
-            _pageMetricService.AddPageMetric(pageMetric);
+            await _pageMetricService.AddPageMetric(pageMetric);
             return Ok(true);
         }
     }
diff --git a/src/Umbraco.Community.Sustainability/Models/ExternalResource.cs b/src/Umbraco.Community.Sustainability/Models/ExternalResource.cs
@@ -1,8 +1,13 @@
+using Newtonsoft.Json;
+
 namespace Umbraco.Community.Sustainability.Models
 {
     public class ExternalResource
     {
+        [JsonProperty("url")]
         public string? Url { get; set; }
+
+        [JsonProperty("size")]
         public decimal Size { get; set; } = 0;
 
         public ExternalResource() { }
diff --git a/src/Umbraco.Community.Sustainability/Models/ExternalResourceGroup.cs b/src/Umbraco.Community.Sustainability/Models/ExternalResourceGroup.cs
@@ -1,13 +1,21 @@
 using System.ComponentModel.DataAnnotations;
+using Newtonsoft.Json;
 using Umbraco.Community.Sustainability.Extensions;
 
 namespace Umbraco.Community.Sustainability.Models
 {
     public class ExternalResourceGroup
     {
+        [JsonProperty("type")]
         public ResourceGroupType Type { get; set; }
+
+        [JsonProperty("name")]
         public string? Name { get; set; }
+
+        [JsonProperty("totalSize")]
         public decimal TotalSize { get; set; } = 0;
+
+        [JsonProperty("resources")]
         public List<ExternalResource>? Resources { get; set; } = new List<ExternalResource>();
 
         public ExternalResourceGroup() { }
diff --git a/src/Umbraco.Community.Sustainability/Models/SustainabilityResponse.cs b/src/Umbraco.Community.Sustainability/Models/SustainabilityResponse.cs
@@ -1,11 +1,22 @@
+using Newtonsoft.Json;
+
 namespace Umbraco.Community.Sustainability.Models
 {
     public class SustainabilityResponse
     {
+        [JsonProperty("lastRunDate")]
         public DateTime LastRunDate { get; set; } = DateTime.UtcNow;
+
+        [JsonProperty("totalSize")]
         public decimal TotalSize { get; set; } = 0;
+
+        [JsonProperty("totalEmissions")]
         public float TotalEmissions { get; set; } = 0;
-        public string CarbonRating { get; set; }
+
+        [JsonProperty("carbonRating")]
+        public string? CarbonRating { get; set; }
+
+        [JsonProperty("resourceGroups")]
         public List<ExternalResourceGroup>? ResourceGroups { get; set; }
     }
 }
diff --git a/src/Umbraco.Community.Sustainability/Services/PageMetricService.cs b/src/Umbraco.Community.Sustainability/Services/PageMetricService.cs
@@ -5,8 +5,8 @@ namespace Umbraco.Community.Sustainability.Services
 {
     public interface IPageMetricService
     {
-        IEnumerable<PageMetric> GetPageMetrics(int pageId);
-        void AddPageMetric(PageMetric pageMetric);
+        Task<IEnumerable<PageMetric>> GetPageMetrics(int pageId);
+        Task AddPageMetric(PageMetric pageMetric);
     }
 
     public class PageMetricService : IPageMetricService
@@ -18,19 +18,19 @@ public PageMetricService(IScopeProvider scopeProvider)
             _scopeProvider = scopeProvider;
         }
 
-        public IEnumerable<PageMetric> GetPageMetrics(int pageId)
+        public async Task<IEnumerable<PageMetric>> GetPageMetrics(int pageId)
         {
             using var scope = _scopeProvider.CreateScope();
-            var queryResults = scope.Database.Fetch<PageMetric>($"SELECT * FROM {PageMetric.TableName} WHERE NodeId = @0", pageId);
+            var queryResults = await scope.Database.FetchAsync<PageMetric>($"SELECT * FROM {PageMetric.TableName} WHERE NodeId = @0", pageId);
             scope.Complete();
 
             return queryResults;
         }
 
-        public void AddPageMetric(PageMetric pageMetric)
+        public async Task AddPageMetric(PageMetric pageMetric)
         {
             using var scope = _scopeProvider.CreateScope();
-            scope.Database.Insert(pageMetric);
+            await scope.Database.InsertAsync(pageMetric);
             scope.Complete();
         }
     }
diff --git a/src/Umbraco.Community.Sustainability/Services/SustainabilityService.cs b/src/Umbraco.Community.Sustainability/Services/SustainabilityService.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
 using System.Text.Json;
 using Microsoft.Playwright;
 using Umbraco.Community.Sustainability.Models;
@@ -21,40 +22,50 @@ public async Task<SustainabilityResponse> GetSustainabilityData(string url)
             var page = await context.NewPageAsync();
             await page.GotoAsync(url);
 
-            // Add our script to report data
-            await page.AddScriptTagAsync(new PageAddScriptTagOptions()
+            string? buildDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            string? fullPath = Path.Combine(buildDir, "wwwroot\\Umbraco.Community.Sustainability\\js\\resource-checker.js");
+
+            bool fileExists = File.Exists(fullPath);
+
+            if (fileExists)
             {
-                Path = "./App_Plugins/Umbraco.Community.Sustainability/js/resource-checker.js",
-                Type = "module"
-            });
+                // Add our script to report data
+                await page.AddScriptTagAsync(new PageAddScriptTagOptions()
+                {
+                    Path = fullPath,
+                    Type = "module"
+                });
 
-            // Retrieve data from page
-            var data = await page.GetByTestId("sustainabilityData").TextContentAsync();
-            var sustainabilityData = JsonSerializer.Deserialize<SustainabilityData>(data);
+                // Retrieve data from page
+                var data = await page.GetByTestId("sustainabilityData").TextContentAsync();
+                var sustainabilityData = JsonSerializer.Deserialize<SustainabilityData>(data);
 
-            var resourceGroups = new List<ExternalResourceGroup>();
+                var resourceGroups = new List<ExternalResourceGroup>();
 
-            var scripts = GetExternalResourceGroup(ResourceGroupType.Scripts, sustainabilityData.resources);
-            resourceGroups.Add(scripts);
+                var scripts = GetExternalResourceGroup(ResourceGroupType.Scripts, sustainabilityData.resources);
+                resourceGroups.Add(scripts);
 
-            var images = GetExternalResourceGroup(ResourceGroupType.Images, sustainabilityData.resources);
-            resourceGroups.Add(images);
+                var images = GetExternalResourceGroup(ResourceGroupType.Images, sustainabilityData.resources);
+                resourceGroups.Add(images);
 
-            var styles = GetExternalResourceGroup(ResourceGroupType.Styles, sustainabilityData.resources);
-            resourceGroups.Add(styles);
+                var styles = GetExternalResourceGroup(ResourceGroupType.Styles, sustainabilityData.resources);
+                resourceGroups.Add(styles);
 
-            var other = GetExternalResourceGroup(ResourceGroupType.Other, sustainabilityData.resources);
-            resourceGroups.Add(other);
+                var other = GetExternalResourceGroup(ResourceGroupType.Other, sustainabilityData.resources);
+                resourceGroups.Add(other);
 
-            await browser.CloseAsync();
+                await browser.CloseAsync();
 
-            return new SustainabilityResponse()
-            {
-                TotalSize = sustainabilityData.pageWeight,
-                TotalEmissions = sustainabilityData.emissions.co2,
-                CarbonRating = sustainabilityData.carbonRating,
-                ResourceGroups = resourceGroups
-            };
+                return new SustainabilityResponse()
+                {
+                    TotalSize = sustainabilityData.pageWeight,
+                    TotalEmissions = sustainabilityData.emissions.co2,
+                    CarbonRating = sustainabilityData.carbonRating,
+                    ResourceGroups = resourceGroups
+                };
+            }
+
+            return default;
         }
 
         private ExternalResourceGroup GetExternalResourceGroup(ResourceGroupType groupType, IList<Resource> resources)
diff --git a/src/Umbraco.Community.Sustainability/Umbraco.Community.Sustainability.csproj b/src/Umbraco.Community.Sustainability/Umbraco.Community.Sustainability.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <StaticWebAssetBasePath>App_Plugins</StaticWebAssetBasePath>
@@ -12,7 +12,8 @@
     <PackageTags>umbraco;umbraco-marketplace</PackageTags>
     <RootNamespace>Umbraco.Community.Sustainability</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>0.1.0</Version>
+    <VersionPrefix>0.1.0</VersionPrefix>
+    <VersionSuffix>alpha</VersionSuffix>
     <Authors>Umbraco Sustainability Community Team</Authors>
     <Copyright>$([System.DateTime]::UtcNow.ToString(`yyyy`)) © Umbraco Sustainability Community Team</Copyright>
     <PackageProjectUrl>https://github.com/rickbutterfield/Umbraco.Community.Sustainability</PackageProjectUrl>
@@ -24,8 +25,21 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Playwright" Version="1.40.0" />
-    <PackageReference Include="Umbraco.Cms.Web.Website" Version="10.0.0" />
-    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="10.0.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Umbraco.Cms.Web.Website" Version="[10.0.0, 11.0.0)" />
+    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="[10.0.0, 11.0.0)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Umbraco.Cms.Web.Website" Version="[11.0.0, 13.0.0)" />
+    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="[11.0.0, 13.0.0)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Umbraco.Cms.Web.Website" Version="[13.0.0, 14.0.0)" />
+    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="[13.0.0, 14.0.0)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -35,4 +49,10 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Update="wwwroot\Umbraco.Community.Sustainability\js\resource-checker.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  
 </Project>
diff --git a/src/Umbraco.Community.Sustainability/wwwroot/Umbraco.Community.Sustainability/js/resource-checker.js b/src/Umbraco.Community.Sustainability/wwwroot/Umbraco.Community.Sustainability/js/resource-checker.js
@@ -0,0 +1,77 @@
+import { co2, hosting } from 'https://cdn.skypack.dev/@tgwf/co2';
+
+scrollPage();
+
+export function scrollPage() {
+  window.scrollTo({
+    top: document.body.scrollHeight,
+    behavior: 'smooth'
+  });
+  
+  setTimeout(reportEmissions, 2000);
+}
+
+export async function reportEmissions() {
+  const emissionsData = await getEmissionsData();
+
+  const emissionsDiv = document.createElement("div");
+  emissionsDiv.setAttribute("data-testid", "sustainabilityData");
+  emissionsDiv.innerHTML = JSON.stringify(emissionsData);
+
+  document.body.appendChild(emissionsDiv);
+}
+
+export async function getEmissionsData() {
+  const resources = getResources();
+  const bytesSent = getTransferSize(resources);
+  const hostCheck = await hosting.check(window.location.hostname);
+
+  const co2Emission = new co2({ model: "swd" });
+  const emissions = co2Emission.perVisitTrace(bytesSent, hostCheck);
+
+  return {
+    pageWeight: bytesSent,
+    carbonRating: calculateGrade(emissions.co2),
+    emissions: emissions,
+    resources: resources
+  };
+}
+
+export function getResources() {
+  return window.performance.getEntriesByType("resource");
+}
+
+export function filterResourceByType(resources, entryType) {
+  return resources.filter(
+    (entry) => entry.initiatorType === entryType,
+  );
+}
+
+export function getTransferSize(resources) {
+  let bytesSent = 0;
+  resources.forEach((entry) => {
+    bytesSent += entry.transferSize;
+  });
+
+  return bytesSent;
+}
+
+export function calculateGrade(score) {
+  // grade using swd digital carbon ratings
+  // https://sustainablewebdesign.org/digital-carbon-ratings/
+  if (score < 0.095) {
+    return 'A+';
+  } else if (score < 0.186) {
+    return 'A';
+  } else if (score < 0.341) {
+    return 'B';
+  } else if (score < 0.493) {
+    return 'C';
+  } else if (score < 0.656) {
+    return 'D';
+  } else if (score < 0.846) {
+    return 'E';
+  } else {
+    return 'F';
+  }
+}
diff --git a/src/Umbraco.Community.Sustainability/wwwroot/Umbraco.Community.Sustainability/js/sustainability.resource.js b/src/Umbraco.Community.Sustainability/wwwroot/Umbraco.Community.Sustainability/js/sustainability.resource.js
@@ -3,7 +3,8 @@
 
   function sustainabilityResource($http, umbRequestHelper) {
 
-    let apiUrl = "/umbraco/api/Sustainability/";
+    let apiUrl = "/umbraco/backoffice/api/Sustainability/";
+
     let resource = {
       getData: getData,
       checkPage: checkPage,
diff --git a/src/Umbraco.Community.Sustainability/wwwroot/Umbraco.Community.Sustainability/views/sustainability-content-app.html b/src/Umbraco.Community.Sustainability/wwwroot/Umbraco.Community.Sustainability/views/sustainability-content-app.html
@@ -15,11 +15,11 @@
         </umb-box-content>
       </umb-box>
       <umb-box ng-repeat="group in sustainabilityData.resourceGroups" ng-if="!loading">
-        <umb-box-header title="{{group.name}}" description="Total size: {{(group.totalSize / 1024).toFixed(2)}}kb"></umb-box-header>
+        <umb-box-header title="{{group.name}}" description="Total size: {{(group.totalSize / 1024).toFixed(2)}}KB"></umb-box-header>
         <umb-box-content>
           <ul>
             <li ng-repeat="resource in group.resources">
-              {{resource.url}} ({{(resource.size / 1024).toFixed(2)}}kb)
+              {{resource.url}} ({{(resource.size / 1024).toFixed(2)}}KB)
             </li>
           </ul>
         </umb-box-content>
@@ -43,7 +43,7 @@
       <div class="umb-box-row">
         <umb-box>
           <umb-box-header title="Page size"></umb-box-header>
-          <umb-box-content>{{(sustainabilityData.totalSize / 1024).toFixed(2)}}kb</umb-box-content>
+          <umb-box-content>{{(sustainabilityData.totalSize / 1024).toFixed(2)}}KB</umb-box-content>
         </umb-box>
         <umb-box>
           <umb-box-header title="CO₂ per page view"></umb-box-header>

Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,15 @@`
`2`	`2`	`using Microsoft.AspNetCore.Mvc;`
`3`	`3`	`using Umbraco.Cms.Core;`
`4`	`4`	`using Umbraco.Cms.Core.Models.PublishedContent;`
`5`		`-using Umbraco.Cms.Web.Common.Controllers;`
	`5`	`+using Umbraco.Cms.Web.BackOffice.Controllers;`
`6`	`6`	`using Umbraco.Community.Sustainability.Models;`
`7`	`7`	`using Umbraco.Community.Sustainability.Schemas;`
`8`	`8`	`using Umbraco.Community.Sustainability.Services;`
`9`	`9`	`using Umbraco.Extensions;`
`10`	`10`
`11`	`11`	`namespace Umbraco.Community.Sustainability.Controllers`
`12`	`12`	`{`
`13`		`- public class SustainabilityController : UmbracoApiController`
	`13`	`+ public class SustainabilityController : UmbracoAuthorizedApiController`
`14`	`14`	`{`
`15`	`15`	`private readonly IPublishedContentQuery _contentQuery;`
`16`	`16`	`private readonly IPageMetricService _pageMetricService;`
`@@ -27,9 +27,9 @@ public SustainabilityController(`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`[HttpGet]`
`30`		`- public IActionResult GetPageData([FromQuery] int pageId)`
	`30`	`+ public async Task<IActionResult> GetPageData([FromQuery] int pageId)`
`31`	`31`	`{`
`32`		`- var pageMetrics = _pageMetricService.GetPageMetrics(pageId);`
	`32`	`+ var pageMetrics = await _pageMetricService.GetPageMetrics(pageId);`
`33`	`33`	`var mostRecent = pageMetrics.OrderByDescending(x => x.RequestDate).FirstOrDefault();`
`34`	`34`	`if (mostRecent?.PageData == null)`
`35`	`35`	`{`
`@@ -56,7 +56,7 @@ public async Task<IActionResult> CheckPage([FromQuery] int pageId)`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`[HttpPost]`
`59`		`- public IActionResult SavePageData([FromQuery] int pageId, [FromBody] SustainabilityResponse data)`
	`59`	`+ public async Task<IActionResult> SavePageData([FromQuery] int pageId, [FromBody] SustainabilityResponse data)`
`60`	`60`	`{`
`61`	`61`	`if (data.TotalSize == 0)`
`62`	`62`	`{`
`@@ -74,7 +74,7 @@ public IActionResult SavePageData([FromQuery] int pageId, [FromBody] Sustainabil`
`74`	`74`	`PageData = JsonSerializer.Serialize(data),`
`75`	`75`	`};`
`76`	`76`
`77`		`- _pageMetricService.AddPageMetric(pageMetric);`
	`77`	`+ await _pageMetricService.AddPageMetric(pageMetric);`
`78`	`78`	`return Ok(true);`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,13 @@`
	`1`	`+using Newtonsoft.Json;`
	`2`	`+`
`1`	`3`	`namespace Umbraco.Community.Sustainability.Models`
`2`	`4`	`{`
`3`	`5`	`public class ExternalResource`
`4`	`6`	`{`
	`7`	`+ [JsonProperty("url")]`
`5`	`8`	`public string? Url { get; set; }`
	`9`	`+`
	`10`	`+ [JsonProperty("size")]`
`6`	`11`	`public decimal Size { get; set; } = 0;`
`7`	`12`
`8`	`13`	`public ExternalResource() { }`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,22 @@`
	`1`	`+using Newtonsoft.Json;`
	`2`	`+`
`1`	`3`	`namespace Umbraco.Community.Sustainability.Models`
`2`	`4`	`{`
`3`	`5`	`public class SustainabilityResponse`
`4`	`6`	`{`
	`7`	`+ [JsonProperty("lastRunDate")]`
`5`	`8`	`public DateTime LastRunDate { get; set; } = DateTime.UtcNow;`
	`9`	`+`
	`10`	`+ [JsonProperty("totalSize")]`
`6`	`11`	`public decimal TotalSize { get; set; } = 0;`
	`12`	`+`
	`13`	`+ [JsonProperty("totalEmissions")]`
`7`	`14`	`public float TotalEmissions { get; set; } = 0;`
`8`		`- public string CarbonRating { get; set; }`
	`15`	`+`
	`16`	`+ [JsonProperty("carbonRating")]`
	`17`	`+ public string? CarbonRating { get; set; }`
	`18`	`+`
	`19`	`+ [JsonProperty("resourceGroups")]`
`9`	`20`	`public List<ExternalResourceGroup>? ResourceGroups { get; set; }`
`10`	`21`	`}`
`11`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ namespace Umbraco.Community.Sustainability.Services`
`5`	`5`	`{`
`6`	`6`	`public interface IPageMetricService`
`7`	`7`	`{`
`8`		`- IEnumerable<PageMetric> GetPageMetrics(int pageId);`
`9`		`- void AddPageMetric(PageMetric pageMetric);`
	`8`	`+ Task<IEnumerable<PageMetric>> GetPageMetrics(int pageId);`
	`9`	`+ Task AddPageMetric(PageMetric pageMetric);`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`public class PageMetricService : IPageMetricService`
`@@ -18,19 +18,19 @@ public PageMetricService(IScopeProvider scopeProvider)`
`18`	`18`	`_scopeProvider = scopeProvider;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public IEnumerable<PageMetric> GetPageMetrics(int pageId)`
	`21`	`+ public async Task<IEnumerable<PageMetric>> GetPageMetrics(int pageId)`
`22`	`22`	`{`
`23`	`23`	`using var scope = _scopeProvider.CreateScope();`
`24`		`- var queryResults = scope.Database.Fetch<PageMetric>($"SELECT * FROM {PageMetric.TableName} WHERE NodeId = @0", pageId);`
	`24`	`+ var queryResults = await scope.Database.FetchAsync<PageMetric>($"SELECT * FROM {PageMetric.TableName} WHERE NodeId = @0", pageId);`
`25`	`25`	`scope.Complete();`
`26`	`26`
`27`	`27`	`return queryResults;`
`28`	`28`	`}`
`29`	`29`
`30`		`- public void AddPageMetric(PageMetric pageMetric)`
	`30`	`+ public async Task AddPageMetric(PageMetric pageMetric)`
`31`	`31`	`{`
`32`	`32`	`using var scope = _scopeProvider.CreateScope();`
`33`		`- scope.Database.Insert(pageMetric);`
	`33`	`+ await scope.Database.InsertAsync(pageMetric);`
`34`	`34`	`scope.Complete();`
`35`	`35`	`}`
`36`	`36`	`}`