@el-j/google-sheet-translations 3.0.0-beta.8 → 3.0.0-beta.9

package/dist/esm/index.js

@@ -3299,11 +3299,13 @@ function parsePadUrl(url) {
 	const match = urlObj.hash.match(/#\/(\d+)\/([^/]+)\/([^/]+)\/([^/]+)(\/p\/)?/);
 	if (!match) throw new Error(`Unsupported CryptPad URL format: "${url}". Expected "#/<version>/<app>/<mode>/<seed>[/p/]"`);
 	const [, versionStr, app, modeRaw, seed, passwordFlag] = match;
+	const version = parseInt(versionStr, 10);
+	if (version === 3) throw new Error(`CryptPad URL "${url}" is a version 3 "safe link" (hidden hash) which omits the encryption key to protect it in browser address bars. Please use the original pad share URL (version 2 format: "https://.../#/2/${app}/${modeRaw}/<secret>/..."), which can be copied via CryptPad's "Share" -> "Link" menu.`);
 	const mode = modeRaw === "edit" ? "edit" : "view";
 	const isPasswordProtected = Boolean(passwordFlag);
 	return {
 		origin: urlObj.origin,
-		version: parseInt(versionStr, 10),
+		version,
 		app,
 		mode,
 		seed,
@@ -3312,27 +3314,36 @@ function parsePadUrl(url) {
 	};
 }
 /**
-* Derives the Netflux channel ID (hex string) and symmetric encryption key (32 bytes)
-* from a CryptPad pad seed and optional password according to CryptPad's createEditCryptor2 / createViewCryptor2 protocol.
+* Derives the Netflux channel ID (hex string), symmetric encryption key (32 bytes),
+* and Ed25519 signing keypair from a CryptPad pad seed and optional password
+* according to CryptPad's createEditCryptor2 / createViewCryptor2 protocol.
 */
 function deriveCryptPadKeys(seedStr, password) {
 	const seed = b64Decode(seedStr);
 	if (!password) {
-		const seed2 = crypto.createHash("sha512").update(seed).digest().subarray(32, 64);
+		const hash = crypto.createHash("sha512").update(seed).digest();
+		const signKp = nacl.sign.keyPair.fromSeed(hash.subarray(0, 32));
+		const seed2 = hash.subarray(32, 64);
 		const hash2 = crypto.createHash("sha512").update(seed2).digest();
 		return {
 			channelHex: hash2.subarray(0, 16).toString("hex"),
-			cryptKey: new Uint8Array(hash2.subarray(16, 48))
+			cryptKey: new Uint8Array(hash2.subarray(16, 48)),
+			signKey: signKp.secretKey,
+			validateKey: signKp.publicKey
 		};
 	}
 	const pwBytes = decodeUTF8(password);
 	const superSeed1 = Buffer.concat([Buffer.from(pwBytes), Buffer.from(seed)]);
-	const seed2 = crypto.createHash("sha512").update(superSeed1).digest().subarray(32, 64);
+	const hash1 = crypto.createHash("sha512").update(superSeed1).digest();
+	const signKp = nacl.sign.keyPair.fromSeed(hash1.subarray(0, 32));
+	const seed2 = hash1.subarray(32, 64);
 	const superSeed2 = Buffer.concat([Buffer.from(pwBytes), Buffer.from(seed2)]);
 	const hash2 = crypto.createHash("sha512").update(superSeed2).digest();
 	return {
 		channelHex: hash2.subarray(0, 16).toString("hex"),
-		cryptKey: new Uint8Array(hash2.subarray(16, 48))
+		cryptKey: new Uint8Array(hash2.subarray(16, 48)),
+		signKey: signKp.secretKey,
+		validateKey: signKp.publicKey
 	};
 }
 /**
@@ -3363,13 +3374,16 @@ function decryptCryptPadPayload(payload, cryptKey) {
 }
 /**
 * Encrypts a plaintext message payload using TweetNaCl secretbox (XSalsa20-Poly1305).
-* Formats output as `base64(nonce)|base64(ciphertext)`.
+* If signKey is provided, signs the `nonce|ciphertext` string using TweetNaCl Ed25519
+* matching OnlyOffice / CryptPad real-time channel requirements.
 */
-function encryptCryptPadPayload(plaintext, cryptKey) {
+function encryptCryptPadPayload(plaintext, cryptKey, signKey) {
 	const nonce = nacl.randomBytes(24);
 	const msgBytes = decodeUTF8(plaintext);
 	const cipher = nacl.secretbox(msgBytes, nonce, cryptKey);
-	return `${b64Encode(nonce)}|${b64Encode(cipher)}`;
+	const encStr = `${b64Encode(nonce)}|${b64Encode(cipher)}`;
+	if (signKey) return b64Encode(nacl.sign(decodeUTF8(encStr), signKey));
+	return encStr;
 }
 //#endregion
 //#region src/providers/cryptpad/netflux.ts
@@ -3462,11 +3476,7 @@ function fetchChannelHistory(wsUrl, channelHex, cryptKey, options = {}) {
 							seq++,
 							"MSG",
 							peerId,
-							JSON.stringify([
-								"GET_HISTORY",
-								channelHex,
-								{}
-							])
+							JSON.stringify(["GET_FULL_HISTORY", channelHex])
 						]));
 						resetQuietTimer();
 					}
