@poe-platform/safe-bash 0.1.811 → 0.1.812

package/dist/spreadsheet-format-xls/biff-encrypted-properties.d.ts

@@ -7,6 +7,6 @@ export declare function encryptedBiffPropertyStream(streams: ReadonlyMap<string,
 /** MS-OFFCRYPTO 2.3.5.4: header/table restart block 0; each payload restarts its
  * descriptor block. These are not Workbook's absolute-position 1024-byte chunks. */
 export declare function decryptBiffPropertyContainer(encrypted: Uint8Array, keyStream: (block: number, length: number) => Uint8Array, context: CapabilityContext, charge: (amount: number) => void, createCipher?: (block: number) => BiffRc4Cipher): ReadonlyMap<string, Uint8Array>;
-/** Decrypt retained ciphertext directly into caller storage. Only the descriptor
- * table is buffered; payload plaintext never accumulates in RAM. */
+/** Decrypt retained ciphertext and descriptor bytes directly into caller storage.
+ * Parsed descriptors and names remain resident; plaintext transfers are bounded. */
 export declare function decryptBiffPropertySources(encrypted: Uint8Array | RangeSource, createCipher: (block: number) => BiffRc4Cipher, context: CapabilityContext, charge: (amount: number) => void): Promise<ReadonlyMap<string, BiffPropertySource>>;

package/dist/spreadsheet-format-xls/biff-encrypted-properties.js

@@ -105,7 +105,13 @@ export function decryptBiffPropertyContainer(encrypted, keyStream, context, char
         if (encrypted.length > context.limits.inputBytes)
             throw new SsconvertError("resource-limit", "ssconvert encrypted BIFF property input limit exceeded");
         const source = new Binary(encrypted), { offset, size } = propertyTableRange(decrypt(source.slice(0, 8), 0), source);
-        const descriptors = readEncryptedPropertyDescriptors(source, offset, size, decrypt(source.slice(offset, size), 0), context, charge);
+        const table = new Binary(decrypt(source.slice(offset, size), 0));
+        const reader = readEncryptedPropertyDescriptors(source, offset, size, context, charge);
+        let step = reader.next();
+        while (!step.done)
+            step = reader.next(table.slice(step.value.at, step.value.size));
+        table.bytes.fill(0);
+        const descriptors = step.value;
         for (const entry of descriptors)
             result.set(entry.name, decrypt(source.slice(entry.offset, entry.size), entry.block));
         return result;
@@ -123,8 +129,8 @@ function propertyTableRange(bytes, source) {
     source.check(offset, size);
     return { offset, size };
 }
-function readEncryptedPropertyDescriptors(source, offset, size, bytes, context, charge) {
-    const table = new Binary(bytes), count = table.u32(0);
+function* readEncryptedPropertyDescriptors(source, offset, size, context, charge) {
+    const count = new Binary(yield { at: 0, size: 4 }).u32(0);
     if (count > Math.floor((size - 4) / 18))
         invalidBiff("invalid encrypted property descriptor count");
     if (count > (context.limits.workbookNodes ?? context.limits.inputBytes))
@@ -134,23 +140,25 @@ function readEncryptedPropertyDescriptors(source, offset, size, bytes, context,
     const descriptors = [], names = new Set();
     for (let i = 0; i < count; i++) {
         context.signal.throwIfAborted();
-        table.check(at, 18);
-        const start = table.u32(at), length = table.u32(at + 4), block = table.u16(at + 8), nameLength = table.u8(at + 10), flags = table.u8(at + 11);
-        if (flags !== 1 || table.u32(at + 12) !== 0)
+        const entry = new Binary(yield { at, size: 18 });
+        entry.check(0, 18);
+        const start = entry.u32(0), length = entry.u32(4), block = entry.u16(8), nameLength = entry.u8(10), flags = entry.u8(11);
+        if (flags !== 1 || entry.u32(12) !== 0)
             invalidBiff("invalid encrypted property descriptor flags");
         at += 16;
         if (!nameLength || nameLength > 31)
             invalidBiff("invalid encrypted property stream name");
-        table.check(at, (nameLength + 1) * 2);
+        const nameBytes = new Binary(yield { at, size: (nameLength + 1) * 2 });
+        nameBytes.check(0, (nameLength + 1) * 2);
         charge(nameLength);
-        if (table.u16(at + nameLength * 2) !== 0)
+        if (nameBytes.u16(nameLength * 2) !== 0)
             invalidBiff("unterminated encrypted property stream name");
         textBytes += nameLength * 3;
         if (textBytes > (context.limits.workbookTextBytes ?? context.limits.inputBytes))
             throw new SsconvertError("resource-limit", "ssconvert encrypted BIFF property text limit exceeded");
         let name;
         try {
-            name = new TextDecoder("utf-16le", { fatal: true, ignoreBOM: true }).decode(table.slice(at, nameLength * 2));
+            name = new TextDecoder("utf-16le", { fatal: true, ignoreBOM: true }).decode(nameBytes.slice(0, nameLength * 2));
         }
         catch {
             invalidBiff("invalid encrypted property stream name");
@@ -166,7 +174,6 @@ function readEncryptedPropertyDescriptors(source, offset, size, bytes, context,
     }
     if (at !== size)
         invalidBiff("invalid encrypted property descriptor size");
-    table.bytes.fill(0);
     charge(count * Math.ceil(Math.log2(count + 1)));
     const ordered = [...descriptors].sort((a, b) => a.offset - b.offset);
     for (let i = 1; i < ordered.length; i++)
@@ -174,8 +181,8 @@ function readEncryptedPropertyDescriptors(source, offset, size, bytes, context,
             invalidBiff("overlapping encrypted property payloads");
     return descriptors;
 }
-/** Decrypt retained ciphertext directly into caller storage. Only the descriptor
- * table is buffered; payload plaintext never accumulates in RAM. */
+/** Decrypt retained ciphertext and descriptor bytes directly into caller storage.
+ * Parsed descriptors and names remain resident; plaintext transfers are bounded. */
 export async function decryptBiffPropertySources(encrypted, createCipher, context, charge) {
     const result = new Map(), owned = [];
     const input = propertyRange(encrypted, context);
@@ -234,7 +241,33 @@ export async function decryptBiffPropertySources(encrypted, createCipher, contex
             return output;
         };
         const { offset, size } = propertyTableRange(await decrypt(0, 8), input);
-        const descriptors = readEncryptedPropertyDescriptors(input, offset, size, await decrypt(offset, size), context, charge);
+        const table = await stagePropertyBytes({ length: size, chunks: () => chunks(offset, size, 0) }, context, context.limits.inputBytes);
+        const reader = readEncryptedPropertyDescriptors(input, offset, size, context, charge);
+        let step = reader.next();
+        try {
+            while (!step.done) {
+                const bytes = await table.read(step.value.at, step.value.size, { signal: context.signal });
+                try {
+                    check();
+                    step = reader.next(bytes);
+                }
+                finally {
+                    bytes.fill(0);
+                }
+            }
+        }
+        catch (error) {
+            try {
+                await table.close();
+            }
+            catch (cleanup) {
+                throw new AggregateError([error, cleanup], "Encrypted BIFF descriptor read and cleanup failed");
+            }
+            throw error;
+        }
+        await table.close();
+        check();
+        const descriptors = step.value;
         for (const entry of descriptors) {
             const source = await stagePropertyBytes({ length: entry.size, chunks: () => chunks(entry.offset, entry.size, entry.block) }, context, context.limits.inputBytes);
             result.set(entry.name, source);

package/dist/spreadsheet-format-xls/biff-metadata.d.ts

@@ -5,6 +5,7 @@ import { type BiffRecord } from "./biff-binary.js";
 export declare function biffNode(name: string, attributes: Readonly<Record<string, ImportedValue>>, text?: string, children?: readonly ImportedValue[]): ImportedValue;
 export declare const biffProtectionPermissions: readonly ["objects", "scenarios", "formatCells", "formatColumns", "formatRows", "insertColumns", "insertRows", "insertHyperlinks", "deleteColumns", "deleteRows", "selectLockedCells", "sort", "autoFilter", "pivotTables", "selectUnlockedCells"];
 export declare const biffMetadataOpcodes: Set<number>;
+export declare function biffHeaderParts(text: string): Readonly<Record<string, string>>;
 /** Source-backed neutral records consumed by both existing workbook writers. */
 interface BiffMetadata {
     records: UnsupportedRecord[];

package/dist/spreadsheet-format-xls/biff-metadata.js

@@ -11,7 +11,7 @@ export const biffProtectionPermissions = ["objects", "scenarios", "formatCells",
     "sort", "autoFilter", "pivotTables", "selectUnlockedCells"];
 export const biffMetadataOpcodes = new Set([0x2a, 0x2b, 0x25, 0x225, 0x81, 0x83, 0x84, 0xa1, 0x55, 0x23e, 0x3e,
     0x1d, 0x1a, 0x1b, 0x41, 0xa0, 0x867, 0x1c, 0x1b6]);
-function header(text) {
+export function biffHeaderParts(text) {
     const values = { Left: "", Middle: "", Right: "" };
     const substitutions = { P: "&[PAGE]", N: "&[PAGES]", D: "&[DATE]", T: "&[TIME]", F: "&[FILE]", A: "&[TAB]", Z: "&[PATH]" };
     let side = "Left";
@@ -234,7 +234,7 @@ function* metadataSteps(length, revision, codepage, context) {
         result.push({ source: "Gnumeric_XmlIO:sax", kind: "PrintInformation", disposition: "retained",
             data: biffNode("PrintInformation", {}, "", [biffNode("Margins", {}, "", Object.entries(margins).map(([name, Points]) => biffNode(name, { Points, PrefUnit: "mm" }))),
                 biffNode("Scale", fitToPage ? { type: "fit", cols: fitColumns, rows: fitRows } : scale), ...Object.entries(print).map(([name, value]) => biffNode(name, { value })), biffNode("order", {}, order),
-                biffNode("orientation", {}, orientation), biffNode("Header", header(headerText)), biffNode("Footer", header(footerText)),
+                biffNode("orientation", {}, orientation), biffNode("Header", biffHeaderParts(headerText)), biffNode("Footer", biffHeaderParts(footerText)),
                 biffNode("paper", {}, paper), biffNode("comments", { placement: commentPlacement }), biffNode("errors", { PrintErrorsAs: errorDisplay }), ...breaks]) });
     if (objects.length)
         result.push({ source: "Gnumeric_XmlIO:sax", kind: "Objects", disposition: "retained", data: biffNode("Objects", {}, "", objects) });

package/dist/spreadsheet-format-xls/biff-write-metadata.js

@@ -3,7 +3,7 @@ import { parseA1 } from "../spreadsheet-ast/index.js";
 import { metadataNode } from "../spreadsheet-engine/codecs/xlsx-write-support.js";
 import { words } from "./biff-write-binary.js";
 import { biffString } from "./biff-write.js";
-import { biffProtectionPermissions } from "./biff-metadata.js";
+import { biffProtectionPermissions, biffHeaderParts } from "./biff-metadata.js";
 import { biffFontWidth } from "./biff-font-widths.js";
 import { writeBiffLabelRanges } from "./biff-label-ranges.js";
 function concat(...parts) {
@@ -442,6 +442,15 @@ export class BiffMetadataWriter {
                     text += source[at] === "&" ? "&&" : source[at];
                 }
             }
+            const original = sheet.view?.[name === "Header" ? "printHeader" : "printFooter"];
+            if (node && typeof original === "string") {
+                this.charge(original.length);
+                const sections = biffHeaderParts(original);
+                // Keep the imported token spelling (including formatting controls)
+                // when the normalized sections are unchanged. Explicit edits win.
+                if (Object.entries(sections).every(([side, value]) => value === (node.attributes[side] ?? "")))
+                    text = original;
+            }
             await output.record(opcode, biffString(text, revision, this.context, revision === 8 ? 2 : 1));
         }
         for (const [name, opcode] of [["hPageBreaks", 0x1b], ["vPageBreaks", 0x1a]]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poe-platform/safe-bash",
-  "version": "0.1.811",
+  "version": "0.1.812",
   "description": "Extensible virtual shell with pluggable filesystems and streaming commands",
   "type": "module",
   "license": "MIT",
@@ -1407,7 +1407,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@poe-platform/safe-fs": "0.1.811",
+    "@poe-platform/safe-fs": "0.1.812",
     "pdf-lib": "1.17.1",
     "@types/node": "^25.2.2",
     "@formatjs/intl-numberformat": "9.4.0",