mirror of
https://github.com/excalidraw/excalidraw.git
synced 2025-05-03 10:00:07 -04:00
fix encoding of embed data & compress (#2240)
This commit is contained in:
parent
e8a39b5f84
commit
b3263c2a69
15 changed files with 483 additions and 122 deletions
116
src/data/encode.ts
Normal file
116
src/data/encode.ts
Normal file
|
@ -0,0 +1,116 @@
|
|||
import { deflate, inflate } from "pako";
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// byte (binary) strings
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
// fast, Buffer-compatible implem
|
||||
export const toByteString = (data: string | Uint8Array): Promise<string> => {
|
||||
return new Promise((resolve, reject) => {
|
||||
const blob =
|
||||
typeof data === "string"
|
||||
? new Blob([new TextEncoder().encode(data)])
|
||||
: new Blob([data]);
|
||||
const reader = new FileReader();
|
||||
reader.onload = (event) => {
|
||||
if (!event.target || typeof event.target.result !== "string") {
|
||||
return reject(new Error("couldn't convert to byte string"));
|
||||
}
|
||||
resolve(event.target.result);
|
||||
};
|
||||
reader.readAsBinaryString(blob);
|
||||
});
|
||||
};
|
||||
|
||||
const byteStringToArrayBuffer = (byteString: string) => {
|
||||
const buffer = new ArrayBuffer(byteString.length);
|
||||
const bufferView = new Uint8Array(buffer);
|
||||
for (let i = 0, len = byteString.length; i < len; i++) {
|
||||
bufferView[i] = byteString.charCodeAt(i);
|
||||
}
|
||||
return buffer;
|
||||
};
|
||||
|
||||
const byteStringToString = (byteString: string) => {
|
||||
return new TextDecoder("utf-8").decode(byteStringToArrayBuffer(byteString));
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// base64
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* @param isByteString set to true if already byte string to prevent bloat
|
||||
* due to reencoding
|
||||
*/
|
||||
export const stringToBase64 = async (str: string, isByteString = false) => {
|
||||
return isByteString ? btoa(str) : btoa(await toByteString(str));
|
||||
};
|
||||
|
||||
// async to align with stringToBase64
|
||||
export const base64ToString = async (base64: string, isByteString = false) => {
|
||||
return isByteString ? atob(base64) : byteStringToString(atob(base64));
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// text encoding
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
type EncodedData = {
|
||||
encoded: string;
|
||||
encoding: "bstring";
|
||||
/** whether text is compressed (zlib) */
|
||||
compressed: boolean;
|
||||
/** version for potential migration purposes */
|
||||
version?: string;
|
||||
};
|
||||
|
||||
/**
|
||||
* Encodes (and potentially compresses via zlib) text to byte string
|
||||
*/
|
||||
export const encode = async ({
|
||||
text,
|
||||
compress,
|
||||
}: {
|
||||
text: string;
|
||||
/** defaults to `true`. If compression fails, falls back to bstring alone. */
|
||||
compress?: boolean;
|
||||
}): Promise<EncodedData> => {
|
||||
let deflated!: string;
|
||||
if (compress !== false) {
|
||||
try {
|
||||
deflated = await toByteString(deflate(text));
|
||||
} catch (error) {
|
||||
console.error("encode: cannot deflate", error);
|
||||
}
|
||||
}
|
||||
return {
|
||||
version: "1",
|
||||
encoding: "bstring",
|
||||
compressed: !!deflated,
|
||||
encoded: deflated || (await toByteString(text)),
|
||||
};
|
||||
};
|
||||
|
||||
export const decode = async (data: EncodedData): Promise<string> => {
|
||||
let decoded: string;
|
||||
|
||||
switch (data.encoding) {
|
||||
case "bstring":
|
||||
// if compressed, do not double decode the bstring
|
||||
decoded = data.compressed
|
||||
? data.encoded
|
||||
: await byteStringToString(data.encoded);
|
||||
break;
|
||||
default:
|
||||
throw new Error(`decode: unknown encoding "${data.encoding}"`);
|
||||
}
|
||||
|
||||
if (data.compressed) {
|
||||
return inflate(new Uint8Array(byteStringToArrayBuffer(decoded)), {
|
||||
to: "string",
|
||||
});
|
||||
}
|
||||
|
||||
return decoded;
|
||||
};
|
Loading…
Add table
Add a link
Reference in a new issue