@@ -3476,7 +3486,11 @@ function fetchChannelHistory(wsUrl, channelHex, cryptKey, options = {}) {
 					if (!encStr && typeof msg[3] === "string" && msg[3].length > 50) encStr = msg[3];
 					try {
 						const parsed = JSON.parse(encStr);
-						if (Array.isArray(parsed) && parsed[2] === "MSG" && typeof parsed[4] === "string") encStr = parsed[4];
+						if (Array.isArray(parsed) && parsed[0] === "FULL_HISTORY" && Array.isArray(parsed[1])) encStr = parsed[1][4];
+						else if (Array.isArray(parsed) && parsed[0] === "FULL_HISTORY_END") {
+							finish(decryptedMessages);
+							return;
+						} else if (Array.isArray(parsed) && parsed[2] === "MSG" && typeof parsed[4] === "string") encStr = parsed[4];
 					} catch {}
 					if (typeof encStr === "string" && encStr.length > 30) {
 						const decrypted = decryptCryptPadPayload(encStr, cryptKey);
@@ -3490,7 +3504,9 @@ function fetchChannelHistory(wsUrl, channelHex, cryptKey, options = {}) {
 		};
 		ws.onerror = (err) => {
 			cleanup();
-			reject(/* @__PURE__ */ new Error(`CryptPad WebSocket error: ${String(err)}`));
+			const errObj = err;
+			const detail = errObj?.message || errObj?.error?.message || (errObj?.error ? String(errObj.error) : String(err));
+			reject(/* @__PURE__ */ new Error(`CryptPad WebSocket error: ${detail}`));
 		};
 	});
 }
@@ -3553,7 +3569,7 @@ function broadcastChannelMessage(wsUrl, channelHex, cryptKey, message, options =
 				const [, peerId, cmd] = msg;
 				if (cmd === "JOIN" && typeof peerId === "string" && !sent) {
 					sent = true;
-					const encrypted = encryptCryptPadPayload(message, cryptKey);
+					const encrypted = encryptCryptPadPayload(message, cryptKey, options.signKey);
 					ws.send(JSON.stringify([
 						seq++,
 						"MSG",
@@ -3567,7 +3583,9 @@ function broadcastChannelMessage(wsUrl, channelHex, cryptKey, message, options =
 			} catch {}
 		};
 		ws.onerror = (err) => {
-			rejectOnce(/* @__PURE__ */ new Error(`CryptPad WebSocket broadcast error: ${String(err)}`));
+			const errObj = err;
+			const detail = errObj?.message || errObj?.error?.message || (errObj?.error ? String(errObj.error) : String(err));
+			rejectOnce(/* @__PURE__ */ new Error(`CryptPad WebSocket broadcast error: ${detail}`));
 		};
 	});
 }
@@ -3583,6 +3601,12 @@ function colIndexToLetter(colIndex) {
 	}
 	return letter;
 }
