remove unsafe btoa calls

This commit is contained in:
sawka 2024-08-19 11:54:54 -07:00
parent 8651659c02
commit b412f72f6b
3 changed files with 6 additions and 3 deletions

View File

@ -6,6 +6,7 @@ import { VDomView } from "@/app/view/term/vdom";
import { WOS, atoms, getEventORefSubject, globalStore, useBlockAtom, useSettingsAtom } from "@/store/global";
import * as services from "@/store/services";
import * as keyutil from "@/util/keyutil";
import * as util from "@/util/util";
import clsx from "clsx";
import { produce } from "immer";
import * as jotai from "jotai";
@ -277,7 +278,7 @@ const TerminalView = ({ blockId, model }: TerminalViewProps) => {
if (asciiVal.length == 0) {
return false;
}
const b64data = btoa(asciiVal);
const b64data = util.stringToBase64(asciiVal);
WshServer.ControllerInputCommand({ blockid: blockId, inputdata64: b64data });
return true;
};

View File

@ -4,6 +4,7 @@
import { WshServer } from "@/app/store/wshserver";
import { createBlock } from "@/store/global";
import { getWebServerEndpoint } from "@/util/endpoints";
import { stringToBase64 } from "@/util/util";
import clsx from "clsx";
import * as jotai from "jotai";
import * as React from "react";
@ -98,7 +99,7 @@ function TermSticker({ sticker, config }: { sticker: StickerType; config: Sticke
clickHandler = () => {
console.log("clickHandler", sticker.clickcmd, sticker.clickblockdef);
if (sticker.clickcmd) {
const b64data = btoa(sticker.clickcmd);
const b64data = stringToBase64(sticker.clickcmd);
WshServer.ControllerInputCommand({ blockid: config.blockId, inputdata64: b64data });
}
if (sticker.clickblockdef) {

View File

@ -4,6 +4,7 @@
import { WshServer } from "@/app/store/wshserver";
import { PLATFORM, WOS, fetchWaveFile, getFileSubject, openLink, sendWSCommand } from "@/store/global";
import * as services from "@/store/services";
import * as util from "@/util/util";
import { base64ToArray, fireAndForget } from "@/util/util";
import { SerializeAddon } from "@xterm/addon-serialize";
import { WebLinksAddon } from "@xterm/addon-web-links";
@ -148,7 +149,7 @@ export class TermWrap {
}
handleTermData(data: string) {
const b64data = btoa(data);
const b64data = util.stringToBase64(data);
WshServer.ControllerInputCommand({ blockid: this.blockId, inputdata64: b64data });
}