Fixed export of module functions (#3)

src/helpers.js

@@ -145,4 +145,8 @@ export function clearWait() {
     wait_timeout_id = null;
 }
 
+export function isSet(value) {
+    return typeof value !== 'undefined' && value !== null;
+}
+
 export const _check_url_match_pattern = check_url_match_pattern;

src/index.js

@@ -1,8 +1,23 @@
 // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3
 
 import { Manager } from './manager.js';
-export { Manager };
+import {
+    parseMeta,
+    ajaxGet,
+    getUniqId,
+    getUID,
+    check_meta_match_pattern,
+    wait,
+    clearWait
+} from './helpers.js';
 
-module.exports = {
-    Manager: Manager
+export {
+    Manager,
+    parseMeta,
+    ajaxGet,
+    getUniqId,
+    getUID,
+    check_meta_match_pattern,
+    wait,
+    clearWait
 };

src/manager.js

@@ -1,7 +1,7 @@
 // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3
 
-import * as helpers from './helpers.js';
 import * as migrations from './migrations.js';
+import {parseMeta, ajaxGet, getUID, wait, clearWait, isSet} from './helpers.js';
 
 export class Manager {
     constructor(config) {
@@ -62,18 +62,18 @@ export class Manager {
             } catch {
                 // Ignore if there is no message receiver
             }
-            await helpers.wait(seconds);
+            await wait(seconds);
         }
 
         clearInterval(this.progress_interval_id);
         this.progress_interval_id = setInterval(async () => {
-            await this._showProgress(true);
+            this.progressbar(true);
         }, 300);
         try {
-            const response = await helpers.ajaxGet(url, variant);
+            const response = await ajaxGet(url, variant);
             if (response) {
                 clearInterval(this.progress_interval_id);
-                await this._showProgress(false);
+                this.progressbar(false);
             }
             return response;
         } catch {
@@ -85,14 +85,6 @@ export class Manager {
         }
     }
 
-    async _showProgress(value) {
-        try {
-            this.progressbar(value);
-        } catch {
-            // Ignore if there is no message receiver
-        }
-    }
-
     async checkUpdates(force) {
         const local = await this.storage.get([
             'channel',
@@ -133,10 +125,10 @@ export class Manager {
         if (this.channel === 'local') update_check_interval = 5; // check every 5 seconds
 
         if (
-            local[this.channel + '_last_modified'] === null ||
-            local.last_check_update === null
+            !isSet(local[this.channel + '_last_modified']) ||
+            !isSet(local.last_check_update)
         ) {
-            helpers.clearWait();
+            clearWait();
             clearTimeout(this.update_timeout_id);
             this.update_timeout_id = null;
             await this._downloadMeta(local, null);
@@ -146,7 +138,7 @@ export class Manager {
                 update_check_interval -
                 local.last_check_update;
             if (time_delta >= 0 || force) {
-                helpers.clearWait();
+                clearWait();
                 clearTimeout(this.update_timeout_id);
                 this.update_timeout_id = null;
                 const last_modified = await this._getUrl(
@@ -242,7 +234,7 @@ export class Manager {
             if ('plugins' in categories[cat]) {
                 Object.keys(categories[cat]['plugins']).forEach(id => {
                     const plugin = categories[cat]['plugins'][id];
-                    plugin['uid'] = helpers.getUID(plugin);
+                    plugin['uid'] = getUID(plugin);
                     plugin['status'] = 'off';
                     plugin['category'] = cat;
                     plugins[plugin['uid']] = plugin;
@@ -308,7 +300,7 @@ export class Manager {
                     // download meta info
                     const response_meta = await this._getUrl(plugin['updateURL'] + hash);
                     if (response_meta) {
-                        let meta = helpers.parseMeta(response_meta);
+                        let meta = parseMeta(response_meta);
                         // if new version
                         if (
                             meta &&
@@ -337,7 +329,7 @@ export class Manager {
 
     async _updateLocalPlugins(plugins_flat, plugins_local) {
         // If no plugins installed
-        if (plugins_local === null) return {};
+        if (!isSet(plugins_local)) return {};
 
         // Iteration local plugins
         for (const uid of Object.keys(plugins_local)) {
@@ -365,8 +357,8 @@ export class Manager {
         let plugins_local = local[this.channel + '_plugins_local'];
         let plugins_user = local[this.channel + '_plugins_user'];
 
-        if (plugins_local === null) plugins_local = {};
-        if (plugins_user === null) plugins_user = {};
+        if (!isSet(plugins_local)) plugins_local = {};
+        if (!isSet(plugins_user)) plugins_user = {};
 
         if (action === 'on') {
             if (
@@ -381,7 +373,7 @@ export class Manager {
                     plugins_local[uid]['status'] = 'on';
                 }
 
-                await this.inject_user_script(
+                this.inject_user_script(
                     plugins_flat[uid]['user'] === true
                         ? plugins_user[uid]['code']
                         : plugins_local[uid]['code']
@@ -402,7 +394,7 @@ export class Manager {
                     plugins_local[uid] = plugins_flat[uid];
                     plugins_local[uid]['code'] = response;
 
-                    await this.inject_user_script(plugins_local[uid]['code']);
+                    this.inject_user_script(plugins_local[uid]['code']);
 
                     await this._save({
                         plugins_flat: plugins_flat,
@@ -455,13 +447,13 @@ export class Manager {
         let plugins_local = local[this.channel + '_plugins_local'];
         let plugins_user = local[this.channel + '_plugins_user'];
 
-        if (plugins_local === null) plugins_local = {};
-        if (plugins_user === null) plugins_user = {};
+        if (!isSet(plugins_local)) plugins_local = {};
+        if (!isSet(plugins_user)) plugins_user = {};
 
         scripts.forEach(script => {
             let meta = script['meta'];
             const code = script['code'];
-            const plugin_uid = helpers.getUID(meta);
+            const plugin_uid = getUID(meta);
 
             if (plugin_uid === null) throw new Error('The plugin has an incorrect ==UserScript== header');
 
@@ -514,8 +506,8 @@ export class Manager {
         plugins_user
     ) {
         let data = {};
-        if (plugins_local === null) plugins_local = {};
-        if (plugins_user === null) plugins_user = {};
+        if (!isSet(plugins_local)) plugins_local = {};
+        if (!isSet(plugins_user)) plugins_user = {};
 
         if (raw_plugins['Obsolete'] !== undefined) delete raw_plugins['Obsolete'];
         if (raw_plugins['Deleted'] !== undefined) delete raw_plugins['Deleted'];

src/migrations.js

@@ -1,5 +1,7 @@
 // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3
 
+import {isSet} from './helpers.js';
+
 export async function migrate(storage) {
 
     const migrates = [
@@ -13,7 +15,7 @@ export async function migrate(storage) {
         'storage_version'
     ]);
 
-    if (local['storage_version'] === null && local['lastversion'] !== null) {
+    if (!isSet(local['storage_version']) && isSet(local['lastversion'])) {
         local['storage_version'] = 0;
     }
 
@@ -33,7 +35,7 @@ export async function migrate(storage) {
 
 async function migration_0001(local) {
     for (let channel of Object.keys(local)) {
-        if (local[channel] === null) continue;
+        if (!isSet(local[channel])) continue;
 
         for (let plugin of Object.keys(local[channel])) {
             const plugin_obj = local[channel][plugin];

test/manager.spec.js

@@ -36,6 +36,9 @@ describe('manage.js integration tests', function () {
             inject_user_script: function callBack(data){
                 expect(data).to.include('// ==UserScript==');
             },
+            progressbar: function callBack(is_show){
+                expect(is_show).to.be.oneOf([true, false]);
+            },
             is_daemon: false,
         };
         manager = new Manager(params);