+/** Converts column letter to 0-based index: 'A' -> 0, 'Z' -> 25, 'AA' -> 26. */
+function letterToColIndex(letter) {
+	let index = 0;
+	for (let i = 0; i < letter.length; i++) index = index * 26 + (letter.charCodeAt(i) - 64);
+	return index - 1;
+}
 /**
 * Parses cell coordinates from a reference like "A1", "Sheet1!B2", or "$C$5".
 */
@@ -3601,14 +3625,26 @@ function parseCellRef(ref) {
 function extractOnlyOfficeChannelId(metadataMessages) {
 	for (const raw of metadataMessages) try {
 		const parsed = JSON.parse(raw);
+		if (parsed?.content?.channel && typeof parsed.content.channel === "string") return parsed.content.channel;
 		if (Array.isArray(parsed) && Array.isArray(parsed[1])) {
-			for (const edit of parsed[1]) if (Array.isArray(edit) && typeof edit[2] === "string") try {
-				const inner = JSON.parse(edit[2]);
-				if (inner?.content?.channel && typeof inner.content.channel === "string") return inner.content.channel;
-			} catch {}
+			const candidateContainers = [parsed[1], Array.isArray(parsed[1][0]) ? parsed[1][0] : null].filter(Boolean);
+			for (const container of candidateContainers) for (const item of container) if (Array.isArray(item)) {
+				for (const elem of item) if (typeof elem === "string" && elem.includes("channel")) try {
+					const inner = JSON.parse(elem);
+					if (inner?.content?.channel && typeof inner.content.channel === "string") return inner.content.channel;
+				} catch {}
+			}
 		}
-		if (parsed?.content?.channel && typeof parsed.content.channel === "string") return parsed.content.channel;
-	} catch {}
+		if (typeof raw === "string") {
+			const match = raw.match(/\\?"channel\\?"\s*:\s*\\?"([a-f0-9]{32})\\?"/i);
+			if (match) return match[1];
+		}
+	} catch {
+		if (typeof raw === "string") {
+			const match = raw.match(/\\?"channel\\?"\s*:\s*\\?"([a-f0-9]{32})\\?"/i);
+			if (match) return match[1];
+		}
+	}
 	return null;
 }
 /**
@@ -3666,12 +3702,20 @@ function parseOnlyOfficeChanges(rtMessages) {
 							break;
 						}
 					}
-					if (buf.length >= 30 && i >= 40) try {
+					if (buf.length >= 31 && buf.readUInt32BE(4) === 19468289 && buf[14] === 1) try {
+						const c1 = buf.readUInt32LE(15);
+						const r1 = buf.readUInt32LE(19);
+						if (r1 < 1e5 && c1 < 200) {
+							const cellRef = `${colIndexToLetter(c1)}${r1 + 1}`;
+							if (str.trim().length > 0 && !str.includes("!")) cells[cellRef] = str;
+						}
+					} catch {}
+					else if (buf.length >= 30 && i >= 40 && buf.readUInt32BE(4) === 0) try {
 						const c1 = buf.readUInt32LE(14);
 						const r1 = buf.readUInt32LE(18);
 						if (r1 < 1e5 && c1 < 200) {
 							const cellRef = `${colIndexToLetter(c1)}${r1 + 1}`;
-							if (!cells[cellRef] && str.trim().length > 0 && !str.includes("!")) cells[cellRef] = str;
+							if (str.trim().length > 0 && !str.includes("!")) cells[cellRef] = str;
 						}
 					} catch {}
 				}
@@ -3740,11 +3784,70 @@ function convertCellsToMultiSheetRows(cells, defaultSheet = "Sheet1") {
 	return result;
 }
 /**
-* Encodes a single cell update record into OnlyOffice binary format (0x08 prefix + UTF-16LE string).
+* Encodes a single cell update record into OnlyOffice binary format:
+* - Native AscCH.historyitem_Cell_ChangeValue (0x01291001) with 32-bit LE coordinates c1, r1.
+* - Explicit UTF-16LE cell reference tags for backward-compatibility and multi-sheet routing.
 */
