taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

version bump / imports

Browse Source
This commit is contained in:
Florian Dold 2019-08-16 23:29:29 +02:00
parent 6a57ad5fe2
commit 3263d05ce9
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
12 changed files with 79 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -1,5 +1,5 @@
GNU Taler WebExtension Wallet GNU Taler Wallet
============================= ================
Cross-browser GNU Taler wallet written for the WebExtensions API. Cross-browser GNU Taler wallet written for the WebExtensions API.

2
package.json
View File

@ -50,7 +50,7 @@
"@types/urijs": "^1.19.3", "@types/urijs": "^1.19.3",
"axios": "^0.19.0", "axios": "^0.19.0",
"commander": "^2.20.0", "commander": "^2.20.0",
"idb-bridge": "0.0.3", "idb-bridge": "^0.0.5",
"source-map-support": "^0.5.12", "source-map-support": "^0.5.12",
"urijs": "^1.18.10" "urijs": "^1.18.10"
} }

2
packages/idb-bridge/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "idb-bridge", "name": "idb-bridge",
"version": "0.0.5", "version": "0.0.6",
"description": "IndexedDB implementation that uses SQLite3 as storage", "description": "IndexedDB implementation that uses SQLite3 as storage",
"main": "./build/index.js", "main": "./build/index.js",
"types": "./build/index.d.ts", "types": "./build/index.d.ts",

1
packages/idb-bridge/src/MemoryBackend.test.ts
View File

@ -345,5 +345,6 @@ test("export", async t => {
t.deepEqual(exportedData, exportedData2); t.deepEqual(exportedData, exportedData2);
t.is(exportedData.databases["library"].schema.databaseVersion, 42); t.is(exportedData.databases["library"].schema.databaseVersion, 42);
t.is(exportedData2.databases["library"].schema.databaseVersion, 42);
t.pass(); t.pass();
}); });

2
packages/idb-bridge/src/util/FakeEvent.ts
View File

