Bladeren bron

Unify firefox and chrome webextensions

Johannes Zellner 11 jaren geleden
bovenliggende
commit
19112128bd

+ 2 - 1
app.js

@@ -39,7 +39,8 @@ router.get ('/api/logout', routes.auth, routes.logout);
 
 router.get ('/api/healthcheck', routes.healthcheck);
 
-router.get('/api/extensions/chrome', extensions.chrome);
+router.get('/api/extensions/chrome.crx', extensions.chrome);
+router.get('/api/extensions/firefox.xpi', extensions.firefox);
 
 app.use(morgan('dev', { immediate: false, stream: { write: function (str) { console.log(str.slice(0, -1)); } } }));
 app.use(serveStatic(__dirname + '/public'));

+ 10 - 0
build_firefox_extension.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+echo "Build firefox webextension"
+
+cd webextension/
+zip -r ../webextension.xpi *
+
+echo "Done"

+ 0 - 28
chrome_extension.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCk0EKu3dvntfu4
-wmqoQLMpLxL6uEyHBI1nYqWfPOkEikokHJRtcACC3KG3f8hIuNgZ/EG61e4VDXhN
-FhC6pzLReZgLagdnKTeW0eccLX5OPz/usjGdU41Q7hZjhFT+LXL17CWdMZ1uaLVh
-SihKvK49KR8+p+kaobwkVaIdhKFM8pnOtPuD2eIDNlujjhmuQ65CAVrVt3gdYET1
-BSbT1Qi+AlUCvJ7Zt6CZpHOh4RXIseGLp+B1sHLCtw7KG5D8/p+yEGow0jGh06Bi
-gSOyGp/uPnWBbdd8cIS2ptFM6Eo4tL6h4KgvbJnReruwXd1Rlb9zTyjCI/ZTtKaJ
-SdHOV3zZAgMBAAECggEASrmqIkKw+8PFF6X+Wb7L/HY9crOw7t6fhipx0Vr6g3Z3
-2xuiKGRJtwt1vw8Orfow8McwvhdU1PLAgqLofthj8BnjV/mA1cMYUydkU6BEzhFb
-WUwttpk1T2ZDfGd5aa0NnHavLzBZor+SzUOkNQ6LKWvFoNDcnZiLByZUVHHX+Fyk
-HGsSzhSvuH5bcXNOUVvdBPqk8kr0YeEdtVCpjUBnuRnNay3GXbF5/Jk7pSvOXCXY
-n6yFFJPdf8hHVZdanNyGfnOO41ZHILdmPdaPlrjm7UuXs2GZTfzl2k+qFCx9VEo0
-jJcYxwRcWj88u71/S1Qpzah/Y5GBuuhEgrUBxKVKCQKBgQDQFGWNu4UxmSnNhbg9
-w3ExtcbnVOL38LTIhm2HFxK8Loka0IuzLoVN36RJSf3CkhqelTYDXk2XTbNM7CcF
-6z8uGTnkVxtYDXAV1vC5WyFPuia8LmHf7NDAXQUTfSd9Rt3sEgG1ULeExRQDAtsK
-ensSdRc2aEy61xe62hvcFA6R8wKBgQDKxQ1a2mBAtpIqE00DUZYArz6WVgvo2GFl
-h0OHkCYBjvXwu2zai7eONQTeCo9ugefPPmz/ffiTgPUnL5+7Fw/4Le/S1J7/kLbP
-X0GoYJWipt0LRC63RqY63w4aexwg+SYp6n3OX7SfVrRfbisKURYvmuWXTVcyAZWI
-mRf4F1/dAwKBgE12qm/fVbCnQoa+t15W+jb1Yz0Pvwdq1wKn+PKHxnPEJ0qSRM/K
-C9p33aNjJlNfLQXIqrkKTHx9cri6WbS8ZWL2BTVasFVRe17GDAwVPwt9U5pO8iT4
-9qYGezNMLn1W+ps+AODNUeTdsZuFXqJCArtWV/PrVFViafUn6aM+3EW9AoGBALkY
-0k0aRX0tbBXukoGyCz1Ku9Zea/a894PHyzRHuPn5N7buULrbic7NxUiv2SjmeuZr
-NPKxWqXDtYZ06dnOfqxtupv5rb7bqpV4fiYnLNFSgzuSnRZ+7qWVEnnH4fCTn2vp
-+7fVE7vUWUk39yAuzxLb0jOgzTT/zzHnlsLJC6BjAoGAXcBuvsgqVm+iAeI781a1
-KyZyY25WPsBq58hOgdmPRNqKMEJDe8Tn6GvGcyrWFyxG3+r/H+GGjaIyo6xAOIGt
-FuVYKJdKL7GRkUmvQZRevkW51N8pMk5Kmkh8MglDjOZKXttd55w/MugLEYJAF7wu
-RYLXYG9kGiRVFeHYlIPtCcg=
------END PRIVATE KEY-----

+ 4 - 1
frontend/index.html

@@ -183,7 +183,10 @@
           <div class="section">
             <h5>Extension</h5>
             <p>
