[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] branch master updated: change taler-wallet-android t
|
From: |
gnunet |
|
Subject: |
[taler-wallet-core] branch master updated: change taler-wallet-android to taler-wallet-embedded |
|
Date: |
Wed, 07 Jul 2021 08:43:19 +0200 |
This is an automated email from the git hooks/post-receive script.
jonathan-buchanan pushed a commit to branch master
in repository wallet-core.
The following commit(s) were added to refs/heads/master by this push:
new ff09c98f change taler-wallet-android to taler-wallet-embedded
ff09c98f is described below
commit ff09c98f3b0515dd92dc5f9bab887336b080b4f5
Author: Jonathan Buchanan <jonathan.russ.buchanan@gmail.com>
AuthorDate: Wed Jul 7 02:42:55 2021 -0400
change taler-wallet-android to taler-wallet-embedded
---
.../package.json | 4 +-
.../rollup.config.js | 0
.../src/index.ts | 34 +++---
.../tsconfig.json | 0
pnpm-lock.yaml | 119 ++++++++++-----------
5 files changed, 78 insertions(+), 79 deletions(-)
diff --git a/packages/taler-wallet-android/package.json
b/packages/taler-wallet-embedded/package.json
similarity index 91%
rename from packages/taler-wallet-android/package.json
rename to packages/taler-wallet-embedded/package.json
index 8a0c4048..9a5a1c9e 100644
--- a/packages/taler-wallet-android/package.json
+++ b/packages/taler-wallet-embedded/package.json
@@ -1,5 +1,5 @@
{
- "name": "@gnu-taler/taler-wallet-android",
+ "name": "@gnu-taler/taler-wallet-embedded",
"version": "0.8.0",
"description": "",
"engines": {
@@ -9,7 +9,7 @@
"type": "git",
"url": "git://git.taler.net/wallet-core.git"
},
- "main": "dist/taler-wallet-android.js",
+ "main": "dist/taler-wallet-embedded.js",
"author": "Florian Dold",
"license": "GPL-3.0",
"scripts": {
diff --git a/packages/taler-wallet-android/rollup.config.js
b/packages/taler-wallet-embedded/rollup.config.js
similarity index 100%
rename from packages/taler-wallet-android/rollup.config.js
rename to packages/taler-wallet-embedded/rollup.config.js
diff --git a/packages/taler-wallet-android/src/index.ts
b/packages/taler-wallet-embedded/src/index.ts
similarity index 88%
rename from packages/taler-wallet-android/src/index.ts
rename to packages/taler-wallet-embedded/src/index.ts
index 7f2d44c5..0dcfaad6 100644
--- a/packages/taler-wallet-android/src/index.ts
+++ b/packages/taler-wallet-embedded/src/index.ts
@@ -46,7 +46,7 @@ import {
export { handleWorkerError, handleWorkerMessage };
-export class AndroidHttpLib implements HttpRequestLibrary {
+export class NativeHttpLib implements HttpRequestLibrary {
useNfcTunnel = false;
private nodeHttpLib: HttpRequestLibrary = new NodeHttpLib();
@@ -138,12 +138,12 @@ export class AndroidHttpLib implements HttpRequestLibrary
{
}
}
-function sendAkonoMessage(ev: CoreApiEnvelope): void {
+function sendNativeMessage(ev: CoreApiEnvelope): void {
// @ts-ignore
- const sendMessage = globalThis.__akono_sendMessage;
+ const sendMessage = globalThis.__native_sendMessage;
if (typeof sendMessage !== "function") {
const errMsg =
- "FATAL: cannot install android wallet listener: akono functions missing";
+ "FATAL: cannot install native wallet listener: native functions missing";
console.error(errMsg);
throw new Error(errMsg);
}
@@ -152,14 +152,14 @@ function sendAkonoMessage(ev: CoreApiEnvelope): void {
sendMessage(m);
}
-class AndroidWalletMessageHandler {
+class NativeWalletMessageHandler {
walletArgs: DefaultNodeWalletArgs | undefined;
maybeWallet: Wallet | undefined;
wp = openPromise<Wallet>();
httpLib = new NodeHttpLib();
/**
- * Handle a request from the Android wallet.
+ * Handle a request from the native wallet.
*/
async handleMessage(
operation: string,
@@ -178,7 +178,7 @@ class AndroidWalletMessageHandler {
const reinit = async () => {
const w = await getDefaultNodeWallet(this.walletArgs);
this.maybeWallet = w;
- await w.handleCoreApiRequest("initWallet", "akono-init", {});
+ await w.handleCoreApiRequest("initWallet", "native-init", {});
w.runRetryLoop().catch((e) => {
console.error("Error during wallet retry loop", e);
});
@@ -189,7 +189,7 @@ class AndroidWalletMessageHandler {
case "init": {
this.walletArgs = {
notifyHandler: async (notification: WalletNotification) => {
- sendAkonoMessage({ type: "notification", payload: notification });
+ sendNativeMessage({ type: "notification", payload: notification });
},
persistentStoragePath: args.persistentStoragePath,
httpLib: this.httpLib,
@@ -241,8 +241,8 @@ class AndroidWalletMessageHandler {
}
}
-export function installAndroidWalletListener(): void {
- const handler = new AndroidWalletMessageHandler();
+export function installNativeWalletListener(): void {
+ const handler = new NativeWalletMessageHandler();
const onMessage = async (msgStr: any): Promise<void> => {
if (typeof msgStr !== "string") {
console.error("expected string as message");
@@ -252,19 +252,19 @@ export function installAndroidWalletListener(): void {
const operation = msg.operation;
if (typeof operation !== "string") {
console.error(
- "message to android wallet helper must contain operation of type
string",
+ "message to native wallet helper must contain operation of type
string",
);
return;
}
const id = msg.id;
- console.log(`android listener: got request for ${operation} (${id})`);
+ console.log(`native 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})`,
+ `native listener: sending success response for ${operation} (${id})`,
);
- sendAkonoMessage(respMsg);
+ sendNativeMessage(respMsg);
} catch (e) {
const respMsg: CoreApiResponse = {
type: "error",
@@ -276,13 +276,13 @@ export function installAndroidWalletListener(): void {
{},
),
};
- sendAkonoMessage(respMsg);
+ sendNativeMessage(respMsg);
return;
}
};
// @ts-ignore
- globalThis.__akono_onMessage = onMessage;
+ globalThis.__native_onMessage = onMessage;
- console.log("android wallet listener installed");
+ console.log("native wallet listener installed");
}
diff --git a/packages/taler-wallet-android/tsconfig.json
b/packages/taler-wallet-embedded/tsconfig.json
similarity index 100%
rename from packages/taler-wallet-android/tsconfig.json
rename to packages/taler-wallet-embedded/tsconfig.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dc570a2c..42d5e81d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -62,37 +62,6 @@ importers:
rimraf: 3.0.2
typescript: 4.2.3
- packages/taler-wallet-android:
- specifiers:
- '@gnu-taler/taler-wallet-core': workspace:*
- '@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
- tslib: ^2.1.0
- typescript: ^4.2.3
- dependencies:
- '@gnu-taler/taler-wallet-core': link:../taler-wallet-core
- tslib: 2.1.0
- devDependencies:
- '@rollup/plugin-commonjs': 17.0.0_rollup@2.43.0
- '@rollup/plugin-json': 4.1.0_rollup@2.43.0
- '@rollup/plugin-node-resolve': 11.1.0_rollup@2.43.0
- '@rollup/plugin-replace': 2.3.4_rollup@2.43.0
- '@types/node': 14.14.22
- prettier: 2.2.1
- rimraf: 3.0.2
- rollup: 2.43.0
- rollup-plugin-sourcemaps: 0.6.3_79665b55c550dd6b792bac22e5c7c20e
- rollup-plugin-terser: 7.0.2_rollup@2.43.0
- typescript: 4.2.3
-
packages/taler-wallet-cli:
specifiers:
'@gnu-taler/taler-util': workspace:*
@@ -203,6 +172,37 @@ importers:
typedoc: 0.20.16_typescript@4.1.3
typescript: 4.1.3
+ packages/taler-wallet-embedded:
+ specifiers:
+ '@gnu-taler/taler-wallet-core': workspace:*
+ '@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
+ tslib: ^2.1.0
+ typescript: ^4.2.3
+ dependencies:
+ '@gnu-taler/taler-wallet-core': link:../taler-wallet-core
+ tslib: 2.2.0
+ devDependencies:
+ '@rollup/plugin-commonjs': 17.1.0_rollup@2.43.0
+ '@rollup/plugin-json': 4.1.0_rollup@2.43.0
+ '@rollup/plugin-node-resolve': 11.2.0_rollup@2.43.0
+ '@rollup/plugin-replace': 2.4.2_rollup@2.43.0
+ '@types/node': 14.17.1
+ prettier: 2.2.1
+ rimraf: 3.0.2
+ rollup: 2.43.0
+ rollup-plugin-sourcemaps: 0.6.3_6efbbae6640434994627e0ab519821c6
+ rollup-plugin-terser: 7.0.2_rollup@2.43.0
+ typescript: 4.2.3
+
packages/taler-wallet-webextension:
specifiers:
'@babel/core': ^7.14.0
@@ -3252,36 +3252,36 @@ packages:
rollup: 2.37.1
dev: true
- /@rollup/plugin-commonjs/17.0.0_rollup@2.43.0:
- resolution: {integrity:
sha512-/omBIJG1nHQc+bgkYDuLpb/V08QyutP9amOrJRUSlYJZP+b/68gM//D8sxJe3Yry2QnYIr3QjR3x4AlxJEN3GA==}
+ /@rollup/plugin-commonjs/17.1.0_rollup@2.37.1:
+ resolution: {integrity:
sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==}
engines: {node: '>= 8.0.0'}
peerDependencies:
rollup: ^2.30.0
dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@2.43.0
+ '@rollup/pluginutils': 3.1.0_rollup@2.37.1
commondir: 1.0.1
estree-walker: 2.0.2
glob: 7.1.6
is-reference: 1.2.1
magic-string: 0.25.7
- resolve: 1.19.0
- rollup: 2.43.0
+ resolve: 1.20.0
+ rollup: 2.37.1
dev: true
- /@rollup/plugin-commonjs/17.1.0_rollup@2.37.1:
+ /@rollup/plugin-commonjs/17.1.0_rollup@2.43.0:
resolution: {integrity:
sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==}
engines: {node: '>= 8.0.0'}
peerDependencies:
rollup: ^2.30.0
dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@2.37.1
+ '@rollup/pluginutils': 3.1.0_rollup@2.43.0
commondir: 1.0.1
estree-walker: 2.0.2
glob: 7.1.6
is-reference: 1.2.1
magic-string: 0.25.7
resolve: 1.20.0
- rollup: 2.37.1
+ rollup: 2.43.0
dev: true
/@rollup/plugin-image/2.0.6_rollup@2.37.1:
@@ -3328,34 +3328,34 @@ packages:
rollup: 2.37.1
dev: true
- /@rollup/plugin-node-resolve/11.1.0_rollup@2.43.0:
- resolution: {integrity:
sha512-ouBBppRdWJKCllDXGzJ7ZIkYbaq+5TmyP0smt1vdJCFfoZhLi31vhpmjLhyo8lreHf4RoeSNllaWrvSqHpHRog==}
+ /@rollup/plugin-node-resolve/11.2.0_rollup@2.37.1:
+ resolution: {integrity:
sha512-qHjNIKYt5pCcn+5RUBQxK8krhRvf1HnyVgUCcFFcweDS7fhkOLZeYh0mhHK6Ery8/bb9tvN/ubPzmfF0qjDCTA==}
engines: {node: '>= 10.0.0'}
peerDependencies:
rollup: ^1.20.0||^2.0.0
dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@2.43.0
+ '@rollup/pluginutils': 3.1.0_rollup@2.37.1
'@types/resolve': 1.17.1
builtin-modules: 3.2.0
deepmerge: 4.2.2
is-module: 1.0.0
- resolve: 1.19.0
- rollup: 2.43.0
+ resolve: 1.20.0
+ rollup: 2.37.1
dev: true
- /@rollup/plugin-node-resolve/11.2.0_rollup@2.37.1:
+ /@rollup/plugin-node-resolve/11.2.0_rollup@2.43.0:
resolution: {integrity:
sha512-qHjNIKYt5pCcn+5RUBQxK8krhRvf1HnyVgUCcFFcweDS7fhkOLZeYh0mhHK6Ery8/bb9tvN/ubPzmfF0qjDCTA==}
engines: {node: '>= 10.0.0'}
peerDependencies:
rollup: ^1.20.0||^2.0.0
dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@2.37.1
+ '@rollup/pluginutils': 3.1.0_rollup@2.43.0
'@types/resolve': 1.17.1
builtin-modules: 3.2.0
deepmerge: 4.2.2
is-module: 1.0.0
resolve: 1.20.0
- rollup: 2.37.1
+ rollup: 2.43.0
dev: true
/@rollup/plugin-node-resolve/7.1.3_rollup@1.32.1:
@@ -3382,24 +3382,24 @@ packages:
rollup: 2.37.1
dev: true
- /@rollup/plugin-replace/2.3.4_rollup@2.43.0:
- resolution: {integrity:
sha512-waBhMzyAtjCL1GwZes2jaE9MjuQ/DQF2BatH3fRivUF3z0JBFrU0U6iBNC/4WR+2rLKhaAhPWDNPYp4mI6RqdQ==}
+ /@rollup/plugin-replace/2.4.2_rollup@1.32.1:
+ resolution: {integrity:
sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==}
peerDependencies:
rollup: ^1.20.0 || ^2.0.0
dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@2.43.0
+ '@rollup/pluginutils': 3.1.0_rollup@1.32.1
magic-string: 0.25.7
- rollup: 2.43.0
+ rollup: 1.32.1
dev: true
- /@rollup/plugin-replace/2.4.2_rollup@1.32.1:
+ /@rollup/plugin-replace/2.4.2_rollup@2.43.0:
resolution: {integrity:
sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==}
peerDependencies:
rollup: ^1.20.0 || ^2.0.0
dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@1.32.1
+ '@rollup/pluginutils': 3.1.0_rollup@2.43.0
magic-string: 0.25.7
- rollup: 1.32.1
+ rollup: 2.43.0
dev: true
/@rollup/pluginutils/3.1.0_rollup@1.32.1:
@@ -12052,7 +12052,7 @@ packages:
resolution: {integrity:
sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==}
engines: {node: '>= 10.13.0'}
dependencies:
- '@types/node': 14.14.22
+ '@types/node': 14.17.1
merge-stream: 2.0.0
supports-color: 7.2.0
dev: true
@@ -15767,7 +15767,7 @@ packages:
source-map-resolve: 0.6.0
dev: true
- /rollup-plugin-sourcemaps/0.6.3_79665b55c550dd6b792bac22e5c7c20e:
+ /rollup-plugin-sourcemaps/0.6.3_6efbbae6640434994627e0ab519821c6:
resolution: {integrity:
sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==}
engines: {node: '>=10.0.0'}
peerDependencies:
@@ -15778,7 +15778,7 @@ packages:
optional: true
dependencies:
'@rollup/pluginutils': 3.1.0_rollup@2.43.0
- '@types/node': 14.14.22
+ '@types/node': 14.17.1
rollup: 2.43.0
source-map-resolve: 0.6.0
dev: true
@@ -15801,7 +15801,7 @@ packages:
peerDependencies:
rollup: ^2.0.0
dependencies:
- '@babel/code-frame': 7.10.4
+ '@babel/code-frame': 7.12.13
jest-worker: 26.6.2
rollup: 2.37.1
serialize-javascript: 4.0.0
@@ -15813,7 +15813,7 @@ packages:
peerDependencies:
rollup: ^2.0.0
dependencies:
- '@babel/code-frame': 7.10.4
+ '@babel/code-frame': 7.12.13
jest-worker: 26.6.2
rollup: 2.43.0
serialize-javascript: 4.0.0
@@ -17257,7 +17257,6 @@ packages:
/tslib/2.2.0:
resolution: {integrity:
sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==}
- dev: true
/tsutils/3.19.1_typescript@4.1.3:
resolution: {integrity:
sha512-GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw==}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-wallet-core] branch master updated: change taler-wallet-android to taler-wallet-embedded,
gnunet <=