@ -18,7 +18,7 @@
import FakeEventTarget from "./FakeEventTarget"; import FakeEventTarget from "./FakeEventTarget";
import { EventType } from "./types"; import { EventType } from "./types";
class Event { export class Event {
public eventPath: FakeEventTarget[] = []; public eventPath: FakeEventTarget[] = [];
public type: EventType; public type: EventType;

1
packages/idb-bridge/src/util/types.ts
View File

@ -19,6 +19,7 @@ import BridgeIDBRequest from "../BridgeIDBRequest";
import BridgeIDBKeyRange from "../BridgeIDBKeyRange"; import BridgeIDBKeyRange from "../BridgeIDBKeyRange";
import BridgeIDBIndex from "../BridgeIDBIndex"; import BridgeIDBIndex from "../BridgeIDBIndex";
import BridgeIBObjectStore from "../BridgeIDBObjectStore"; import BridgeIBObjectStore from "../BridgeIDBObjectStore";
import { Event } from "../util/FakeEvent";
interface EventInCallback extends Event { interface EventInCallback extends Event {
target: any; target: any;

1
packages/idb-bridge/tsconfig.json
View File

@ -10,7 +10,6 @@
"strict": true, "strict": true,
"incremental": true, "incremental": true,
"sourceMap": true, "sourceMap": true,
"typeRoots": ["./node_modules"],
"types": [] "types": []
}, },
"include": ["src/**/*"] "include": ["src/**/*"]

367
src/headless/taler-wallet-cli.ts
View File

@ -14,347 +14,52 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/ */
import { MemoryBackend, BridgeIDBFactory, shimIndexedDB } from "idb-bridge"; import commander = require("commander");
import { Wallet } from "../wallet"; import os = require("os");
import { Notifier, Badge } from "../walletTypes"; import { getDefaultNodeWallet, withdrawTestBalance } from "./helpers";
import { openTalerDb, exportDb } from "../db";
import { HttpRequestLibrary } from "../http";
import * as amounts from "../amounts";
import Axios from "axios";
import URI = require("urijs"); const program = new commander.Command();
program.version("0.0.1");
import querystring = require("querystring"); const walletDbPath = os.homedir + "/" + ".talerwalletdb.json";
import { CheckPaymentResponse } from "../talerTypes";
import { SynchronousCryptoWorkerFactory } from "../crypto/synchronousWorker";
const enableTracing = false; program
.command("test-withdraw")
class ConsoleNotifier implements Notifier { .description("withdraw test currency from the test bank")
notify(): void { .action(async () => {
// nothing to do. console.log("test-withdraw command called");
} const wallet = await getDefaultNodeWallet({
} persistentStoragePath: walletDbPath,
class ConsoleBadge implements Badge {
startBusy(): void {
enableTracing && console.log("NOTIFICATION: busy");
}
stopBusy(): void {
enableTracing && console.log("NOTIFICATION: busy end");
}
showNotification(): void {
enableTracing && console.log("NOTIFICATION: show");
}
clearNotification(): void {
enableTracing && console.log("NOTIFICATION: cleared");
}
}
export class NodeHttpLib implements HttpRequestLibrary {
async get(url: string): Promise<import("../http").HttpResponse> {
enableTracing && console.log("making GET request to", url);
const resp = await Axios({
method: "get",
url: url,
responseType: "json",
}); });
enableTracing && console.log("got response", resp.data); await withdrawTestBalance(wallet);
enableTracing && console.log("resp type", typeof resp.data); process.exit(0);
return {
responseJson: resp.data,
status: resp.status,
};
}
async postJson(
url: string,
body: any,
): Promise<import("../http").HttpResponse> {
enableTracing && console.log("making POST request to", url);
const resp = await Axios({
method: "post",
url: url,
responseType: "json",
data: body,
});
enableTracing && console.log("got response", resp.data);
enableTracing && console.log("resp type", typeof resp.data);
return {
responseJson: resp.data,
status: resp.status,
};
}
async postForm(
url: string,
form: any,
): Promise<import("../http").HttpResponse> {
enableTracing && console.log("making POST request to", url);
const resp = await Axios({
method: "post",
url: url,
data: querystring.stringify(form),
responseType: "json",
});
enableTracing && console.log("got response", resp.data);
enableTracing && console.log("resp type", typeof resp.data);
return {
responseJson: resp.data,
status: resp.status,
};
}
}
interface BankUser {
username: string;
password: string;
}
function makeId(length: number): string {
let result = "";
const characters =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
for (let i = 0; i < length; i++) {
result += characters.charAt(Math.floor(Math.random() * characters.length));
}
return result;
}
async function registerBankUser(
bankBaseUrl: string,
httpLib: HttpRequestLibrary,
): Promise<BankUser> {
const reqUrl = new URI("register").absoluteTo(bankBaseUrl).href();
const randId = makeId(8);
const bankUser: BankUser = {
username: `testuser-${randId}`,
password: `testpw-${randId}`,
};
const result = await httpLib.postForm(reqUrl, bankUser);
if (result.status != 200) {
throw Error("could not register bank user");
}
return bankUser;
}
async function createBankReserve(
bankBaseUrl: string,
bankUser: BankUser,
amount: string,
reservePub: string,
exchangePaytoUri: string,
httpLib: HttpRequestLibrary,
) {
const reqUrl = new URI("taler/withdraw").absoluteTo(bankBaseUrl).href();
const body = {
auth: { type: "basic" },
username: bankUser,
amount,
reserve_pub: reservePub,
exchange_wire_detail: exchangePaytoUri,
};
const resp = await Axios({
method: "post",
url: reqUrl,
data: body,
responseType: "json",
headers: {
"X-Taler-Bank-Username": bankUser.username,
"X-Taler-Bank-Password": bankUser.password,
},
}); });
if (resp.status != 200) { program
throw Error("failed to create bank reserve"); .command("balance", undefined, { isDefault: true })
} .description("show wallet balance")
} .action(async () => {
console.log("balance command called");
class MerchantBackendConnection { const wallet = await getDefaultNodeWallet({
constructor( persistentStoragePath: walletDbPath,
public merchantBaseUrl: string,
public merchantInstance: string,
public apiKey: string,
) {}
async createOrder(
amount: string,
summary: string,
fulfillmentUrl: string,
): Promise<{ orderId: string }> {
const reqUrl = new URI("order").absoluteTo(this.merchantBaseUrl).href();
const orderReq = {
order: {
amount,
summary,
fulfillment_url: fulfillmentUrl,
instance: this.merchantInstance,
},
};
const resp = await Axios({
method: "post",
url: reqUrl,
data: orderReq,
responseType: "json",
headers: {
Authorization: `ApiKey ${this.apiKey}`,
},
}); });
if (resp.status != 200) { const balance = await wallet.getBalances();
throw Error("failed to create bank reserve"); console.log(JSON.stringify(balance, undefined, 2));
} process.exit(0);
const orderId = resp.data.order_id;
if (!orderId) {
throw Error("no order id in response");
}
return { orderId };
}
async checkPayment(orderId: string): Promise<CheckPaymentResponse> {
const reqUrl = new URI("check-payment")
.absoluteTo(this.merchantBaseUrl)
.href();
const resp = await Axios({
method: "get",
url: reqUrl,
params: { order_id: orderId, instance: this.merchantInstance },
responseType: "json",
headers: {
Authorization: `ApiKey ${this.apiKey}`,
},
});
if (resp.status != 200) {
throw Error("failed to check payment");
}
return CheckPaymentResponse.checked(resp.data);
}
}
export async function main() {
const myNotifier = new ConsoleNotifier();
const myBadge = new ConsoleBadge();
const myBackend = new MemoryBackend();
myBackend.enableTracing = false;
BridgeIDBFactory.enableTracing = false;
const myBridgeIdbFactory = new BridgeIDBFactory(myBackend);
const myIdbFactory: IDBFactory = (myBridgeIdbFactory as any) as IDBFactory;
const myHttpLib = new NodeHttpLib();
const myVersionChange = () => {
console.error("version change requested, should not happen");
throw Error();
};
const myUnsupportedUpgrade = () => {
console.error("unsupported database migration");
throw Error();
};
shimIndexedDB(myBridgeIdbFactory);
const exchangeBaseUrl = "https://exchange.test.taler.net/";
const bankBaseUrl = "https://bank.test.taler.net/";
const myDb = await openTalerDb(
myIdbFactory,
myVersionChange,
myUnsupportedUpgrade,
);
const myWallet = new Wallet(myDb, myHttpLib, myBadge, myNotifier, new SynchronousCryptoWorkerFactory());
//const myWallet = new Wallet(myDb, myHttpLib, myBadge, myNotifier, new NodeCryptoWorkerFactory());
const reserveResponse = await myWallet.createReserve({
amount: amounts.parseOrThrow("TESTKUDOS:10.0"),
exchange: exchangeBaseUrl,
}); });
const bankUser = await registerBankUser(bankBaseUrl, myHttpLib); // error on unknown commands
program.on("command:*", function() {
console.log("bank user", bankUser); console.error(
"Invalid command: %s\nSee --help for a list of available commands.",
const exchangePaytoUri = await myWallet.getExchangePaytoUri( program.args.join(" "),
"https://exchange.test.taler.net/",
["x-taler-bank"],
); );
process.exit(1);
});
await createBankReserve( program.parse(process.argv);
bankBaseUrl,
bankUser,
"TESTKUDOS:10.0",
reserveResponse.reservePub,
exchangePaytoUri,
myHttpLib,
);
await myWallet.confirmReserve({ reservePub: reserveResponse.reservePub }); if (process.argv.length <= 2) {
console.error("Error: No command given.");
await myWallet.processReserve(reserveResponse.reservePub); program.help();
console.log("process reserve returned");
const balance = await myWallet.getBalances();
console.log(JSON.stringify(balance, null, 2));
const myMerchant = new MerchantBackendConnection(
"https://backend.test.taler.net/",
"default",
"sandbox",
);
const orderResp = await myMerchant.createOrder(
"TESTKUDOS:5",
"hello world",
"https://example.com/",
);
console.log("created order with orderId", orderResp.orderId);
const paymentStatus = await myMerchant.checkPayment(orderResp.orderId);
console.log("payment status", paymentStatus);
const contractUrl = paymentStatus.contract_url;
if (!contractUrl) {
throw Error("no contract URL in payment response");
}
const proposalId = await myWallet.downloadProposal(contractUrl);
console.log("proposal id", proposalId);
const checkPayResult = await myWallet.checkPay(proposalId);
console.log("check pay result", checkPayResult);
const confirmPayResult = await myWallet.confirmPay(proposalId, undefined);
console.log("confirmPayResult", confirmPayResult);
const paymentStatus2 = await myMerchant.checkPayment(orderResp.orderId);
console.log("payment status after wallet payment:", paymentStatus2);
if (!paymentStatus2.paid) {
throw Error("payment did not succeed");
}
myWallet.stop();
}
if (require.main === module) {
main().catch(err => {
console.error("Failed with exception:");
console.error(err);
});
} }

2
src/index.ts
View File

@ -20,4 +20,4 @@
export { Wallet } from "./wallet"; export { Wallet } from "./wallet";
export { main as runIntegrationTest } from "./headless/taler-wallet-cli"; export { main as runIntegrationTest } from "./headless/taler-wallet-testing";

8
src/webex/wxBackend.ts
View File

@ -471,7 +471,7 @@ function setBadgeText(options: chrome.browserAction.BadgeTextDetails) {
function waitMs(timeoutMs: number): Promise<void> { function waitMs(timeoutMs: number): Promise<void> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
chrome.extension.getBackgroundPage().setTimeout(() => resolve(), timeoutMs); chrome.extension.getBackgroundPage()!.setTimeout(() => resolve(), timeoutMs);
}); });
} }
@ -780,7 +780,7 @@ export async function wxMain() {
chrome.tabs.onRemoved.addListener((tabId, changeInfo) => { chrome.tabs.onRemoved.addListener((tabId, changeInfo) => {
const tt = tabTimers[tabId] || []; const tt = tabTimers[tabId] || [];
for (const t of tt) { for (const t of tt) {
chrome.extension.getBackgroundPage().clearTimeout(t); chrome.extension.getBackgroundPage()!.clearTimeout(t);
} }
}); });
chrome.tabs.onUpdated.addListener((tabId, changeInfo) => { chrome.tabs.onUpdated.addListener((tabId, changeInfo) => {
@ -790,7 +790,7 @@ export async function wxMain() {
const timers: number[] = []; const timers: number[] = [];
const addRun = (dt: number) => { const addRun = (dt: number) => {
const id = chrome.extension.getBackgroundPage().setTimeout(run, dt); const id = chrome.extension.getBackgroundPage()!.setTimeout(run, dt);
timers.push(id); timers.push(id);
}; };
@ -827,7 +827,7 @@ export async function wxMain() {
tabTimers[tabId] = timers; tabTimers[tabId] = timers;
}); });
chrome.extension.getBackgroundPage().setInterval(clearRateLimitCache, 5000); chrome.extension.getBackgroundPage()!.setInterval(clearRateLimitCache, 5000);
reinitWallet(); reinitWallet();

6
tsconfig.json
View File

@ -22,9 +22,6 @@
"incremental": true "incremental": true
}, },
"files": [ "files": [
"decl/chrome/chrome.d.ts",
"decl/jed.d.ts",
"decl/urijs.d.ts",
"src/amounts.ts", "src/amounts.ts",
"src/checkable.ts", "src/checkable.ts",
"src/crypto/browserWorkerEntry.ts", "src/crypto/browserWorkerEntry.ts",
@ -40,7 +37,10 @@
"src/crypto/synchronousWorker.ts", "src/crypto/synchronousWorker.ts",
"src/db.ts", "src/db.ts",
"src/dbTypes.ts", "src/dbTypes.ts",
"src/headless/bank.ts",
"src/headless/helpers.ts",
"src/headless/taler-wallet-cli.ts", "src/headless/taler-wallet-cli.ts",
"src/headless/taler-wallet-testing.ts",
"src/helpers-test.ts", "src/helpers-test.ts",
"src/helpers.ts", "src/helpers.ts",
"src/http.ts", "src/http.ts",

32
yarn.lock
View File

@ -325,6 +325,13 @@
dependencies: dependencies:
arrify "^1.0.1" arrify "^1.0.1"
"@types/chrome@^0.0.88":
version "0.0.88"
resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.88.tgz#0041a101d69f78008910927c5b3299a00d8660db"
integrity sha512-JBsIrBZ2adJhlXvJ+1j0xLbcfOfwee/WAg7Lp2NE+Wf3m0vXMJFWv/PPjqNk5ZUXDeY/qDxPHe+PUjxnl8HWFg==
dependencies:
"@types/filesystem" "*"
"@types/estree@0.0.39": "@types/estree@0.0.39":
version "0.0.39" version "0.0.39"
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
@ -335,6 +342,18 @@
resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
"@types/filesystem@*":
version "0.0.29"
resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz#ee3748eb5be140dcf980c3bd35f11aec5f7a3748"
integrity sha512-85/1KfRedmfPGsbK8YzeaQUyV1FQAvMPMTuWFQ5EkLd2w7szhNO96bk3Rh/SKmOfd9co2rCLf0Voy4o7ECBOvw==
dependencies:
"@types/filewriter" "*"
"@types/filewriter@*":
version "0.0.28"
resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.28.tgz#c054e8af4d9dd75db4e63abc76f885168714d4b3"
integrity sha1-wFTor02d11205jq8dviFFocU1LM=
"@types/fs-extra@^5.0.3": "@types/fs-extra@^5.0.3":
version "5.0.5" version "5.0.5"
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.5.tgz#080d90a792f3fa2c5559eb44bd8ef840aae9104b" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.5.tgz#080d90a792f3fa2c5559eb44bd8ef840aae9104b"
@ -423,6 +442,11 @@
"@types/glob" "*" "@types/glob" "*"
"@types/node" "*" "@types/node" "*"
"@types/urijs@^1.19.3":
version "1.19.3"
resolved "https://registry.yarnpkg.com/@types/urijs/-/urijs-1.19.3.tgz#ed90d38baf3eff1627544ad6ed3bcdeb79ef3533"
integrity sha512-L5tP2dEIV+OMVEVRhf8PCFMNMyO5ZBodrXpEqnGczky60lcv8l5Kl9Yi4J1yxhSVfHUe+Pr2nXJfDM+rUYNs3w==
"@webassemblyjs/ast@1.8.5": "@webassemblyjs/ast@1.8.5":
version "1.8.5" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
@ -3216,10 +3240,10 @@ iconv-lite@^0.4.4, iconv-lite@~0.4.13:
dependencies: dependencies:
safer-buffer ">= 2.1.2 < 3" safer-buffer ">= 2.1.2 < 3"
idb-bridge@0.0.2: idb-bridge@^0.0.5:
version "0.0.2" version "0.0.5"
resolved "https://registry.yarnpkg.com/idb-bridge/-/idb-bridge-0.0.2.tgz#daa46d75060bd6a116b26155c314446bea355570" resolved "https://registry.yarnpkg.com/idb-bridge/-/idb-bridge-0.0.5.tgz#fb26ddc3183229ae54f31c4b8709312b57735fed"
integrity sha512-PEfZmdbIQUV4vxJRSSXhan7niclJDJGPGUSJ2WlHCYCgdFK6n25UD8z/lsLoqWKfcp+xPuL+9MI+h9Ql8XFzkw== integrity sha512-ya5Hf5R6S0Pimeg6+8iL4MYR7duwywtZ2Dxm/HIdY4JIee9cITfuNIRRXOEQhxUxZdbYQeqjNYIRnK5bAQSUUw==
ieee754@^1.1.4: ieee754@^1.1.4:
version "1.1.13" version "1.1.13"