Manifest 3

package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "eslint": "^8.5.0",
+    "eslint": "^8.32.0",
     "eslint-config-google": "^0.14.0"
   }
 }

src/background.js

@@ -1,5 +1,14 @@
 'use strict';
 
+import {isNewDay, getDebugInfo} from './utility.js';
+import {setBadge, isCurrentBadge, GreyBadge, BusyBadge, DoneBadge, ErrorBadge} from './badge.js';
+import {handleException} from './exception.js';
+import {GoogleTrend} from './GoogleTrend.js';
+import {DailyRewardStatus} from './status/dailyRewardStatus.js';
+import {checkQuizAndDaily} from './quest/quizDailyQuest.js';
+import {SearchQuest} from './quest/searchQuest.js';
+import {STATUS_BUSY} from '../constants.js';
+
 function onExtensionLoad() {
     setBadge(new GreyBadge());
     loadSavedSettings();
@@ -64,7 +73,11 @@ async function doBackgroundWork() {
 
     setBadge(new BusyBadge());
 
-    checkNewDay();
+    if (isNewDay()) {
+        searchQuest.reset();
+        googleTrend.reset();
+    }
+
     await checkDailyRewardStatus();
 
     if (isCurrentBadge('busy')) {
@@ -117,12 +130,20 @@ async function doSearchQuests() {
 const WORKER_ACTIVATION_INTERVAL = 7200000; // Interval at which automatic background works are carried out, in ms.
 const WAIT_FOR_ONLINE_TIMEOUT = 60000;
 
+
+export let developer = false;
+// eslint-disable-next-line prefer-const
+export let userAgents;
+userAgents = {
+    'pc': '',
+    'mb': '',
+    'pcSource': '',
+    'mbSource': '',
+};
+export let _compatibilityMode = false;
+export const userDailyStatus = new DailyRewardStatus();
 const googleTrend = new GoogleTrend();
-const userDailyStatus = new DailyRewardStatus();
 const searchQuest = new SearchQuest(googleTrend);
-let developer = false;
-let userAgents;
-let _compatibilityMode;
 
 chrome.runtime.onInstalled.addListener(function (details) {
     if (details.reason == 'install') {

src/badge.js

@@ -32,7 +32,7 @@ class Badge {
     }
 
     setIcon() {
-        chrome.browserAction.setIcon({
+        chrome.action.setIcon({
             path: this.icon,
         });
     }
@@ -43,7 +43,7 @@ class Badge {
             txt = '';
         }
 
-        chrome.browserAction.setBadgeText({
+        chrome.action.setBadgeText({
             text: txt,
         });
     }
@@ -52,61 +52,61 @@ class Badge {
         if (!this.backgroundColor) {
             return;
         }
-        chrome.browserAction.setBadgeBackgroundColor({
+        chrome.action.setBadgeBackgroundColor({
             'color': this.backgroundColor,
         });
     }
 }
 
-class GreyBadge extends Badge {
+export class GreyBadge extends Badge {
     constructor() {
         super('grey', 'img/[email protected]');
     }
 }
 
-class BusyBadge extends Badge {
+export class BusyBadge extends Badge {
     constructor() {
         super('busy', 'img/[email protected]');
     }
 }
 
-class DoneBadge extends Badge {
+export class DoneBadge extends Badge {
     constructor() {
         super('done', 'img/[email protected]');
     }
 }
 
-class WarningBadge extends Badge {
+export class WarningBadge extends Badge {
     constructor() {
         super('warn', 'img/[email protected]');
     }
 }
 
-class QuizAndDailyBadge extends Badge {
+export class QuizAndDailyBadge extends Badge {
     constructor(text) {
         super('quiz', 'img/[email protected]', text, [255, 201, 71, 100]);
     }
 }
 
-class ErrorBadge extends Badge {
+export class ErrorBadge extends Badge {
     constructor() {
         super('error', 'img/[email protected]', 'err', [255, 51, 51, 100]);
     }
 }
 
-class NoneBadge extends Badge {
+export class NoneBadge extends Badge {
     constructor() {
         super('none', 'img/[email protected]');
     }
 }
 
 let _currentBadge = null;
-function setBadge(badge) {
+export function setBadge(badge) {
     badge.set();
     _currentBadge = badge;
 }
 
-function isCurrentBadge(badgeType) {
+export function isCurrentBadge(badgeType) {
     if (typeof badgeType == 'object') {
         badgeType = badgeType.type;
     }

src/constants.js

@@ -0,0 +1,11 @@
+export const STATUS_NONE = 0;
+export const STATUS_BUSY = 1;
+export const STATUS_DONE = 20;
+export const STATUS_WARNING = 30;
+export const STATUS_ERROR = 3;
+
+export const USER_STATUS_BING_URL = 'https://www.bing.com/rewardsapp/flyout?channel=0';
+export const USER_STATUS_DETAILED_URL = 'https://rewards.bing.com/';
+
+
+// import {STATUS_NONE, STATUS_BUSY, STATUS_DONE, STATUS_ERROR, USER_STATUS_BING_URL, USER_STATUS_DETAILED_URL} from '../constants.js';

src/exception.js

@@ -1,18 +1,20 @@
-function handleException(ex) {
+import {setBadge, ErrorBadge} from './badge.js';
+
+export function handleException(ex) {
     setBadge(new ErrorBadge());
     console.log('Error History:');
     logException(ex);
     throw ex;
 }
 
-function logException(ex) {
+export function logException(ex) {
     if (ex.innerException) {
         logException(ex.innerException);
     }
     console.log(`Source: ${ex.source}\n`, ex);
 }
 
-class ErrorWithSourceInnerException extends Error {
+export class ErrorWithSourceInnerException extends Error {
     constructor(source, innerException, message) {
         message = message + '\nInnerEx: ' + (innerException ? innerException.stack : 'null');
         super(message);
@@ -21,7 +23,7 @@ class ErrorWithSourceInnerException extends Error {
     }
 }
 
-class FetchFailedException extends ErrorWithSourceInnerException {
+export class FetchFailedException extends ErrorWithSourceInnerException {
     constructor(source, innerException, message) {
         if (innerException == undefined) {
             innerException = {
@@ -38,7 +40,7 @@ class FetchFailedException extends ErrorWithSourceInnerException {
     }
 }
 
-class ResponseUnexpectedStatusException extends ErrorWithSourceInnerException {
+export class ResponseUnexpectedStatusException extends ErrorWithSourceInnerException {
     constructor(source, ex, message) {
         if (!message) {
             message = `Expected response status is within 200-299. Received response: ${ex}`;
@@ -48,7 +50,7 @@ class ResponseUnexpectedStatusException extends ErrorWithSourceInnerException {
     }
 }
 
-class GoogleTrendPageNumberOverflowException extends ErrorWithSourceInnerException {
+export class GoogleTrendPageNumberOverflowException extends ErrorWithSourceInnerException {
     constructor(source, innerException, message) {
         if (!message) {
             message = 'Failed to get more Google trend words because all pages have been used.';
@@ -58,7 +60,7 @@ class GoogleTrendPageNumberOverflowException extends ErrorWithSourceInnerExcepti
     }
 }
 
-class ParseJSONFailedException extends ErrorWithSourceInnerException {
+export class ParseJSONFailedException extends ErrorWithSourceInnerException {
     constructor(source, innerException, message) {
         if (!message) {
             message = 'Failed to parse the JSON file.';
@@ -68,7 +70,7 @@ class ParseJSONFailedException extends ErrorWithSourceInnerException {
     }
 }
 
-class FetchTimeoutException extends ErrorWithSourceInnerException {
+export class FetchTimeoutException extends ErrorWithSourceInnerException {
     constructor(source, innerException, message) {
         if (!message) {
             message = 'Fetch timeout.';
@@ -78,14 +80,14 @@ class FetchTimeoutException extends ErrorWithSourceInnerException {
     }
 }
 
-class UserAgentInvalidException extends Error {
+export class UserAgentInvalidException extends Error {
     constructor(message) {
         super(message);
         this.name = 'UserAgentInvalid';
     }
 }
 
-class NotRewardUserException extends Error {
+export class NotRewardUserException extends Error {
     constructor(message) {
         super(message);
         this.name = 'UserNotLoggedIn';

src/googleTrend.js

@@ -1,4 +1,6 @@
-class GoogleTrend {
+import {FetchFailedException} from './exception.js';
+
+export class GoogleTrend {
     constructor() {
         this.reset();
     }
@@ -29,36 +31,35 @@ class GoogleTrend {
         if (this._isGoogleTrendUpToDate()) {
             return;
         }
-        if (this._loadLocalWords()) {
+        if (await this._loadLocalWords()) {
             return;
         }
 
         const dates = this._getPastThreeDays();
         for (let i = 0; i<3; i++) {
             await this._fetchGoogleTrend(this._getGoogleTrendUrl(dates[i]));
         }
-        this._saveWordsToLocal();
+        await this._saveWordsToLocal();
     }
 
     _isGoogleTrendUpToDate(date=this._googleTrendWords_.date) {
         return date == this._getyyyymmdd(new Date());
     }
 
-    _saveWordsToLocal() {
-        localStorage.setItem('googleTrend', this._googleTrendWords_.words.join('|'));
-        localStorage.setItem('googleTrendDate', this._googleTrendWords_.date);
+    async _saveWordsToLocal() {
+        await chrome.storage.local.set({'googleTrend': this._googleTrendWords_.words.join('|'), 'googleTrendDate': this._googleTrendWords_.date});
     }
 
-    _loadLocalWords() {
-        const date = localStorage.getItem('googleTrendDate');
+    async _loadLocalWords() {
+        const date = await chrome.storage.local.get('googleTrendDate');
         if (date == undefined) {
             return false;
         }
         if (!this._isGoogleTrendUpToDate(date)) {
             return false;
         }
         this._googleTrendWords_.date = date;
-        this._googleTrendWords_.words = localStorage.getItem('googleTrend').split('|');
+        this._googleTrendWords_.words = await chrome.storage.local.get('googleTrend').split('|');
         return true;
     }
 

src/manifest.json

@@ -1,45 +1,32 @@
 {
-  "manifest_version": 2,
-  "name": "Microsoft Rewards Bot",
-  "version": "2.24.1.2",
-  "icons": {
-    "16": "img/[email protected]",
-    "24": "img/[email protected]",
-    "32": "img/[email protected]",
-    "48": "img/[email protected]",
-    "128": "img/[email protected]"
-  },  
-  "description": "A Chrome extension for Microsoft Rewards that automatically clears PC, mobile and EDGE search quests and displays daily point countdown.",
-
-  "background": {
-    "persistent": true,
-    "scripts": [
-      "status/DailyQuest.js",
-      "status/DailyRewardStatus.js",
-      "quest/searchQuest.js",
-      "quest/quizDailyQuest.js",
-      "googleTrend.js",
-      "utility.js",
-      "badge.js",
-      "exception.js",
-      "background.js",
-      "test.js"
-    ]
-  },
-
-  "browser_action": {
-    "default_title": "Microsoft Rewards Bot",
-    "default_popup": "popup/popup.html"
-  },
-
-  "permissions": ["https://www.bing.com/search?q=*",
-    "https://trends.google.com/trends/*",
-    "https://account.microsoft.com/rewards/*",
-    "https://rewards.microsoft.com/*",
-    "https://rewards.bing.com/*",
-    "webRequest",
-    "webRequestBlocking",
-    "storage",
-    "notifications"
-  ]
-}
+	"manifest_version": 3,
+	"name": "Microsoft Rewards Bot",
+	"version": "2.25.0",
+	"icons": {
+		"16": "img/[email protected]",
+		"24": "img/[email protected]",
+		"32": "img/[email protected]",
+		"48": "img/[email protected]",
+		"128": "img/[email protected]"
+	},
+	"description": "A Chrome extension for Microsoft Rewards that automatically clears PC, mobile and EDGE search quests and displays daily point countdown.",
+	"background": {
+		"service_worker": "background.js",
+		"type": "module"
+	},
+	"action": {
+		"default_title": "Microsoft Rewards Bot",
+		"default_popup": "popup/popup.html"
+	},
+	"permissions": [
+		"notifications",
+		"storage",
+		"webRequest",
+		"declarativeNetRequest"
+	],
+	"host_permissions": [
+		"https://*.bing.com/*",
+		"https://*.microsoft.com/*",
+		"https://trends.google.com/trends/*"
+	]
+}