browser-extension-manager 1.0.6 → 1.0.8

package/dist/background.js

@@ -9,6 +9,7 @@ function Manager() {
 
   // Properties
   self.extension = null;
+  self.logger = null;
 
   // Defaults
   self.config = {};
@@ -40,6 +41,7 @@ Manager.prototype.initialize = function () {
   return new Promise(function(resolve, reject) {
     // Properties
     self.extension = require('./lib/extension');
+    self.logger = new (require('./lib/logger-lite'))('background');
 
     // Parse config file
     parseConfiguration(self);
@@ -54,32 +56,13 @@ Manager.prototype.initialize = function () {
     setupLiveReload(self);
 
     // Log
-    self.log('Initialized!', self.version, self.cache.name, self);
+    self.logger.log('Initialized!', self.version, self.cache.name, self);
 
     // Return
     return resolve(self);
   });
 };
 
-// Setup logger
-['log', 'error', 'warn', 'info', 'debug'].forEach(method => {
-  Manager.prototype[method] = function() {
-    // Get arguments
-    const time = new Date().toLocaleTimeString('en-US', {
-      hour12: false,
-      hour: '2-digit',
-      minute: '2-digit',
-      second: '2-digit'
-    });
-
-    // Add prefix
-    const args = [`[${time}] background:`, ...Array.from(arguments)];
-
-    // Call the original console method
-    console[method].apply(console, args);
-  };
-});
-
 // Parse configuration
 function parseConfiguration(self) {
   try {
@@ -87,9 +70,9 @@ function parseConfiguration(self) {
     self.cache.breaker = new Date().getTime();
     self.cache.name = `${self.app}-${self.cache.breaker}`;
 
-    self.log('Parsed configuration', self.config);
+    self.logger.log('Parsed configuration', self.config);
   } catch (e) {
-    self.error('Error parsing configuration', e);
+    self.logger.error('Error parsing configuration', e);
   }
 }
 
@@ -118,10 +101,10 @@ function setupListeners(self) {
     const clickAction = payload.click_action || data.click_action || '/';
 
     // Log
-    self.log('Event: notificationclick event', event);
-    self.log('Event: notificationclick data', data);
-    self.log('Event: notificationclick payload', payload);
-    self.log('Event: notificationclick clickAction', clickAction);
+    self.logger.log('Event: notificationclick event', event);
+    self.logger.log('Event: notificationclick data', data);
+    self.logger.log('Event: notificationclick payload', payload);
+    self.logger.log('Event: notificationclick clickAction', clickAction);
 
     // Handle the click
     event.waitUntil(
@@ -153,14 +136,14 @@ function setupListeners(self) {
       if (data.command === '') { return };
 
       // Log
-      self.log('Event: postMessage', data);
+      self.logger.log('Event: postMessage', data);
 
       // Handle the command
       if (data.command === 'function') {
         data.args.function = data.args.function || function() {};
         data.args.function();
       } else if (data.command === 'debug') {
-        self.log('Debug data =', data);
+        self.logger.log('Debug data =', data);
         event.ports[0].postMessage(response);
       } else if (data.command === 'skipWaiting') {
         self.skipWaiting();
@@ -190,13 +173,13 @@ function setupListeners(self) {
             pagesToCache
           )
           .then(() => {
-            self.log('Cached resources.');
+            self.logger.log('Cached resources.');
             event.ports[0].postMessage(response);
           })
           .catch(() => {
             response.status = 'fail';
             event.ports[0].postMessage(response);
-            self.log('Failed to cache resources.')
+            self.logger.log('Failed to cache resources.')
           });
         })
       }
@@ -210,12 +193,12 @@ function setupListeners(self) {
       try { event.ports[0].postMessage(response) } catch (e) {}
 
       // Log
-      self.log('Failed to receive message:', data, e);
+      self.logger.log('Failed to receive message:', data, e);
     }
   });
 
   // Log
-  self.log('Set up listeners');
+  self.logger.log('Set up listeners');
 }
 
 // Import Firebase
@@ -258,16 +241,16 @@ function setupLiveReload(self) {
     connection = new WebSocket(address);
 
     // Log connection
-    self.log(`Reload connecting to ${address}...`);
+    self.logger.log(`Reload connecting to ${address}...`);
 
     // Log connection errors
     connection.onerror = (e) => {
-      self.error('Reload connection got error:', e);
+      self.logger.error('Reload connection got error:', e);
     };
 
     // Log when set up correctly
     connection.onopen = () => {
-      self.log('Reload connection set up!');
+      self.logger.log('Reload connection set up!');
 
       // Reload the extension only on reconnections
       if (isReconnecting) {
@@ -284,7 +267,7 @@ function setupLiveReload(self) {
       const seconds = 1;
 
       // Log
-      self.log(`Reload connection closed. Attempting to reconnect in ${seconds} second(s)...`);
+      self.logger.log(`Reload connection closed. Attempting to reconnect in ${seconds} second(s)...`);
 
       // Set the reconnection flag
       isReconnecting = true;
@@ -303,7 +286,7 @@ function setupLiveReload(self) {
       const data = JSON.parse(event.data);
 
       // Log
-      self.log('Reload connection got message:', data);
+      self.logger.log('Reload connection got message:', data);
 
       // Handle reload command
       if (data && data.command === 'reload') {
@@ -313,7 +296,7 @@ function setupLiveReload(self) {
   }
 
   function reload() {
-    self.log('Reloading extension...');
+    self.logger.log('Reloading extension...');
     setTimeout(() => {
       self.extension.runtime.reload();
     }, 1000);

package/dist/build.js

@@ -96,7 +96,7 @@ Manager.getLiveReloadPort = function () {
   process.env.BXM_LIVERELOAD_PORT = process.env.BXM_LIVERELOAD_PORT || 35729;
 
   // Return the port
-  return process.env.BXM_LIVERELOAD_PORT;
+  return parseInt(process.env.BXM_LIVERELOAD_PORT);
 }
 Manager.prototype.getLiveReloadPort = Manager.getLiveReloadPort;
 

package/dist/content.js

@@ -5,8 +5,9 @@ function Manager() {
   const self = this;
 
   // Properties
-  self.affiliatizer = null;
   self.extension = null;
+  self.logger = null;
+  self.affiliatizer = null;
 
   // Return
   return self;
@@ -18,35 +19,17 @@ Manager.prototype.initialize = function () {
 
   return new Promise(function(resolve, reject) {
     // Properties
-    self.affiliatizer = require('./lib/affiliatizer').initialize(self);
     self.extension = require('./lib/extension');
+    self.logger = new (require('./lib/logger-lite'))('content');
+    self.affiliatizer = require('./lib/affiliatizer').initialize(self);
 
     // Log
-    self.log('Initialized!', self);
+    self.logger.log('Initialized!', self);
 
     // Return
     return resolve(self);
   });
 };
 
-// Setup logger
-['log', 'error', 'warn', 'info', 'debug'].forEach(method => {
-  Manager.prototype[method] = function() {
-    // Get arguments
-    const time = new Date().toLocaleTimeString('en-US', {
-      hour12: false,
-      hour: '2-digit',
-      minute: '2-digit',
-      second: '2-digit'
-    });
-
-    // Add prefix
-    const args = [`[${time}] content:`, ...Array.from(arguments)];
-
-    // Call the original console method
-    console[method].apply(console, args);
-  };
-});
-
 // Export
 module.exports = Manager;

package/dist/defaults/src/assets/js/background.js

@@ -7,9 +7,12 @@ const Manager = new (require('browser-extension-manager/background'));
 // Initialize
 Manager.initialize()
 .then(() => {
+  // Shortcuts
+  const { extension, logger } = Manager;
+
   // Do other initialization tasks here
   // ...
 
   // Log the initialization
-  Manager.log('Initialized!');
+  logger.log('Initialized!');
 });

package/dist/defaults/src/assets/js/content.js

@@ -4,9 +4,12 @@ const Manager = new (require('browser-extension-manager/content'));
 // Initialize
 Manager.initialize()
 .then(() => {
+  // Shortcuts
+  const { extension, logger, affiliatizer } = Manager;
+
   // Do other initialization tasks here
   // ...
 
   // Log the initialization
-  Manager.log('Initialized!');
+  logger.log('Initialized!');
 });

package/dist/defaults/src/assets/js/options.js

@@ -2,13 +2,16 @@
 const Manager = new (require('browser-extension-manager'));
 
 // Import themes
-const bootstrap = require('/node_modules/browser-extension-manager/dist/assets/themes/bootstrap/5.3.3/js/bootstrap.bundle.js');
+window.bootstrap = require('/node_modules/browser-extension-manager/dist/assets/themes/bootstrap/5.3.3/js/bootstrap.bundle.js');
 
 // Initialize
 Manager.initialize(() => {
+  // Shortcuts
+  const { extension, logger } = Manager;
+
   // Do other initialization tasks here
   // ...
 
   // Log the initialization
-  Manager.log('Initialized!');
+  logger.log('Initialized!');
 })

package/dist/defaults/src/assets/js/popup.js

@@ -2,13 +2,16 @@
 const Manager = new (require('browser-extension-manager'));
 
 // Import themes
-const bootstrap = require('/node_modules/browser-extension-manager/dist/assets/themes/bootstrap/5.3.3/js/bootstrap.bundle.js');
+window.bootstrap = require('/node_modules/browser-extension-manager/dist/assets/themes/bootstrap/5.3.3/js/bootstrap.bundle.js');
 
 // Initialize
 Manager.initialize(() => {
+  // Shortcuts
+  const { extension, logger } = Manager;
+
   // Do other initialization tasks here
   // ...
 
   // Log the initialization
-  Manager.log('Initialized!');
+  logger.log('Initialized!');
 })

package/dist/gulp/tasks/serve.js

@@ -15,19 +15,29 @@ module.exports = function serve(complete) {
   // Log
   logger.log('Starting...');
 
-  // Get the local URL
-  const server = new WebSocket.Server({ port: Manager.getLiveReloadPort() })
+  try {
+    // Get the local URL
+    const server = new WebSocket.Server({ port: Manager.getLiveReloadPort() })
 
-  // Log
-  logger.log(`LiveReload server started on port ${Manager.getLiveReloadPort()}`);
+    // Log
+    logger.log(`LiveReload server started on port ${Manager.getLiveReloadPort()}`);
+
+    // Log connection
+    server.on('connection', (socket, request) => {
+      logger.log(`LiveReload client connected from local IP: ${request.socket.localAddress}`);
+    });
 
-  // Log connection
-  server.on('connection', (socket, request) => {
-    logger.log(`LiveReload client connected from local IP: ${request.socket.localAddress}`);
-  });
+    // Handle errors
+    server.on('error', (error) => {
+      logger.error('WebSocket error:', error);
+    });
 
-  // Set server
-  global.websocket = server;
+    // Set server
+    global.websocket = server;
+  } catch (error) {
+    // Log error
+    logger.error('Error starting LiveReload server:', error);
+  }
 
   // Complete
   return complete();

package/dist/gulp/tasks/webpack.js

@@ -204,6 +204,12 @@ function getReplaceOptions() {
       extension: {},
       validRedirectHosts: ['itwcreativeworks.com'],
       settings: {
+        refreshNewVersion: {
+          enabled: false,
+        },
+        exitPopup: {
+          enabled: false,
+        },
         libraries: {
           firebase_app: {
             enabled: !!options.firebaseConfig.apiKey,

package/dist/index.js

@@ -5,6 +5,11 @@ const WebManager = require('web-manager');
 function Manager() {
   const self = this;
 
+  // Properties
+  self.webManager = null;
+  self.extension = null;
+  self.logger = null;
+
   // Return
   return self;
 }
@@ -16,34 +21,16 @@ Manager.prototype.initialize = function (callback) {
   const configuration = JSON.parse('%%% webManagerConfiguration %%%');
 
   // Initiate the web manager
-  self.manager = new WebManager();
+  self.webManager = new WebManager();
   self.extension = require('./lib/extension');
+  self.logger = new (require('./lib/logger-lite'))('popup');
 
   // Initialize
-  self.manager.init(configuration, callback);
+  self.webManager.init(configuration, callback);
 
   // Return
-  return self.manager;
+  return self.webManager;
 };
 
-// Setup logger
-['log', 'error', 'warn', 'info', 'debug'].forEach(method => {
-  Manager.prototype[method] = function() {
-    // Get arguments
-    const time = new Date().toLocaleTimeString('en-US', {
-      hour12: false,
-      hour: '2-digit',
-      minute: '2-digit',
-      second: '2-digit'
-    });
-
-    // Add prefix
-    const args = [`[${time}] content:`, ...Array.from(arguments)];
-
-    // Call the original console method
-    console[method].apply(console, args);
-  };
-});
-
 // Export
 module.exports = Manager;

package/dist/lib/affiliatizer.js

@@ -1,7 +1,3 @@
-// Libraries
-const ext = require('./extension.js');
-const storage = ext.storage;
-
 // Suppported affiliates
 const map = [
   // Amazon
@@ -113,7 +109,11 @@ Affiliatizer.get = function () {
   return map;
 };
 
-Affiliatizer.initialize = async function (parent) {
+Affiliatizer.initialize = async function (Manager) {
+  // Shortcuts
+  const { extension, logger } = Manager;
+  const { storage } = extension;
+
   // Parse the URL
   const url = new URL(window.location.href);
   const query = url.searchParams;
@@ -124,23 +124,23 @@ Affiliatizer.initialize = async function (parent) {
   // Check if the URL has the affiliatizerStatus parameter
   if (qsStatus === 'reset') {
     // Log
-    parent.log('Resetting affiliatizer data...');
+    logger.log('Resetting affiliatizer data...');
 
     // Reset the data
     await storage.set({ affiliatizer: null });
     query.delete('affiliatizerStatus');
 
     // Log
-    parent.log('Reset!');
+    logger.log('Reset!');
   } else if (qsStatus === 'block') {
     // Log
-    parent.log('Affiliatizer is blocked.');
+    logger.log('Affiliatizer is blocked.');
 
     // Set affiliatizer to 'block' in storage
     await storage.set({ affiliatizer: 'block' });
   } else if (qsStatus === 'allow') {
     // Log
-    parent.log('Affiliatizer is allowed.');
+    logger.log('Affiliatizer is allowed.');
 
     // Set affiliatizer to 'allow' in storage
     await storage.set({ affiliatizer: 'allow' });
@@ -152,7 +152,7 @@ Affiliatizer.initialize = async function (parent) {
 
   // Check if it's blocked
   if (status === 'block') {
-    parent.log('Affiliatizer is blocked.');
+    logger.log('Affiliatizer is blocked.');
     return;
   }
 
@@ -162,7 +162,7 @@ Affiliatizer.initialize = async function (parent) {
     const id = item.id;
 
     // Log
-    // parent.log('Checking for', id, item.match, 'in', url.hostname, '...');
+    // logger.log('Checking for', id, item.match, 'in', url.hostname, '...');
 
     // Check if the item matches
     if (!item.match.test(url.hostname)) {
@@ -172,7 +172,7 @@ Affiliatizer.initialize = async function (parent) {
     // Process
     storage.get((data) => {
       // Log
-      parent.log('Matched', data);
+      logger.log('Matched', data);
 
       // Set the default data
       const now = new Date();
@@ -205,7 +205,7 @@ Affiliatizer.initialize = async function (parent) {
       }
 
       // Log
-      parent.log('Redirecting...', newURL.toString());
+      logger.log('Redirecting...', newURL.toString());
 
       // Save to storage
       const newTimestamp = {

package/dist/lib/logger-lite.js

@@ -0,0 +1,34 @@
+// Libraries
+
+// Logger class
+function Logger(name) {
+  const self = this;
+
+  // Properties
+  self.name = name;
+}
+
+// Loop through log, error, warn, and info and make methods that log to console with the name and time [xx:xx:xx] name: message
+// Setup logger
+['log', 'error', 'warn', 'info', 'debug'].forEach(method => {
+  Logger.prototype[method] = function () {
+    const self = this;
+
+    // Get arguments
+    const time = new Date().toLocaleTimeString('en-US', {
+      hour12: false,
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit'
+    });
+
+    // Add prefix
+    const args = [`[${time}] ${self.name}:`, ...Array.from(arguments)];
+
+    // Call the original console method
+    console[method].apply(console, args);
+  };
+});
+
+// Export
+module.exports = Logger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-extension-manager",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Browser Extension Manager dependency manager",
   "main": "dist/index.js",
   "exports": {