-              <a class="btn btn-raised" href="/api/extensions/chrome">Chrome</a>
+              <a class="btn btn-raised" href="/api/extensions/chrome.crx">Chrome</a>
+              <br/>
+              <br/>
+              <a class="btn btn-raised" href="/api/extensions/firefox.xpi">Firefox</a>
             </p>
           </div>
         </div>

+ 8 - 2
gulpfile.js

@@ -57,10 +57,16 @@ gulp.task('3rdparty', function () {
 });
 
 gulp.task('chrome_extension', function () {
-    run('chromium --pack-extension=chrome_extension --pack-extension-key=chrome_extension.pem').exec();
+    run('chromium --pack-extension=webextension --pack-extension-key=webextension.pem').exec();
 });
 
-gulp.task('default', ['clean', 'html', 'favicon', 'styles', 'browserify', '3rdparty'], function() {});
+gulp.task('firefox_extension', function () {
+    run('/bin/bash build_firefox_extension.sh').exec();
+});
+
+gulp.task('extensions', ['chrome_extension', 'firefox_extension'], function () {});
+
+gulp.task('default', ['clean', 'html', 'favicon', 'styles', 'browserify', '3rdparty'], function () {});
 
 gulp.task('clean', function () {
     del.sync(['public/']);

+ 13 - 2
src/extensions.js

@@ -6,10 +6,12 @@ var path = require('path');
 
 exports = module.exports = {
     init: init,
-    chrome: chrome
+    chrome: chrome,
+    firefox: firefox
 };
 
-var CHROME_FILENAME = path.join(__dirname, '../chrome_extension.crx');
+var CHROME_FILENAME = path.join(__dirname, '../webextension.crx');
+var FIREFOX_FILENAME = path.join(__dirname, '../webextension.xpi');
 
 function init(callback) {
     callback();
@@ -29,3 +31,12 @@ function chrome(req, res) {
         }
   });
 }
+
+function firefox(req, res) {
+    res.sendFile(FIREFOX_FILENAME, {}, function (error) {
+        if (error) {
+            console.error(error);
+            res.status(error.status).end();
+        }
+  });
+}

BIN
chrome_extension.crx → webextension.crx


+ 28 - 0
webextension.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDXQJfQrp2NGtqB
+DxXU52gUZxISEVCNVMjQNQuwa67S4ypj2e1vIzSd2whKIfs3CuuALCIRhFp258Ii
+nUOkuRg0NAIKZNttxIwpqrcXJo+x4SIWhJcwuCX1QNnQzZN1vlu3YfjN3EALc0UG
+a3NVxlSCEmxwjrTX9wYbTtb6Umz3nrb4C4ow92XDcQISRrXd3Ps80O6YmQX8TW2/
+seHFd5ZfnTpwwTJ2iIFOtcBqELjiLUrzNnG+mVyBZEbacIOn6PsVwZjakq6E49K/
+jKXjtxcMYwA34ZHZmZLKjwGH1rUkfSTj38TH2d7MwXSAqDy3O1qvIidQarqJ0I8+
+L3Zk6T5hAgMBAAECggEBAI4ccx6vag0y4Xe7gepiLPDra57KF6h3hW0Q2HrNXUqV
+9/KceomZcK+XYE2xSa35Y6nneUafXyqJsD4yHequ2S/99iruk4BQ90i7EM4UA2Kp
+BFxhhYAA0+6rtiKI1wYxe1QDNsSS2SW2IKgwYKEMo9aMW1Oko/jBeiKlVoFF0fNY
+evnYB5xyVfoUBBYNG5MBsU+dLOTgs/YB0GAPrQ1ugokCU0rqnyR1F85buLB5oohP
+3+jd2y2qUJX/RefNrpviFNZDASh8NurGuFj4Zgo4BbIe27QB7GscipcThfMrYgjt
+nDqvfPgRphVOSKE7B4xjn/pNajUedDrep7O1B1PblBECgYEA/jIUjFNRxMIq3wE1
+JkWqKq9HL0aDYNykhaYhHM0ZHf8Y/GagG8hrpRRBduXGPBrskCpwNHUIGBATJMIv
+BOsl1p9STCjMt2x2Ga2xXA1nrjOKD6d5pr9cNfGRuIjr6jvag1geKz0CQlKMgEcW
+c8Z4GLi4Wm4ZSmAAobpCfJv23qcCgYEA2Me+5MC9HYkPblZhbPI32o5aCGP3iUyv
+wX0hRSowgpqQtniFnIsDlTtzduho87bilUrPonzqMUttgoRwCF9GlOZgxZXu9YQH
+v9cWoEZ0C7T3PuIRuP6Xc2ds3ctjLT2x0WvhFATTycf4/tSQJbdmb4hhNNX110s8
+YDx++tIu47cCgYBO7EWs/AGbUZ31924FIAQhlKJJb19DJ759MIN/ab6urZGYbFSx
+y5yAeLWKsPTHnKRubn7ACsYkknkfJJtsr4XkCTuIIfLN0IMqnd8/cXoLgD0RdzIy
+L5/1r7dK0FhPNZ42wZk8W4jkBrVQ7sFt2OVY56F1klGP4hbQIACcp+ASaQKBgQCA
+xi9kzgXJjMjI37FiOYTqZNOg1lmOiyqAwydHYeeNPeonKvMb6gyH0tglU6w80nBJ
+BTbQrGmmPMth0/CFWKuh+jSUSxu3ZuX/lPLQ5Ok8pxSUm1Cx1zL6j/7Axng0wMhn
+wjDjZna1EACeyICUlxzXtmkgLNWsPfowpN89eiv2gwKBgA+FwbMLOlteHqmsjj3W
+Lcgurt8RZFeFbvqkXMstBG4tMkhYgMTtLEjt/FkvPm35Mt077Z+fYM4m3KK/Ba8M
+h5lMk7rSIdKsOfS+R4UDVTOcr10ri0jlg6fXRDdGxwwwfB9tl2QPEaOzMLNEqlUY
+2zDEJ8fDtjzYl0Cwcv81AhiX
+-----END PRIVATE KEY-----

