Merge branch 'jchampemont-master'
This commit is contained in:
commit
ed2c7140f0
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "0.1.1",
|
"version": "0.1.2",
|
||||||
"manifestVersion": "0.1.0",
|
"manifestVersion": "0.1.0",
|
||||||
"name": "keewebhttp",
|
"name": "keewebhttp",
|
||||||
"description": "KeeWebHttp allows to use browser extensions with KeeWeb",
|
"description": "KeeWebHttp allows to use browser extensions with KeeWeb",
|
||||||
|
@ -11,8 +11,8 @@
|
||||||
"licence": "MIT",
|
"licence": "MIT",
|
||||||
"url": "https://plugins.keeweb.info/plugins/keewebhttp",
|
"url": "https://plugins.keeweb.info/plugins/keewebhttp",
|
||||||
"resources": {
|
"resources": {
|
||||||
"js": "B0VspfvXSHdbPi6Ed2aHBgeda/hI6PT063yoFBTSbcFmdLGZpPVsTnqG9+xjvhNDZ3Q0PolGiSIN/gUheJxJZ8CJafZF2RrOKHFFz302S9bEtJ8ZdjU/+0iRUIuB8wKHuSOWwCBEVrIN/ZQo2nRgNIOZBYCamAhqsNTVXv0OdJfhUPA4OsI6ca8RmwA3ejYphB+/X7ue5k3xWVeIkH1onSPJ1qOoj89HKB7FS7/bz6wsi/bluXPC5M0rAPbtYhUQMhZJsjBJ53TnZ6a8uRyzYCbp/a0kxl8jwI6aFYGRHbsRZLIIxYP0Qm31pyToZA/8/JHTmlped+isCWXeFaLIcQ=="
|
"js": "xRiIO2Y08FN8Qf/U1I+Ab3WI8UWNnRwVXmV5/XlxKDFUQIoWT1sMLP6pW7IrcUuFJ0zDwag+BlJuutnBt42+WgfRWCAZ2qRV5cRBCQYJ3q4W3JvkWSAfoTulgrmJ5C4ofiN9D8FL567+2eg7ni1BDA0sVrfLsA7SFNRfJ3vULKpeFjJHB6ypwO60v4xm1A8S+Cm3qckmvOA3Bp9WD1M8Gj1t9ULHKT9DYq6QG6rxwGWODqHsQRifFRojp73X5PM2j4GV1tEWASRGYCNmwmA7fCNHFmppk4W7ofpENF1/dbXrxDxqQ/unbHTixPp0oy+6R2Clnb3jOEYw6pnp0wxWLg=="
|
||||||
},
|
},
|
||||||
"publicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0oZB2Kt7AzRFNqf8FuO3C3kepHPAIQYiDPYdQxHcsiaFCwyKVx6K1cE/3vBhb8/2rj+QIIWNfAAuu1Y+2VK90ZBeq6HciukWzQRO/HWhfdy0c7JwDAslmyGI5olj0ZQkNLhkde1MiMxjDPpRhZtdJaryVO5cFJaJESpv3dV6m0qXsaQCluWYOSNfSjP9C8o2zRVjSi3ZQZnZIV5pnk9K2MtlZIPXrN9iJiM5zZ9DTSnqApI6dC9mX4R3LvGN+GTovm9C8Crl+qb106nGRR3LcweicDnPyMtZLa/E0DBpWYxUVLDp6WeLhxoUBr+6+t3Xp9IDnPoANDQXJXD0f1vQxQIDAQAB",
|
"publicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0oZB2Kt7AzRFNqf8FuO3C3kepHPAIQYiDPYdQxHcsiaFCwyKVx6K1cE/3vBhb8/2rj+QIIWNfAAuu1Y+2VK90ZBeq6HciukWzQRO/HWhfdy0c7JwDAslmyGI5olj0ZQkNLhkde1MiMxjDPpRhZtdJaryVO5cFJaJESpv3dV6m0qXsaQCluWYOSNfSjP9C8o2zRVjSi3ZQZnZIV5pnk9K2MtlZIPXrN9iJiM5zZ9DTSnqApI6dC9mX4R3LvGN+GTovm9C8Crl+qb106nGRR3LcweicDnPyMtZLa/E0DBpWYxUVLDp6WeLhxoUBr+6+t3Xp9IDnPoANDQXJXD0f1vQxQIDAQAB",
|
||||||
"desktop": true
|
"desktop": true
|
||||||
}
|
}
|
|
@ -1,4 +1,6 @@
|
||||||
let uninstall;
|
let uninstall;
|
||||||
|
let restart;
|
||||||
|
let serverPort = 19455;
|
||||||
const timeout = setTimeout(run, 500);
|
const timeout = setTimeout(run, 500);
|
||||||
|
|
||||||
function run() {
|
function run() {
|
||||||
|
@ -19,7 +21,6 @@ function run() {
|
||||||
const Generator = require('util/password-generator');
|
const Generator = require('util/password-generator');
|
||||||
const GeneratorPresets = require('comp/generator-presets');
|
const GeneratorPresets = require('comp/generator-presets');
|
||||||
|
|
||||||
const ServerPort = 19455;
|
|
||||||
const Version = '1.8.4.2';
|
const Version = '1.8.4.2';
|
||||||
const DebugMode = localStorage.keewebhttpDebug;
|
const DebugMode = localStorage.keewebhttpDebug;
|
||||||
const FileReadTimeout = 500;
|
const FileReadTimeout = 500;
|
||||||
|
@ -41,6 +42,11 @@ function run() {
|
||||||
stopServer();
|
stopServer();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
restart = function() {
|
||||||
|
stopServer();
|
||||||
|
startServer();
|
||||||
|
};
|
||||||
|
|
||||||
addEventListeners();
|
addEventListeners();
|
||||||
startServer();
|
startServer();
|
||||||
readAllKeys();
|
readAllKeys();
|
||||||
|
@ -91,7 +97,7 @@ function run() {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
const port = ServerPort;
|
const port = serverPort;
|
||||||
const hostname = '127.0.0.1';
|
const hostname = '127.0.0.1';
|
||||||
server.listen(port, hostname, () => {
|
server.listen(port, hostname, () => {
|
||||||
if (uninstalled) {
|
if (uninstalled) {
|
||||||
|
@ -482,6 +488,29 @@ function run() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
module.exports.getSettings = function() {
|
||||||
|
return [{
|
||||||
|
name: 'ServerPort',
|
||||||
|
label: 'Port to listen to (do not change this setting without a special need to do so)',
|
||||||
|
type: 'text',
|
||||||
|
maxlength: 5,
|
||||||
|
placeholder: '19455',
|
||||||
|
value: '19455'
|
||||||
|
}];
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports.setSettings = function(changes) {
|
||||||
|
if (changes.ServerPort) {
|
||||||
|
const port = +changes.ServerPort;
|
||||||
|
if (port > 1024 && port < 65535) {
|
||||||
|
serverPort = port;
|
||||||
|
if (restart) {
|
||||||
|
restart();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
module.exports.uninstall = function() {
|
module.exports.uninstall = function() {
|
||||||
if (uninstall) {
|
if (uninstall) {
|
||||||
uninstall();
|
uninstall();
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
"start": "node scripts/start.js",
|
"start": "node scripts/start.js",
|
||||||
"update": "node scripts/update-plugins.js",
|
"update": "node scripts/update-plugins.js",
|
||||||
"translations": "node scripts/download-translations.js",
|
"translations": "node scripts/download-translations.js",
|
||||||
"watch-plugin": "node ../keeweb/plugins/keeweb-plugin/keeweb-plugin.js watch docs/plugins/theme-nord/ --bump-version --signer-module=/Users/Antelle/Projects/keeweb/keeweb-plugins/scripts/sign.js "
|
"watch-plugin": "node ../keeweb/plugins/keeweb-plugin/keeweb-plugin.js watch docs/plugins/keewebhttp/ --bump-version --signer-module=/Users/Antelle/Projects/keeweb/keeweb-plugins/scripts/sign.js "
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
Loading…
Reference in New Issue