pushy-electron 1.0.7 → 1.0.10

package/package.json

@@ -6,20 +6,21 @@
   "main": "lib/Pushy.js",
   "typings": "lib/Pushy.d.ts",
   "//": "Also update version in config.js",
-  "version": "1.0.7",
+  "version": "1.0.10",
   "scripts": {
     "dev": "electron electron.js"
   },
   "dependencies": {
     "electron-store": "^5.1.0",
-    "mqtt": "^3.0.0",
-    "node-fetch": "^2.6.0"
+    "mqtt": "^4.3.7",
+    "node-fetch": "^2.6.7",
+    "packpath": "^0.1.0"
   },
   "devDependencies": {
-    "electron": "^7.1.2"
+    "electron": "^15.5.5"
   },
   "bugs": {
-    "url": "https://github.com/pushy-me/pushy-electron/issues"
+    "url": "https://github.com/pushy/pushy-electron/issues"
   },
-  "homepage": "https://github.com/pushy-me/pushy-electron#readme"
+  "homepage": "https://github.com/pushy/pushy-electron#readme"
 }

package/util/api.js

@@ -1,6 +1,6 @@
 const config = require('../config');
-const fetch = require('node-fetch').default; // Workaround for #2: https://github.com/pushy-me/pushy-electron/issues/2
-const localStorage = new (require('electron-store'))();
+const localStorage = require('./storage');
+const fetch = require('node-fetch').default; // Workaround for #2: https://github.com/pushy/pushy-electron/issues/2
 
 module.exports = {
     async get(path, options) {

package/util/mqtt.js

@@ -1,6 +1,6 @@
 const config = require('../config');
+const localStorage = require('./storage');
 const mqtt = require('mqtt/lib/connect');
-const localStorage = new (require('electron-store'))();
 
 module.exports = {
     connect(Pushy) {

package/util/storage.js

@@ -0,0 +1,46 @@
+const path = require('path');
+const packpath = require('packpath');
+const Store = require('electron-store');
+
+// Cached electron-store object
+let localStorage;
+
+// Expose getter & setter methods
+module.exports = {
+    get(key) {
+        return getLocalStorage().get(key);
+    },
+    set(key, value) {
+        return getLocalStorage().set(key, value);
+    }
+};
+
+function getLocalStorage() {
+    // Already cached?
+    if (localStorage) {
+        return localStorage;
+    }
+
+    // Default electron-store options
+    const options = {};
+
+    try {
+        // Get Node.js package name from package.json
+        const packageJson = require(path.join(packpath.parent(), 'package.json'));
+
+        // Use name specified in package.json for electron-store config file name
+        if (packageJson && packageJson.name) {
+            options.name = packageJson.name;
+        }
+    }
+    catch (exc) {
+        // Ignore errors if unable to find package.json
+        // Defaults to 'config.json'
+    }
+
+    // Cache electron-store object for subsequent calls
+    localStorage = new Store(options);
+
+    // All done
+    return localStorage;
+};