fixes and polyfills for quickjs

This commit is contained in:
Florian Dold 2022-11-11 20:52:45 +01:00
parent 22290020fb
commit 233a354b47
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
9 changed files with 184 additions and 11 deletions

View File

@ -0,0 +1,64 @@
// Converts an ArrayBuffer directly to base64, without any intermediate 'convert to string then
// use window.btoa' step. According to my tests, this appears to be a faster approach:
// http://jsperf.com/encoding-xhr-image-data/5
/*
MIT LICENSE
Copyright 2011 Jon Leighton
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
export function base64FromArrayBuffer(arrayBuffer: ArrayBuffer): string {
var base64 = "";
var encodings =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
var bytes = new Uint8Array(arrayBuffer);
var byteLength = bytes.byteLength;
var byteRemainder = byteLength % 3;
var mainLength = byteLength - byteRemainder;
var a, b, c, d;
var chunk;
// Main loop deals with bytes in chunks of 3
for (var i = 0; i < mainLength; i = i + 3) {
// Combine the three bytes into a single integer
chunk = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2];
// Use bitmasks to extract 6-bit segments from the triplet
a = (chunk & 16515072) >> 18; // 16515072 = (2^6 - 1) << 18
b = (chunk & 258048) >> 12; // 258048 = (2^6 - 1) << 12
c = (chunk & 4032) >> 6; // 4032 = (2^6 - 1) << 6
d = chunk & 63; // 63 = 2^6 - 1
// Convert the raw binary segments to the appropriate ASCII encoding
base64 += encodings[a] + encodings[b] + encodings[c] + encodings[d];
}
// Deal with the remaining bytes and padding
if (byteRemainder == 1) {
chunk = bytes[mainLength];
a = (chunk & 252) >> 2; // 252 = (2^6 - 1) << 2
// Set the 4 least significant bits to zero
b = (chunk & 3) << 4; // 3 = 2^2 - 1
base64 += encodings[a] + encodings[b] + "==";
} else if (byteRemainder == 2) {
chunk = (bytes[mainLength] << 8) | bytes[mainLength + 1];
a = (chunk & 64512) >> 10; // 64512 = (2^6 - 1) << 10
b = (chunk & 1008) >> 4; // 1008 = (2^6 - 1) << 4
// Set the 2 least significant bits to zero
c = (chunk & 15) << 2; // 15 = 2^4 - 1
base64 += encodings[a] + encodings[b] + encodings[c] + "=";
}
return base64;
}

View File

@ -33,3 +33,4 @@ export {
export { RequestThrottler } from "./RequestThrottler.js";
export * from "./CancellationToken.js";
export * from "./contract-terms.js";
export * from "./base64.js";

View File

@ -253,7 +253,6 @@ let decoder: any;
export function stringToBytes(s: string): Uint8Array {
if (!encoder) {
// @ts-ignore
encoder = new TextEncoder();
}
return encoder.encode(s);
@ -261,7 +260,6 @@ export function stringToBytes(s: string): Uint8Array {
export function bytesToString(b: Uint8Array): string {
if (!decoder) {
// @ts-ignore
decoder = new TextDecoder();
}
return decoder.decode(b);

View File

@ -23,6 +23,7 @@
*/
import {
AmountString,
base64FromArrayBuffer,
buildCodecForObject,
Codec,
codecForAny,
@ -31,6 +32,7 @@ import {
getRandomBytes,
j2s,
Logger,
stringToBytes,
TalerErrorCode,
} from "@gnu-taler/taler-util";
import { TalerError } from "./errors.js";
@ -85,7 +87,7 @@ export interface HarnessExchangeBankAccount {
*/
function makeBasicAuthHeader(username: string, password: string): string {
const auth = `${username}:${password}`;
const authEncoded: string = Buffer.from(auth).toString("base64");
const authEncoded: string = base64FromArrayBuffer(stringToBytes(auth));
return `Basic ${authEncoded}`;
}

View File

@ -18,8 +18,10 @@
* Imports.
*/
import {
base64FromArrayBuffer,
ConfirmPayResultType,
Logger,
stringToBytes,
TestPayResult,
WithdrawTestBalanceRequest,
} from "@gnu-taler/taler-util";
@ -78,10 +80,11 @@ function makeId(length: number): string {
/**
* Helper function to generate the "Authorization" HTTP header.
* FIXME: redundant, put in taler-util
*/
function makeBasicAuthHeader(username: string, password: string): string {
const auth = `${username}:${password}`;
const authEncoded: string = Buffer.from(auth).toString("base64");
const authEncoded: string = base64FromArrayBuffer(stringToBytes(auth));
return `Basic ${authEncoded}`;
}

View File

@ -68,7 +68,7 @@ export interface HttpRequestOptions {
*/
cancellationToken?: CancellationToken;
body?: string | ArrayBuffer | ArrayBufferView;
body?: string | ArrayBuffer | Object;
}
/**

View File

@ -53,7 +53,7 @@ class IntervalHandle {
* only event left. Has no effect in the browser.
*/
unref(): void {
if (typeof this.h === "object") {
if (typeof this.h === "object" && "unref" in this.h) {
this.h.unref();
}
}
@ -71,7 +71,7 @@ class TimeoutHandle {
* only event left. Has no effect in the browser.
*/
unref(): void {
if (typeof this.h === "object") {
if (typeof this.h === "object" && "unref" in this.h) {
this.h.unref();
}
}

View File

@ -51,6 +51,7 @@ export const buildConfig = {
target: [
'es2020'
],
external: ["os"],
format: 'esm',
platform: 'neutral',
mainFields: ["module", "main"],

View File

@ -23,6 +23,7 @@ import {
getErrorDetailFromException,
handleWorkerError,
handleWorkerMessage,
Headers,
HttpRequestLibrary,
HttpRequestOptions,
HttpResponse,
@ -31,13 +32,16 @@ import {
SetTimeoutTimerAPI,
SynchronousCryptoWorkerFactoryPlain,
Wallet,
WalletApiOperation,
} from "@gnu-taler/taler-wallet-core";
import {
CoreApiEnvelope,
CoreApiResponse,
CoreApiResponseSuccess,
j2s,
Logger,
setGlobalLogLevelFromString,
WalletNotification,
} from "@gnu-taler/taler-util";
import { BridgeIDBFactory } from "@gnu-taler/idb-bridge";
@ -45,6 +49,31 @@ import { MemoryBackend } from "@gnu-taler/idb-bridge";
import { shimIndexedDB } from "@gnu-taler/idb-bridge";
import { IDBFactory } from "@gnu-taler/idb-bridge";
import * as _qjsOsImp from "os";
const textDecoder = new TextDecoder();
const textEncoder = new TextEncoder();
export interface QjsHttpResp {
status: number;
data: ArrayBuffer;
}
export interface QjsHttpOptions {
method: string;
debug?: boolean;
data?: ArrayBuffer;
headers?: string[];
}
export interface QjsOsLib {
// Not async!
fetchHttp(url: string, options?: QjsHttpOptions): QjsHttpResp;
}
// This is not the nodejs "os" module, but the qjs "os" module.
const qjsOs: QjsOsLib = _qjsOsImp as any;
export { handleWorkerError, handleWorkerMessage };
const logger = new Logger("taler-wallet-embedded/index.ts");
@ -54,20 +83,73 @@ export class NativeHttpLib implements HttpRequestLibrary {
url: string,
opt?: HttpRequestOptions | undefined,
): Promise<HttpResponse> {
throw new Error("Method not implemented.");
return this.fetch(url, {
method: "GET",
...opt,
});
}
postJson(
url: string,
body: any,
opt?: HttpRequestOptions | undefined,
): Promise<HttpResponse> {
throw new Error("Method not implemented.");
return this.fetch(url, {
method: "POST",
body,
...opt,
});
}
fetch(
async fetch(
url: string,
opt?: HttpRequestOptions | undefined,
): Promise<HttpResponse> {
throw new Error("Method not implemented.");
const method = opt?.method ?? "GET";
let data: ArrayBuffer | undefined = undefined;
let headers: string[] = [];
if (opt?.headers) {
for (let headerName of Object.keys(opt.headers)) {
headers.push(`${headerName}: ${opt.headers[headerName]}`);
}
}
if (method.toUpperCase() === "POST") {
if (opt?.body) {
if (typeof opt.body === "string") {
data = textEncoder.encode(opt.body).buffer;
} else if (ArrayBuffer.isView(opt.body)) {
data = opt.body.buffer;
} else if (opt.body instanceof ArrayBuffer) {
data = opt.body;
} else if (typeof opt.body === "object") {
data = textEncoder.encode(JSON.stringify(opt.body)).buffer;
}
} else {
data = new ArrayBuffer(0);
}
}
console.log(`data type ${data?.constructor.name}`);
console.log(`data: ${j2s(data)}`);
const res = qjsOs.fetchHttp(url, {
method,
data,
headers,
});
return {
requestMethod: method,
headers: new Headers(),
async bytes() {
return res.data;
},
json() {
const text = textDecoder.decode(res.data);
return JSON.parse(text);
},
async text() {
const text = textDecoder.decode(res.data);
return text;
},
requestUrl: url,
status: res.status,
};
}
}
@ -268,6 +350,7 @@ class NativeWalletMessageHandler {
}
export function installNativeWalletListener(): void {
setGlobalLogLevelFromString("trace");
const handler = new NativeWalletMessageHandler();
const onMessage = async (msgStr: any): Promise<void> => {
if (typeof msgStr !== "string") {
@ -311,3 +394,24 @@ export function installNativeWalletListener(): void {
// @ts-ignore
globalThis.installNativeWalletListener = installNativeWalletListener;
// @ts-ignore
globalThis.makeWallet = getWallet;
export async function testWithGv() {
const w = await getWallet();
await w.wallet.client.call(WalletApiOperation.InitWallet, {});
await w.wallet.client.call(WalletApiOperation.RunIntegrationTest, {
amountToSpend: "KUDOS:1",
amountToWithdraw: "KUDOS:3",
bankBaseUrl: "https://bank.demo.taler.net/demobanks/default/access-api/",
exchangeBaseUrl: "https://exchange.demo.taler.net/",
merchantBaseUrl: "https://backend.demo.taler.net/",
});
await w.wallet.runTaskLoop({
stopWhenDone: true,
});
}
// @ts-ignore
globalThis.testWithGv = testWithGv;