-function encodeOnlyOfficeCellRecord(cellRef, value) {
-	const refBuf = Buffer.from(cellRef, "utf16le");
+function encodeOnlyOfficeCellRecord(cellRef, value, sheetId = 6) {
+	let c1 = 0;
+	let r1 = 0;
+	const parsed = parseCellRef(cellRef);
+	if (parsed) {
+		c1 = letterToColIndex(parsed.col);
+		r1 = Math.max(0, parsed.row - 1);
+	}
 	const valBuf = Buffer.from(value, "utf16le");
+	const L = valBuf.length;
+	const tail = Buffer.from([
+		1,
+		0,
+		2,
+		0,
+		3,
+		2,
+		1,
+		2,
+		0,
+		3,
+		1
+	]);
+	const body = Buffer.alloc(60 + L + tail.length);
+	body.writeUInt32BE(19468289, 0);
+	body.writeUInt32LE(2, 4);
+	body[8] = 48 + sheetId % 10;
+	body[9] = 0;
+	body[10] = 1;
+	body.writeUInt32LE(c1, 11);
+	body.writeUInt32LE(r1, 15);
+	body.writeUInt32LE(c1, 19);
+	body.writeUInt32LE(r1, 23);
+	body[27] = 0;
+	body.writeUInt32LE(39 + L, 28);
+	body[32] = 0;
+	body[33] = 2;
+	body[34] = r1 & 255;
+	body[35] = 1;
+	body[36] = 2;
+	body[37] = c1 & 255;
+	body[38] = 2;
+	body[39] = 9;
+	body[40] = 3;
+	body.writeUInt32LE(26 + L, 41);
+	body[45] = 0;
+	body[46] = 0;
+	body[47] = 1;
+	body[48] = 9;
+	body[49] = 1;
+	body.writeUInt32LE(13 + L, 50);
+	body[54] = 0;
+	body[55] = 8;
+	body.writeUInt32LE(L, 56);
+	valBuf.copy(body, 60);
+	tail.copy(body, 60 + L);
+	const header = Buffer.alloc(4);
+	header.writeUInt32LE(body.length, 0);
+	const nativeBuf = Buffer.concat([header, body]);
+	const refBuf = Buffer.from(cellRef, "utf16le");
 	const refHeader = Buffer.alloc(5);
 	refHeader[0] = 8;
 	refHeader.writeUInt32LE(refBuf.length, 1);
@@ -3752,6 +3855,7 @@ function encodeOnlyOfficeCellRecord(cellRef, value) {
 	valHeader[0] = 8;
 	valHeader.writeUInt32LE(valBuf.length, 1);
 	return Buffer.concat([
+		nativeBuf,
 		refHeader,
 		refBuf,
 		valHeader,
@@ -3762,12 +3866,19 @@ function encodeOnlyOfficeCellRecord(cellRef, value) {
 * Formats a list of cell updates into an OnlyOffice change transaction JSON string.
 */
 function buildOnlyOfficeChangePayload(updates) {
+	const txOpen = Buffer.from("0a0000000129000000ff00000000", "hex");
 	const records = updates.map((u) => {
 		const colStr = typeof u.col === "number" ? colIndexToLetter(u.col) : u.col.toUpperCase();
 		return encodeOnlyOfficeCellRecord(`${u.sheet && u.sheet.trim().length > 0 ? `${u.sheet.trim()}!` : ""}${colStr}${u.row}`, u.value);
 	});
-	const changeEntry = `asc_1;${Buffer.concat(records).toString("base64")}`;
-	return JSON.stringify({ changes: [{ change: changeEntry }] });
+	const changeEntry = `asc_1;${Buffer.concat([txOpen, ...records]).toString("base64")}`;
+	return JSON.stringify({
+		type: "saveChanges",
+		changes: [{ change: changeEntry }],
+		startSaveChanges: true,
+		endSaveChanges: true,
+		isExcel: true
+	});
 }
 //#endregion
 //#region src/providers/cryptpad/client.ts
@@ -3829,12 +3940,26 @@ var CryptPadClient = class {
 		const wsUrl = await this.getWebsocketUrl(signal);
 		const { channelHex, cryptKey } = this.getKeys();
 		const newRtChannel = crypto.randomBytes(16).toString("hex");
-		const innerJson = JSON.stringify({ content: { channel: newRtChannel } });
-		await broadcastChannelMessage(wsUrl, channelHex, cryptKey, JSON.stringify([1, [[
-			0,
-			0,
-			innerJson
-		]]]), {
+		const innerJson = JSON.stringify({
+			content: {
+				hashes: {},
+				ids: {},
+				mediasSources: {},
+				originalVersion: 9,
+				version: 9,
+				channel: newRtChannel
+			},
+			metadata: { type: "oo" }
+		});
+		await broadcastChannelMessage(wsUrl, channelHex, cryptKey, JSON.stringify([
+			2,
+			[[[
+				0,
+				0,
+				innerJson
+			]], "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"],
+			"a4b411975be1d48a91f0ebfcd967add000f69564b2dc5ee644b87bf2bbfd786f"
+		]), {
 			timeoutMs: this.timeoutMs,
 			signal
 		});
@@ -3903,10 +4028,12 @@ var CryptPadClient = class {
 	*
 	* @param updates - Array of cell updates containing coordinates and text values.
 	* @param signal - Optional AbortSignal to cancel the broadcast.
+	* @param existingRtChannel - Optional pre-fetched RT channel ID to avoid refetching sheet data.
 	*/
-	async sendCellUpdates(updates, signal) {
+	async sendCellUpdates(updates, signal, existingRtChannel) {
 		if (updates.length === 0) return;
-		let rtChannel = (await this.fetchSheetData(signal)).metadata.rtChannelId;
+		let rtChannel = existingRtChannel;
+		if (!rtChannel) rtChannel = (await this.fetchSheetData(signal)).metadata.rtChannelId;
 		if (!rtChannel) {
 			this.onProgress?.("No OnlyOffice RT channel found. Initializing headlessly (no browser required)...");
 			rtChannel = await this.initializeRtChannel(signal);
@@ -3914,11 +4041,12 @@ var CryptPadClient = class {
 			await new Promise((r) => setTimeout(r, 800));
 		}
 		const wsUrl = await this.getWebsocketUrl(signal);
-		const { cryptKey } = this.getKeys();
+		const { cryptKey, signKey } = this.getKeys();
 		const payload = buildOnlyOfficeChangePayload(updates);
 		await broadcastChannelMessage(wsUrl, rtChannel, cryptKey, payload, {
 			timeoutMs: this.timeoutMs,
-			signal
+			signal,
+			signKey
 		});
 	}
 	/**
@@ -3931,7 +4059,8 @@ var CryptPadClient = class {
 	*/
 	async writeSheetRows(sheetName, rows, options = {}) {
 		if (rows.length === 0) return 0;
-		const existingRows = (await this.fetchSheetData(options.signal)).sheets[sheetName]?.rows ?? [];
+		const data = await this.fetchSheetData(options.signal);
+		const existingRows = data.sheets[sheetName]?.rows ?? [];
 		let keyColName = "var";
 		const firstExisting = existingRows[0];
 		const firstIncoming = rows[0];
@@ -3980,7 +4109,7 @@ var CryptPadClient = class {
 				}
 			}
 		}
-		await this.sendCellUpdates(updates, options.signal);
+		await this.sendCellUpdates(updates, options.signal, data.metadata.rtChannelId);
 		return updates.length;
 	}
 };
@@ -4113,6 +4242,7 @@ function createCryptPadSheetOutputProvider(options = {}) {
 				const count = await client.writeSheetRows(sheetName, rows, { override: options.override ?? false });
 				updatedSheets.push(sheetName);
 				totalUpdatedCells += count;
+				await new Promise((r) => setTimeout(r, 400));
 			}
 			return {
 				wroteFiles: [url],