Fix notification registration on installing the wallet.
This commit is contained in:
Florian Dold
parent
13a8f36cad
commit
fe0689980f
@ -35,14 +35,35 @@ var TalerNotify;
|
||||
return url;
|
||||
}
|
||||
var handlers = [];
|
||||
var port = chrome.runtime.connect();
|
||||
port.onDisconnect.addListener(function () {
|
||||
console.log("chrome runtime disconnected");
|
||||
var connected = false;
|
||||
// Hack to know when the extension is unloaded
|
||||
var port;
|
||||
var connect = function (dh) {
|
||||
port = chrome.runtime.connect();
|
||||
port.onDisconnect.addListener(dh);
|
||||
chrome.runtime.sendMessage({ type: "ping" }, function () {
|
||||
console.log("registering handlers");
|
||||
connected = true;
|
||||
registerHandlers();
|
||||
});
|
||||
};
|
||||
var disconectHandler = function () {
|
||||
if (connected) {
|
||||
console.log("chrome runtime disconnected, removing handlers");
|
||||
for (var _i = 0, handlers_1 = handlers; _i < handlers_1.length; _i++) {
|
||||
var handler = handlers_1[_i];
|
||||
document.removeEventListener(handler.type, handler.listener);
|
||||
}
|
||||
});
|
||||
}
|
||||
else {
|
||||
// We got disconnected before the extension was ready, reconnect ...
|
||||
window.setTimeout(function () {
|
||||
connect(disconectHandler);
|
||||
}, 200);
|
||||
}
|
||||
};
|
||||
connect(disconectHandler);
|
||||
function registerHandlers() {
|
||||
var $ = function (x) { return document.getElementById(x); };
|
||||
function addHandler(type, listener) {
|
||||
document.addEventListener(type, listener);
|
||||
@ -63,7 +84,6 @@ var TalerNotify;
|
||||
}
|
||||
});
|
||||
document.dispatchEvent(evt);
|
||||
console.log("handshake done");
|
||||
});
|
||||
addHandler("taler-create-reserve", function (e) {
|
||||
console.log("taler-create-reserve with " + JSON.stringify(e.detail));
|
||||
@ -218,5 +238,6 @@ var TalerNotify;
|
||||
};
|
||||
});
|
||||
});
|
||||
}
|
||||
})(TalerNotify || (TalerNotify = {}));
|
||||
//# sourceMappingURL=notify.js.map
|
||||
@ -45,14 +45,38 @@ namespace TalerNotify {
|
||||
|
||||
let handlers = [];
|
||||
|
||||
let port = chrome.runtime.connect();
|
||||
port.onDisconnect.addListener(() => {
|
||||
console.log("chrome runtime disconnected");
|
||||
let connected = false;
|
||||
|
||||
// Hack to know when the extension is unloaded
|
||||
let port;
|
||||
|
||||
let connect = (dh) => {
|
||||
port = chrome.runtime.connect();
|
||||
port.onDisconnect.addListener(dh);
|
||||
chrome.runtime.sendMessage({type: "ping"}, () => {
|
||||
console.log("registering handlers");
|
||||
connected = true;
|
||||
registerHandlers();
|
||||
});
|
||||
};
|
||||
|
||||
var disconectHandler = () => {
|
||||
if (connected) {
|
||||
console.log("chrome runtime disconnected, removing handlers");
|
||||
for (let handler of handlers) {
|
||||
document.removeEventListener(handler.type, handler.listener);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
// We got disconnected before the extension was ready, reconnect ...
|
||||
window.setTimeout(() => {
|
||||
connect(disconectHandler);
|
||||
}, 200);
|
||||
}
|
||||
};
|
||||
|
||||
connect(disconectHandler);
|
||||
|
||||
function registerHandlers() {
|
||||
let $ = (x) => document.getElementById(x);
|
||||
|
||||
function addHandler(type, listener) {
|
||||
@ -60,7 +84,6 @@ namespace TalerNotify {
|
||||
handlers.push({type, listener});
|
||||
}
|
||||
|
||||
|
||||
addHandler("taler-query-id", function(e) {
|
||||
let evt = new CustomEvent("taler-id", {
|
||||
detail: {
|
||||
@ -77,7 +100,6 @@ namespace TalerNotify {
|
||||
}
|
||||
});
|
||||
document.dispatchEvent(evt);
|
||||
console.log("handshake done");
|
||||
});
|
||||
|
||||
addHandler("taler-create-reserve", function(e: CustomEvent) {
|
||||
@ -249,4 +271,5 @@ namespace TalerNotify {
|
||||
};
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -23,6 +23,7 @@ import {AmountJson} from "./types";
|
||||
import Port = chrome.runtime.Port;
|
||||
import {Notifier} from "./types";
|
||||
import {Contract} from "./types";
|
||||
import MessageSender = chrome.runtime.MessageSender;
|
||||
|
||||
"use strict";
|
||||
|
||||
@ -35,18 +36,21 @@ import {Contract} from "./types";
|
||||
*/
|
||||
|
||||
|
||||
type Handler = (detail: any) => Promise<any>;
|
||||
type Handler = (detail: any, sender: MessageSender) => Promise<any>;
|
||||
|
||||
function makeHandlers(db: IDBDatabase,
|
||||
wallet: Wallet): {[msg: string]: Handler} {
|
||||
return {
|
||||
["balances"]: function(detail) {
|
||||
["balances"]: function(detail, sender) {
|
||||
return wallet.getBalances();
|
||||
},
|
||||
["dump-db"]: function(detail) {
|
||||
["dump-db"]: function(detail, sender) {
|
||||
return exportDb(db);
|
||||
},
|
||||
["reset"]: function(detail) {
|
||||
["ping"]: function(detail, sender) {
|
||||
return Promise.resolve({});
|
||||
},
|
||||
["reset"]: function(detail, sender) {
|
||||
if (db) {
|
||||
let tx = db.transaction(db.objectStoreNames, 'readwrite');
|
||||
for (let i = 0; i < db.objectStoreNames.length; i++) {
|
||||
@ -60,7 +64,7 @@ function makeHandlers(db: IDBDatabase,
|
||||
// Response is synchronous
|
||||
return Promise.resolve({});
|
||||
},
|
||||
["create-reserve"]: function(detail) {
|
||||
["create-reserve"]: function(detail, sender) {
|
||||
const d = {
|
||||
exchange: detail.exchange,
|
||||
amount: detail.amount,
|
||||
@ -68,7 +72,7 @@ function makeHandlers(db: IDBDatabase,
|
||||
const req = CreateReserveRequest.checked(d);
|
||||
return wallet.createReserve(req);
|
||||
},
|
||||
["confirm-reserve"]: function(detail) {
|
||||
["confirm-reserve"]: function(detail, sender) {
|
||||
// TODO: make it a checkable
|
||||
const d = {
|
||||
reservePub: detail.reservePub
|
||||
@ -76,7 +80,7 @@ function makeHandlers(db: IDBDatabase,
|
||||
const req = ConfirmReserveRequest.checked(d);
|
||||
return wallet.confirmReserve(req);
|
||||
},
|
||||
["confirm-pay"]: function(detail) {
|
||||
["confirm-pay"]: function(detail, sender) {
|
||||
let offer;
|
||||
try {
|
||||
offer = Offer.checked(detail.offer);
|
||||
@ -95,7 +99,7 @@ function makeHandlers(db: IDBDatabase,
|
||||
|
||||
return wallet.confirmPay(offer);
|
||||
},
|
||||
["execute-payment"]: function(detail) {
|
||||
["execute-payment"]: function(detail, sender) {
|
||||
return wallet.executePayment(detail.H_contract);
|
||||
},
|
||||
["exchange-info"]: function(detail) {
|
||||
@ -104,18 +108,18 @@ function makeHandlers(db: IDBDatabase,
|
||||
}
|
||||
return wallet.updateExchangeFromUrl(detail.baseUrl);
|
||||
},
|
||||
["reserve-creation-info"]: function(detail) {
|
||||
["reserve-creation-info"]: function(detail, sender) {
|
||||
if (!detail.baseUrl || typeof detail.baseUrl !== "string") {
|
||||
return Promise.resolve({error: "bad url"});
|
||||
}
|
||||
let amount = AmountJson.checked(detail.amount);
|
||||
return wallet.getReserveCreationInfo(detail.baseUrl, amount);
|
||||
},
|
||||
["check-repurchase"]: function(detail) {
|
||||
["check-repurchase"]: function(detail, sender) {
|
||||
let contract = Contract.checked(detail.contract);
|
||||
return wallet.checkRepurchase(contract);
|
||||
},
|
||||
["get-history"]: function(detail) {
|
||||
["get-history"]: function(detail, sender) {
|
||||
// TODO: limit history length
|
||||
return wallet.getHistory();
|
||||
},
|
||||
@ -134,12 +138,12 @@ class ChromeBadge implements Badge {
|
||||
}
|
||||
|
||||
|
||||
function dispatch(handlers, req, sendResponse) {
|
||||
function dispatch(handlers, req, sender, sendResponse) {
|
||||
if (req.type in handlers) {
|
||||
Promise
|
||||
.resolve()
|
||||
.then(() => {
|
||||
const p = handlers[req.type](req.detail);
|
||||
const p = handlers[req.type](req.detail, sender);
|
||||
|
||||
return p.then((r) => {
|
||||
sendResponse(r);
|
||||
@ -224,7 +228,7 @@ export function wxMain() {
|
||||
let handlers = makeHandlers(db, wallet);
|
||||
chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
|
||||
try {
|
||||
return dispatch(handlers, req, sendResponse)
|
||||
return dispatch(handlers, req, sender, sendResponse)
|
||||
} catch (e) {
|
||||
console.log(`exception during wallet handler (dispatch)`);
|
||||
console.log("request", req);
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
"description": "Privacy preserving and transparent payments",
|
||||
"manifest_version": 2,
|
||||
"name": "GNU Taler Wallet (git)",
|
||||
"version": "0.5.15",
|
||||
"version": "0.5.17",
|
||||
|
||||
"applications": {
|
||||
"gecko": {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user