BIN
webextension.xpi


+ 3 - 2
chrome_extension/detectapp.js → webextension/detectapp.js

@@ -1,9 +1,10 @@
 'use strict';
 
+/* global chrome */
+
 var settingsNode = document.getElementById('guacamoly-settings-node');
 if (settingsNode) {
     try {
-        // implicit return of object
-        JSON.parse(settingsNode.textContent);
+        chrome.runtime.sendMessage(JSON.parse(settingsNode.textContent));
     } catch (e) {}
 }

+ 0 - 0
chrome_extension/logo.png → webextension/logo.png


+ 12 - 2
chrome_extension/manifest.json → webextension/manifest.json

@@ -2,13 +2,23 @@
   "manifest_version": 2,
   "name": "Guacamoly",
   "description": "This extension allows to add the current page as a Guacamoly thing.",
+  "homepage_url": "https://git.nebulon.info/nebulon/holyguacamoly",
   "icons": { "128": "logo.png" },
   "version": "0.1.0",
   "browser_action": {
+    "default_title": "Guacamoly",
     "default_icon": "logo.png",
     "default_popup": "popup.html"
   },
   "permissions": [
     "activeTab"
-  ]
-}
+  ],
+  "web_accessible_resources": [
+    "logo.png"
+  ],
+  "applications": {
+    "gecko": {
+      "id": "guacamoly@nebulon.de"
+    }
+  }
+}

+ 0 - 0
chrome_extension/popup.css → webextension/popup.css


+ 5 - 10
chrome_extension/popup.html → webextension/popup.html

@@ -1,16 +1,10 @@
-
 <!doctype html>
-<!--
- This page is shown when the extension button is clicked, because the
- "browser_action" field in manifest.json contains the "default_popup" key with
- value "popup.html".
- -->
 <html>
   <head>
-    <title>Guacamoly</title>
 
+    <title>Guacamoly</title>
+    <meta charset="utf-8">
     <link rel="stylesheet" href="popup.css">
-    <script src="popup.js"></script>
 
   </head>
   <body>
@@ -19,7 +13,7 @@
       <br/>
       <button id="actionAdd">Add</button>
     </div>
-    <div id="setup" class="hide">
+    <div id="setup" class="">
       <p>Please visit your Guacamoly app</p>
     </div>
     <div id="home" class="hide">
@@ -38,6 +32,7 @@
     <div id="busy" class="hide">
       <center><i class="spinner"></i></center>
     </div>
+
+    <script src="popup.js"></script>
   </body>
 </html>
-

+ 11 - 11
chrome_extension/popup.js → webextension/popup.js

@@ -1,13 +1,20 @@
 'use strict';
 
-// Query filter to be passed to chrome.tabs.query - see
-// https://developer.chrome.com/extensions/tabs#method-query
+/* global chrome */
+
 var queryInfo = {
     active: true,
     currentWindow: true
 };
 
-// localStorage.settingsUrl = 'https://things.nebulon.info/api/things?token=70c40f76-75cb-49a0-bf97-e06815208baf';
+chrome.runtime.onMessage.addListener(function (msg, sender) {
+    if (msg.origin && msg.token && msg.title) {
+        localStorage.origin = msg.origin;
+        localStorage.token = msg.token;
+        localStorage.title = msg.title;
+        show('home');
+    }
+});
 
 function getCurrentTabUrl(callback) {
     chrome.tabs.query(queryInfo, function(tabs) {
@@ -17,14 +24,7 @@ function getCurrentTabUrl(callback) {
 
 function tryToDetectSettings() {
     chrome.tabs.query(queryInfo, function(tabs) {
-        chrome.tabs.executeScript(tabs[0].id, { file: 'detectapp.js' }, function (results) {
-            if (results[0] && results[0].origin && results[0].token) {
-                localStorage.origin = results[0].origin;
-                localStorage.token = results[0].token;
-                localStorage.title = results[0].title;
-                show('home');
-            }
-        });
+        chrome.tabs.executeScript(tabs[0].id, { file: 'detectapp.js' });
     });
 }