Merge pull request #358 from ezzak/fix_awaits

Fix multiple issues relating to async/await

Author: rich-hansen

src/js/background.ts

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import './globals';
+
 import {DYNAMIC_STRING_MARKER, Origin, STATES} from './config';
 import {MESSAGE_TYPE, ORIGIN_HOST} from './config';
 

src/js/background/historyManager.ts

@@ -22,9 +22,7 @@ export async function getRecords(): Promise<
     [string, {creationTime: number; violations: Array<Violation>; url: string}]
   >
 > {
-  const tabIDs = await chrome.storage.local.getKeys();
-  const entries = await chrome.storage.local.get(tabIDs);
-  return Object.entries(entries);
+  return Object.entries(await chrome.storage.local.get(null));
 }
 
 export async function downloadHashSource(
@@ -105,10 +103,8 @@ export async function trackViolationForTab(
 
 export async function setUpHistoryCleaner(): Promise<void> {
   const now = Date.now();
-  const keys = await chrome.storage.local.getKeys();
-  const entries = await chrome.storage.local.get(keys);
 
-  const entriesToDelete = Object.entries(entries)
+  const entriesToDelete = (await getRecords())
     .filter(([_keys, entry]) => now - entry.creationTime >= HISTORY_TTL_MSEC)
     .map(entry => entry[0]);
 

src/js/content.ts

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import './globals';
+
 import {
   MESSAGE_TYPE,
   DOWNLOAD_SRC_ENABLED,

src/js/globals.ts

@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Chrome_incompatibilities
+// To enable Promise APIs we need to use `browser` outside of Chrome
+self.chrome = self.browser ?? self.chrome;

src/js/index.d.ts

@@ -22,8 +22,6 @@ declare global {
     showSaveFilePicker: (_: {
       suggestedName: string;
     }) => Promise<FileSystemFileHandle>;
-  }
-  interface FileSystemFileHandle {
-    createWritable: () => Promise<WritableStream>;
+    browser: typeof chrome;
   }
 }

src/js/popup/popup.ts

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import '../globals';
+
 import type {Origin, State} from '../config';
 import {
   DOWNLOAD_SRC_ENABLED,

tsconfig.json

@@ -5,6 +5,6 @@
     "moduleResolution": "node",
     "noFallthroughCasesInSwitch": true,
     "strict": true,
-    "target": "ES6"
+    "target": "ES2017"
   }
 }