From ff09c98f3b0515dd92dc5f9bab887336b080b4f5 Mon Sep 17 00:00:00 2001 From: Jonathan Buchanan Date: Wed, 7 Jul 2021 02:42:55 -0400 Subject: change taler-wallet-android to taler-wallet-embedded --- packages/taler-wallet-android/package.json | 46 ---- packages/taler-wallet-android/rollup.config.js | 30 --- packages/taler-wallet-android/src/index.ts | 288 ------------------------ packages/taler-wallet-android/tsconfig.json | 28 --- packages/taler-wallet-embedded/package.json | 46 ++++ packages/taler-wallet-embedded/rollup.config.js | 30 +++ packages/taler-wallet-embedded/src/index.ts | 288 ++++++++++++++++++++++++ packages/taler-wallet-embedded/tsconfig.json | 28 +++ 8 files changed, 392 insertions(+), 392 deletions(-) delete mode 100644 packages/taler-wallet-android/package.json delete mode 100644 packages/taler-wallet-android/rollup.config.js delete mode 100644 packages/taler-wallet-android/src/index.ts delete mode 100644 packages/taler-wallet-android/tsconfig.json create mode 100644 packages/taler-wallet-embedded/package.json create mode 100644 packages/taler-wallet-embedded/rollup.config.js create mode 100644 packages/taler-wallet-embedded/src/index.ts create mode 100644 packages/taler-wallet-embedded/tsconfig.json (limited to 'packages') diff --git a/packages/taler-wallet-android/package.json b/packages/taler-wallet-android/package.json deleted file mode 100644 index 8a0c4048c..000000000 --- a/packages/taler-wallet-android/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "@gnu-taler/taler-wallet-android", - "version": "0.8.0", - "description": "", - "engines": { - "node": ">=0.12.0" - }, - "repository": { - "type": "git", - "url": "git://git.taler.net/wallet-core.git" - }, - "main": "dist/taler-wallet-android.js", - "author": "Florian Dold", - "license": "GPL-3.0", - "scripts": { - "compile": "tsc && rollup -c", - "pretty": "prettier --write src", - "coverage": "tsc && nyc ava", - "clean": "rimraf lib dist tsconfig.tsbuildinfo" - }, - "files": [ - "AUTHORS", - "README", - "COPYING", - "bin/", - "dist/node", - "src/" - ], - "devDependencies": { - "@rollup/plugin-commonjs": "^17.0.0", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^11.1.0", - "@rollup/plugin-replace": "^2.3.4", - "@types/node": "^14.14.22", - "prettier": "^2.2.1", - "rimraf": "^3.0.2", - "rollup": "^2.43.0", - "rollup-plugin-sourcemaps": "^0.6.3", - "rollup-plugin-terser": "^7.0.2", - "typescript": "^4.2.3" - }, - "dependencies": { - "@gnu-taler/taler-wallet-core": "workspace:*", - "tslib": "^2.1.0" - } -} diff --git a/packages/taler-wallet-android/rollup.config.js b/packages/taler-wallet-android/rollup.config.js deleted file mode 100644 index 7cdca3b98..000000000 --- a/packages/taler-wallet-android/rollup.config.js +++ /dev/null @@ -1,30 +0,0 @@ -// rollup.config.js -import commonjs from "@rollup/plugin-commonjs"; -import nodeResolve from "@rollup/plugin-node-resolve"; -import json from "@rollup/plugin-json"; -import builtins from "builtin-modules"; -import pkg from "./package.json"; - -export default { - input: "lib/index.js", - output: { - file: pkg.main, - format: "cjs", - }, - external: builtins, - plugins: [ - nodeResolve({ - preferBuiltins: true, - }), - - commonjs({ - include: [/node_modules/, /dist/], - extensions: [".js", ".ts"], - ignoreGlobal: false, - sourceMap: false, - }), - - json(), - ], -} - diff --git a/packages/taler-wallet-android/src/index.ts b/packages/taler-wallet-android/src/index.ts deleted file mode 100644 index 7f2d44c5d..000000000 --- a/packages/taler-wallet-android/src/index.ts +++ /dev/null @@ -1,288 +0,0 @@ -/* - This file is part of GNU Taler - (C) 2019 GNUnet e.V. - - GNU Taler is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNU Taler; see the file COPYING. If not, see - */ - -/** - * Imports. - */ -import { - getDefaultNodeWallet, - DefaultNodeWalletArgs, - NodeHttpLib, - makeErrorDetails, - handleWorkerError, - handleWorkerMessage, - HttpRequestLibrary, - OpenedPromise, - HttpResponse, - HttpRequestOptions, - openPromise, - Headers, - WALLET_EXCHANGE_PROTOCOL_VERSION, - WALLET_MERCHANT_PROTOCOL_VERSION, - Wallet, -} from "@gnu-taler/taler-wallet-core"; - -import fs from "fs"; -import { WalletNotification } from "../../taler-wallet-core/node_modules/@gnu-taler/taler-util/lib/notifications.js"; -import { TalerErrorCode } from "../../taler-wallet-core/node_modules/@gnu-taler/taler-util/lib/taler-error-codes.js"; -import { - CoreApiEnvelope, - CoreApiResponse, - CoreApiResponseSuccess, -} from "../../taler-wallet-core/node_modules/@gnu-taler/taler-util/lib/walletTypes.js"; - -export { handleWorkerError, handleWorkerMessage }; - -export class AndroidHttpLib implements HttpRequestLibrary { - useNfcTunnel = false; - - private nodeHttpLib: HttpRequestLibrary = new NodeHttpLib(); - - private requestId = 1; - - private requestMap: { - [id: number]: OpenedPromise; - } = {}; - - constructor(private sendMessage: (m: string) => void) {} - - fetch(url: string, opt?: HttpRequestOptions): Promise { - return this.nodeHttpLib.fetch(url, opt); - } - - get(url: string, opt?: HttpRequestOptions): Promise { - if (this.useNfcTunnel) { - const myId = this.requestId++; - const p = openPromise(); - this.requestMap[myId] = p; - const request = { - method: "get", - url, - }; - this.sendMessage( - JSON.stringify({ - type: "tunnelHttp", - request, - id: myId, - }), - ); - return p.promise; - } else { - return this.nodeHttpLib.get(url, opt); - } - } - - postJson( - url: string, - body: any, - opt?: HttpRequestOptions, - ): Promise { - if (this.useNfcTunnel) { - const myId = this.requestId++; - const p = openPromise(); - this.requestMap[myId] = p; - const request = { - method: "postJson", - url, - body, - }; - this.sendMessage( - JSON.stringify({ type: "tunnelHttp", request, id: myId }), - ); - return p.promise; - } else { - return this.nodeHttpLib.postJson(url, body, opt); - } - } - - handleTunnelResponse(msg: any): void { - const myId = msg.id; - const p = this.requestMap[myId]; - if (!p) { - console.error( - `no matching request for tunneled HTTP response, id=${myId}`, - ); - } - const headers = new Headers(); - if (msg.status != 0) { - const resp: HttpResponse = { - // FIXME: pass through this URL - requestUrl: "", - headers, - status: msg.status, - requestMethod: "FIXME", - json: async () => JSON.parse(msg.responseText), - text: async () => msg.responseText, - bytes: async () => { - throw Error("bytes() not supported for tunnel response"); - }, - }; - p.resolve(resp); - } else { - p.reject(new Error(`unexpected HTTP status code ${msg.status}`)); - } - delete this.requestMap[myId]; - } -} - -function sendAkonoMessage(ev: CoreApiEnvelope): void { - // @ts-ignore - const sendMessage = globalThis.__akono_sendMessage; - if (typeof sendMessage !== "function") { - const errMsg = - "FATAL: cannot install android wallet listener: akono functions missing"; - console.error(errMsg); - throw new Error(errMsg); - } - const m = JSON.stringify(ev); - // @ts-ignore - sendMessage(m); -} - -class AndroidWalletMessageHandler { - walletArgs: DefaultNodeWalletArgs | undefined; - maybeWallet: Wallet | undefined; - wp = openPromise(); - httpLib = new NodeHttpLib(); - - /** - * Handle a request from the Android wallet. - */ - async handleMessage( - operation: string, - id: string, - args: any, - ): Promise { - const wrapResponse = (result: unknown): CoreApiResponseSuccess => { - return { - type: "response", - id, - operation, - result, - }; - }; - - const reinit = async () => { - const w = await getDefaultNodeWallet(this.walletArgs); - this.maybeWallet = w; - await w.handleCoreApiRequest("initWallet", "akono-init", {}); - w.runRetryLoop().catch((e) => { - console.error("Error during wallet retry loop", e); - }); - this.wp.resolve(w); - }; - - switch (operation) { - case "init": { - this.walletArgs = { - notifyHandler: async (notification: WalletNotification) => { - sendAkonoMessage({ type: "notification", payload: notification }); - }, - persistentStoragePath: args.persistentStoragePath, - httpLib: this.httpLib, - }; - await reinit(); - return wrapResponse({ - supported_protocol_versions: { - exchange: WALLET_EXCHANGE_PROTOCOL_VERSION, - merchant: WALLET_MERCHANT_PROTOCOL_VERSION, - }, - }); - } - case "startTunnel": { - // this.httpLib.useNfcTunnel = true; - throw Error("not implemented"); - } - case "stopTunnel": { - // this.httpLib.useNfcTunnel = false; - throw Error("not implemented"); - } - case "tunnelResponse": { - // httpLib.handleTunnelResponse(msg.args); - throw Error("not implemented"); - } - case "reset": { - const oldArgs = this.walletArgs; - this.walletArgs = { ...oldArgs }; - if (oldArgs && oldArgs.persistentStoragePath) { - try { - fs.unlinkSync(oldArgs.persistentStoragePath); - } catch (e) { - console.error("Error while deleting the wallet db:", e); - } - // Prevent further storage! - this.walletArgs.persistentStoragePath = undefined; - } - const wallet = await this.wp.promise; - wallet.stop(); - this.wp = openPromise(); - this.maybeWallet = undefined; - await reinit(); - return wrapResponse({}); - } - default: { - const wallet = await this.wp.promise; - return await wallet.handleCoreApiRequest(operation, id, args); - } - } - } -} - -export function installAndroidWalletListener(): void { - const handler = new AndroidWalletMessageHandler(); - const onMessage = async (msgStr: any): Promise => { - if (typeof msgStr !== "string") { - console.error("expected string as message"); - return; - } - const msg = JSON.parse(msgStr); - const operation = msg.operation; - if (typeof operation !== "string") { - console.error( - "message to android wallet helper must contain operation of type string", - ); - return; - } - const id = msg.id; - console.log(`android listener: got request for ${operation} (${id})`); - - try { - const respMsg = await handler.handleMessage(operation, id, msg.args); - console.log( - `android listener: sending success response for ${operation} (${id})`, - ); - sendAkonoMessage(respMsg); - } catch (e) { - const respMsg: CoreApiResponse = { - type: "error", - id, - operation, - error: makeErrorDetails( - TalerErrorCode.WALLET_UNEXPECTED_EXCEPTION, - "unexpected exception", - {}, - ), - }; - sendAkonoMessage(respMsg); - return; - } - }; - - // @ts-ignore - globalThis.__akono_onMessage = onMessage; - - console.log("android wallet listener installed"); -} diff --git a/packages/taler-wallet-android/tsconfig.json b/packages/taler-wallet-android/tsconfig.json deleted file mode 100644 index 62be133ef..000000000 --- a/packages/taler-wallet-android/tsconfig.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "compileOnSave": true, - "compilerOptions": { - "composite": true, - "declaration": true, - "declarationMap": true, - "target": "ES6", - "module": "ESNext", - "moduleResolution": "node", - "sourceMap": true, - "lib": ["es6"], - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "strict": true, - "strictPropertyInitialization": false, - "outDir": "lib", - "noImplicitAny": true, - "noImplicitThis": true, - "allowJs": true, - "checkJs": true, - "incremental": true, - "esModuleInterop": true, - "importHelpers": true, - "rootDir": "./src", - "typeRoots": ["./node_modules/@types"] - }, - "include": ["src/**/*"] -} diff --git a/packages/taler-wallet-embedded/package.json b/packages/taler-wallet-embedded/package.json new file mode 100644 index 000000000..9a5a1c9e6 --- /dev/null +++ b/packages/taler-wallet-embedded/package.json @@ -0,0 +1,46 @@ +{ + "name": "@gnu-taler/taler-wallet-embedded", + "version": "0.8.0", + "description": "", + "engines": { + "node": ">=0.12.0" + }, + "repository": { + "type": "git", + "url": "git://git.taler.net/wallet-core.git" + }, + "main": "dist/taler-wallet-embedded.js", + "author": "Florian Dold", + "license": "GPL-3.0", + "scripts": { + "compile": "tsc && rollup -c", + "pretty": "prettier --write src", + "coverage": "tsc && nyc ava", + "clean": "rimraf lib dist tsconfig.tsbuildinfo" + }, + "files": [ + "AUTHORS", + "README", + "COPYING", + "bin/", + "dist/node", + "src/" + ], + "devDependencies": { + "@rollup/plugin-commonjs": "^17.0.0", + "@rollup/plugin-json": "^4.1.0", + "@rollup/plugin-node-resolve": "^11.1.0", + "@rollup/plugin-replace": "^2.3.4", + "@types/node": "^14.14.22", + "prettier": "^2.2.1", + "rimraf": "^3.0.2", + "rollup": "^2.43.0", + "rollup-plugin-sourcemaps": "^0.6.3", + "rollup-plugin-terser": "^7.0.2", + "typescript": "^4.2.3" + }, + "dependencies": { + "@gnu-taler/taler-wallet-core": "workspace:*", + "tslib": "^2.1.0" + } +} diff --git a/packages/taler-wallet-embedded/rollup.config.js b/packages/taler-wallet-embedded/rollup.config.js new file mode 100644 index 000000000..7cdca3b98 --- /dev/null +++ b/packages/taler-wallet-embedded/rollup.config.js @@ -0,0 +1,30 @@ +// rollup.config.js +import commonjs from "@rollup/plugin-commonjs"; +import nodeResolve from "@rollup/plugin-node-resolve"; +import json from "@rollup/plugin-json"; +import builtins from "builtin-modules"; +import pkg from "./package.json"; + +export default { + input: "lib/index.js", + output: { + file: pkg.main, + format: "cjs", + }, + external: builtins, + plugins: [ + nodeResolve({ + preferBuiltins: true, + }), + + commonjs({ + include: [/node_modules/, /dist/], + extensions: [".js", ".ts"], + ignoreGlobal: false, + sourceMap: false, + }), + + json(), + ], +} + diff --git a/packages/taler-wallet-embedded/src/index.ts b/packages/taler-wallet-embedded/src/index.ts new file mode 100644 index 000000000..0dcfaad6b --- /dev/null +++ b/packages/taler-wallet-embedded/src/index.ts @@ -0,0 +1,288 @@ +/* + This file is part of GNU Taler + (C) 2019 GNUnet e.V. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +/** + * Imports. + */ +import { + getDefaultNodeWallet, + DefaultNodeWalletArgs, + NodeHttpLib, + makeErrorDetails, + handleWorkerError, + handleWorkerMessage, + HttpRequestLibrary, + OpenedPromise, + HttpResponse, + HttpRequestOptions, + openPromise, + Headers, + WALLET_EXCHANGE_PROTOCOL_VERSION, + WALLET_MERCHANT_PROTOCOL_VERSION, + Wallet, +} from "@gnu-taler/taler-wallet-core"; + +import fs from "fs"; +import { WalletNotification } from "../../taler-wallet-core/node_modules/@gnu-taler/taler-util/lib/notifications.js"; +import { TalerErrorCode } from "../../taler-wallet-core/node_modules/@gnu-taler/taler-util/lib/taler-error-codes.js"; +import { + CoreApiEnvelope, + CoreApiResponse, + CoreApiResponseSuccess, +} from "../../taler-wallet-core/node_modules/@gnu-taler/taler-util/lib/walletTypes.js"; + +export { handleWorkerError, handleWorkerMessage }; + +export class NativeHttpLib implements HttpRequestLibrary { + useNfcTunnel = false; + + private nodeHttpLib: HttpRequestLibrary = new NodeHttpLib(); + + private requestId = 1; + + private requestMap: { + [id: number]: OpenedPromise; + } = {}; + + constructor(private sendMessage: (m: string) => void) {} + + fetch(url: string, opt?: HttpRequestOptions): Promise { + return this.nodeHttpLib.fetch(url, opt); + } + + get(url: string, opt?: HttpRequestOptions): Promise { + if (this.useNfcTunnel) { + const myId = this.requestId++; + const p = openPromise(); + this.requestMap[myId] = p; + const request = { + method: "get", + url, + }; + this.sendMessage( + JSON.stringify({ + type: "tunnelHttp", + request, + id: myId, + }), + ); + return p.promise; + } else { + return this.nodeHttpLib.get(url, opt); + } + } + + postJson( + url: string, + body: any, + opt?: HttpRequestOptions, + ): Promise { + if (this.useNfcTunnel) { + const myId = this.requestId++; + const p = openPromise(); + this.requestMap[myId] = p; + const request = { + method: "postJson", + url, + body, + }; + this.sendMessage( + JSON.stringify({ type: "tunnelHttp", request, id: myId }), + ); + return p.promise; + } else { + return this.nodeHttpLib.postJson(url, body, opt); + } + } + + handleTunnelResponse(msg: any): void { + const myId = msg.id; + const p = this.requestMap[myId]; + if (!p) { + console.error( + `no matching request for tunneled HTTP response, id=${myId}`, + ); + } + const headers = new Headers(); + if (msg.status != 0) { + const resp: HttpResponse = { + // FIXME: pass through this URL + requestUrl: "", + headers, + status: msg.status, + requestMethod: "FIXME", + json: async () => JSON.parse(msg.responseText), + text: async () => msg.responseText, + bytes: async () => { + throw Error("bytes() not supported for tunnel response"); + }, + }; + p.resolve(resp); + } else { + p.reject(new Error(`unexpected HTTP status code ${msg.status}`)); + } + delete this.requestMap[myId]; + } +} + +function sendNativeMessage(ev: CoreApiEnvelope): void { + // @ts-ignore + const sendMessage = globalThis.__native_sendMessage; + if (typeof sendMessage !== "function") { + const errMsg = + "FATAL: cannot install native wallet listener: native functions missing"; + console.error(errMsg); + throw new Error(errMsg); + } + const m = JSON.stringify(ev); + // @ts-ignore + sendMessage(m); +} + +class NativeWalletMessageHandler { + walletArgs: DefaultNodeWalletArgs | undefined; + maybeWallet: Wallet | undefined; + wp = openPromise(); + httpLib = new NodeHttpLib(); + + /** + * Handle a request from the native wallet. + */ + async handleMessage( + operation: string, + id: string, + args: any, + ): Promise { + const wrapResponse = (result: unknown): CoreApiResponseSuccess => { + return { + type: "response", + id, + operation, + result, + }; + }; + + const reinit = async () => { + const w = await getDefaultNodeWallet(this.walletArgs); + this.maybeWallet = w; + await w.handleCoreApiRequest("initWallet", "native-init", {}); + w.runRetryLoop().catch((e) => { + console.error("Error during wallet retry loop", e); + }); + this.wp.resolve(w); + }; + + switch (operation) { + case "init": { + this.walletArgs = { + notifyHandler: async (notification: WalletNotification) => { + sendNativeMessage({ type: "notification", payload: notification }); + }, + persistentStoragePath: args.persistentStoragePath, + httpLib: this.httpLib, + }; + await reinit(); + return wrapResponse({ + supported_protocol_versions: { + exchange: WALLET_EXCHANGE_PROTOCOL_VERSION, + merchant: WALLET_MERCHANT_PROTOCOL_VERSION, + }, + }); + } + case "startTunnel": { + // this.httpLib.useNfcTunnel = true; + throw Error("not implemented"); + } + case "stopTunnel": { + // this.httpLib.useNfcTunnel = false; + throw Error("not implemented"); + } + case "tunnelResponse": { + // httpLib.handleTunnelResponse(msg.args); + throw Error("not implemented"); + } + case "reset": { + const oldArgs = this.walletArgs; + this.walletArgs = { ...oldArgs }; + if (oldArgs && oldArgs.persistentStoragePath) { + try { + fs.unlinkSync(oldArgs.persistentStoragePath); + } catch (e) { + console.error("Error while deleting the wallet db:", e); + } + // Prevent further storage! + this.walletArgs.persistentStoragePath = undefined; + } + const wallet = await this.wp.promise; + wallet.stop(); + this.wp = openPromise(); + this.maybeWallet = undefined; + await reinit(); + return wrapResponse({}); + } + default: { + const wallet = await this.wp.promise; + return await wallet.handleCoreApiRequest(operation, id, args); + } + } + } +} + +export function installNativeWalletListener(): void { + const handler = new NativeWalletMessageHandler(); + const onMessage = async (msgStr: any): Promise => { + if (typeof msgStr !== "string") { + console.error("expected string as message"); + return; + } + const msg = JSON.parse(msgStr); + const operation = msg.operation; + if (typeof operation !== "string") { + console.error( + "message to native wallet helper must contain operation of type string", + ); + return; + } + const id = msg.id; + console.log(`native listener: got request for ${operation} (${id})`); + + try { + const respMsg = await handler.handleMessage(operation, id, msg.args); + console.log( + `native listener: sending success response for ${operation} (${id})`, + ); + sendNativeMessage(respMsg); + } catch (e) { + const respMsg: CoreApiResponse = { + type: "error", + id, + operation, + error: makeErrorDetails( + TalerErrorCode.WALLET_UNEXPECTED_EXCEPTION, + "unexpected exception", + {}, + ), + }; + sendNativeMessage(respMsg); + return; + } + }; + + // @ts-ignore + globalThis.__native_onMessage = onMessage; + + console.log("native wallet listener installed"); +} diff --git a/packages/taler-wallet-embedded/tsconfig.json b/packages/taler-wallet-embedded/tsconfig.json new file mode 100644 index 000000000..62be133ef --- /dev/null +++ b/packages/taler-wallet-embedded/tsconfig.json @@ -0,0 +1,28 @@ +{ + "compileOnSave": true, + "compilerOptions": { + "composite": true, + "declaration": true, + "declarationMap": true, + "target": "ES6", + "module": "ESNext", + "moduleResolution": "node", + "sourceMap": true, + "lib": ["es6"], + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "strict": true, + "strictPropertyInitialization": false, + "outDir": "lib", + "noImplicitAny": true, + "noImplicitThis": true, + "allowJs": true, + "checkJs": true, + "incremental": true, + "esModuleInterop": true, + "importHelpers": true, + "rootDir": "./src", + "typeRoots": ["./node_modules/@types"] + }, + "include": ["src/**/*"] +} -- cgit v1.2.3