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

console to logger

Browse Source
This commit is contained in:
Sebastian 2022-04-21 15:39:30 -03:00
parent 3e31468444
commit 1a06f67006
No known key found for this signature in database
GPG Key ID: BE4FF68352439FC1
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/taler-wallet-webextension/src/background.ts
View File

@ -24,8 +24,8 @@
* Imports. * Imports.
*/ */
import { platform, setupPlatform } from "./platform/api.js"; import { platform, setupPlatform } from "./platform/api.js";
import firefoxAPI from "./platform/firefox.js";
import chromeAPI from "./platform/chrome.js"; import chromeAPI from "./platform/chrome.js";
import firefoxAPI from "./platform/firefox.js";
import { wxMain } from "./wxBackend.js"; import { wxMain } from "./wxBackend.js";
const isFirefox = typeof (window as any) !== 'undefined' && typeof (window as any)['InstallTrigger'] !== 'undefined' const isFirefox = typeof (window as any) !== 'undefined' && typeof (window as any)['InstallTrigger'] !== 'undefined'
@ -48,6 +48,7 @@ try {
console.error(e); console.error(e);
} }
// setGlobalLogLevelFromString("trace")
platform.notifyWhenAppIsReady(() => { platform.notifyWhenAppIsReady(() => {
wxMain(); wxMain();
}) })

23
packages/taler-wallet-webextension/src/wxBackend.ts
View File

@ -26,7 +26,7 @@
import { import {
classifyTalerUri, classifyTalerUri,
CoreApiResponse, CoreApiResponse,
CoreApiResponseSuccess, TalerErrorCode, CoreApiResponseSuccess, Logger, TalerErrorCode,
TalerUriType, TalerUriType,
WalletDiagnostics WalletDiagnostics
} from "@gnu-taler/taler-util"; } from "@gnu-taler/taler-util";
@ -66,6 +66,8 @@ let outdatedDbVersion: number | undefined;
const walletInit: OpenedPromise<void> = openPromise<void>(); const walletInit: OpenedPromise<void> = openPromise<void>();
const logger = new Logger("wxBackend.ts");
async function getDiagnostics(): Promise<WalletDiagnostics> { async function getDiagnostics(): Promise<WalletDiagnostics> {
const manifestData = platform.getWalletVersion(); const manifestData = platform.getWalletVersion();
const errors: string[] = []; const errors: string[] = [];
@ -136,13 +138,13 @@ async function dispatch(
} }
case "wxSetExtendedPermissions": { case "wxSetExtendedPermissions": {
const newVal = req.payload.value; const newVal = req.payload.value;
console.log("new extended permissions value", newVal); logger.trace("new extended permissions value", newVal);
if (newVal) { if (newVal) {
platform.registerTalerHeaderListener(parseTalerUriAndRedirect); platform.registerTalerHeaderListener(parseTalerUriAndRedirect);
r = wrapResponse({ newValue: true }); r = wrapResponse({ newValue: true });
} else { } else {
const rem = await platform.getPermissionsApi().remove(getReadRequestPermissions()); const rem = await platform.getPermissionsApi().remove(getReadRequestPermissions());
console.log("permissions removed:", rem); logger.trace("permissions removed:", rem);
r = wrapResponse({ newVal: false }); r = wrapResponse({ newVal: false });
} }
break; break;
@ -184,7 +186,7 @@ async function reinitWallet(): Promise<void> {
try { try {
currentDatabase = await openTalerDatabase(indexedDB as any, reinitWallet); currentDatabase = await openTalerDatabase(indexedDB as any, reinitWallet);
} catch (e) { } catch (e) {
console.error("could not open database", e); logger.error("could not open database", e);
walletInit.reject(e); walletInit.reject(e);
return; return;
} }
@ -202,12 +204,12 @@ async function reinitWallet(): Promise<void> {
timer = new SetTimeoutTimerAPI(); timer = new SetTimeoutTimerAPI();
} }
console.log("setting wallet"); logger.info("Setting up wallet");
const wallet = await Wallet.create(currentDatabase, httpLib, timer, cryptoWorker); const wallet = await Wallet.create(currentDatabase, httpLib, timer, cryptoWorker);
try { try {
await wallet.handleCoreApiRequest("initWallet", "native-init", {}); await wallet.handleCoreApiRequest("initWallet", "native-init", {});
} catch (e) { } catch (e) {
console.error("could not initialize wallet", e); logger.error("could not initialize wallet", e);
walletInit.reject(e); walletInit.reject(e);
return; return;
} }
@ -216,7 +218,7 @@ async function reinitWallet(): Promise<void> {
platform.sendMessageToAllChannels(message) platform.sendMessageToAllChannels(message)
}); });
wallet.runTaskLoop().catch((e) => { wallet.runTaskLoop().catch((e) => {
console.log("error during wallet task loop", e); logger.error("error during wallet task loop", e);
}); });
// Useful for debugging in the background page. // Useful for debugging in the background page.
if (typeof window !== "undefined") { if (typeof window !== "undefined") {
@ -254,7 +256,7 @@ function parseTalerUriAndRedirect(tabId: number, talerUri: string): void {
// handleNotifyReserve(w); // handleNotifyReserve(w);
break; break;
default: default:
console.warn( logger.warn(
"Response with HTTP 402 has Taler header, but header value is not a taler:// URI.", "Response with HTTP 402 has Taler header, but header value is not a taler:// URI.",
); );
break; break;
@ -268,6 +270,7 @@ function parseTalerUriAndRedirect(tabId: number, talerUri: string): void {
* Sets up all event handlers and other machinery. * Sets up all event handlers and other machinery.
*/ */
export async function wxMain(): Promise<void> { export async function wxMain(): Promise<void> {
logger.trace("starting")
const afterWalletIsInitialized = reinitWallet(); const afterWalletIsInitialized = reinitWallet();
platform.registerReloadOnNewVersion(); platform.registerReloadOnNewVersion();
@ -285,14 +288,14 @@ export async function wxMain(): Promise<void> {
try { try {
platform.registerTalerHeaderListener(parseTalerUriAndRedirect); platform.registerTalerHeaderListener(parseTalerUriAndRedirect);
} catch (e) { } catch (e) {
console.log(e); logger.error("could not register header listener", e);
} }
// On platforms that support it, also listen to external // On platforms that support it, also listen to external
// modification of permissions. // modification of permissions.
platform.getPermissionsApi().addPermissionsListener((perm, lastError) => { platform.getPermissionsApi().addPermissionsListener((perm, lastError) => {
if (lastError) { if (lastError) {
console.error(lastError); logger.error(`there was a problem trying to get permission ${perm}`, lastError);
return; return;
} }
platform.registerTalerHeaderListener(parseTalerUriAndRedirect); platform.registerTalerHeaderListener(parseTalerUriAndRedirect);