@saltcorn/admin-models 1.6.3-beta.1 → 1.7.0-alpha.1

package/dist/tests/zip.test.js

@@ -0,0 +1,319 @@
+import { mkdtemp, mkdir, rm, readFile, writeFile, stat } from "fs/promises";
+import { createWriteStream } from "fs";
+import { randomFillSync } from "crypto";
+import { Readable } from "stream";
+import { join } from "path";
+import { tmpdir } from "os";
+import Zip from "adm-zip";
+import { Open } from "unzipper";
+import { ZipBuilder } from "../models/zip.js";
+import { extractZip } from "../models/zip-extract.js";
+import { ZipStreamWriter } from "../models/zip-writer.js";
+import { afterAll, beforeAll, describe, it, expect, jest, } from "@saltcorn/db-common/test_expect";
+jest.setTimeout(60000);
+let dir;
+let sourceDir;
+/**
+ * Big enough to pass through the writer, the worker and the reader in
+ * several chunks, so the streaming paths are actually exercised, and random
+ * so that it does not compress away to nothing on the way.
+ */
+const bigContent = Buffer.alloc(6 * 1024 * 1024);
+/**
+ * An archive made by `zip -X -r -P 'hunter2!'` of a "hello world" small.txt
+ * and a files/big.txt of 100,000 x's - the shape of a backup from before the
+ * zip writer was brought in-process.
+ */
+const LEGACY_ZIP_BASE64 = "UEsDBAoACQAAAARJD12FEUoNFwAAAAsAAAAJAAAAc21hbGwudHh0EMEQLQZe6Qx3/ZjBiV" +
+    "K8M4BlVk1MBIRQSwcIhRFKDRcAAAALAAAAUEsDBAoAAAAAAARJD10AAAAAAAAAAAAAAAAG" +
+    "AAAAZmlsZXMvUEsDBBQACQAIAARJD11xEQf+fgAAAKCGAQANAAAAZmlsZXMvYmlnLnR4dD" +
+    "tuR/AdZQjw43ZCt1y8UL6+ryS38VIMZ4RU0tjnf0dWfV4lZ0f5FjWnuw+OoGJL0TXGIK/a" +
+    "qDql9X9/n2GffctLzTmZJJouu5IyCPV2AharTlHVwtPTvYCwF/w1x+FT14MtEQWbCLioU4" +
+    "WeHDO32GpxHsMFX6MP0o8wYGDpnVBLBwhxEQf+fgAAAKCGAQBQSwECHgMKAAkAAAAESQ9d" +
+    "hRFKDRcAAAALAAAACQAAAAAAAAABAAAAtIEAAAAAc21hbGwudHh0UEsBAh4DCgAAAAAABE" +
+    "kPXQAAAAAAAAAAAAAAAAYAAAAAAAAAAAAQAP1BTgAAAGZpbGVzL1BLAQIeAxQACQAIAARJ" +
+    "D11xEQf+fgAAAKCGAQANAAAAAAAAAAEAAAC0gXIAAABmaWxlcy9iaWcudHh0UEsFBgAAAA" +
+    "ADAAMApgAAACsBAAAAAA==";
+beforeAll(async () => {
+    dir = await mkdtemp(join(tmpdir(), "sc-zip-test-"));
+    sourceDir = join(dir, "source");
+    await mkdir(sourceDir, { recursive: true });
+    randomFillSync(bigContent);
+    await writeFile(join(sourceDir, "big.bin"), bigContent);
+    await writeFile(join(sourceDir, "small.txt"), "hello world");
+    await writeFile(join(sourceDir, "empty.txt"), "");
+});
+afterAll(async () => {
+    await rm(dir, { recursive: true, force: true });
+});
+/** an archive with one of everything: buffer, file, empty file, directory */
+const buildArchive = async (path, password) => {
+    const zip = await ZipBuilder.toFile(path, password);
+    await zip.addBuffer("pack.json", Buffer.from(JSON.stringify({ a: 1 })));
+    await zip.addDirectory("files");
+    await zip.addLocalFile("files/big.bin", join(sourceDir, "big.bin"));
+    await zip.addLocalFile("files/small.txt", join(sourceDir, "small.txt"));
+    await zip.addLocalFile("files/empty.txt", join(sourceDir, "empty.txt"));
+    await zip.finish();
+};
+describe("zip round trip", () => {
+    it("writes and reads back every kind of entry", async () => {
+        const zipPath = join(dir, "roundtrip.zip");
+        await buildArchive(zipPath);
+        const out = join(dir, "roundtrip-out");
+        await extractZip(zipPath, out);
+        expect((await readFile(join(out, "pack.json"))).toString()).toBe('{"a":1}');
+        expect((await readFile(join(out, "files/small.txt"))).toString()).toBe("hello world");
+        expect((await stat(join(out, "files/empty.txt"))).size).toBe(0);
+        expect((await stat(join(out, "files"))).isDirectory()).toBe(true);
+        const big = await readFile(join(out, "files/big.bin"));
+        expect(Buffer.compare(big, bigContent)).toBe(0);
+    });
+    it("produces an archive other zip readers understand", async () => {
+        // adm-zip is an independent implementation: if it agrees, the archive is
+        // a real zip file and not just something our own reader happens to read
+        const zipPath = join(dir, "compat.zip");
+        await buildArchive(zipPath);
+        const zip = new Zip(zipPath);
+        expect(zip.getEntries().map((e) => e.entryName)).toEqual([
+            "pack.json",
+            "files/",
+            "files/big.bin",
+            "files/small.txt",
+            "files/empty.txt",
+        ]);
+        expect(zip.readAsText("files/small.txt")).toBe("hello world");
+        expect(Buffer.compare(zip.readFile("files/big.bin"), bigContent)).toBe(0);
+    });
+    it("reads an archive written by another zip writer", async () => {
+        const zipPath = join(dir, "foreign.zip");
+        const zip = new Zip();
+        zip.addFile("a/b.txt", Buffer.from("written by adm-zip"));
+        zip.addFile("big.bin", bigContent);
+        zip.writeZip(zipPath);
+        const out = join(dir, "foreign-out");
+        await extractZip(zipPath, out);
+        expect((await readFile(join(out, "a/b.txt"))).toString()).toBe("written by adm-zip");
+        expect(Buffer.compare(await readFile(join(out, "big.bin")), bigContent)).toBe(0);
+    });
+    it("rejects a corrupted archive rather than writing out bad data", async () => {
+        const zipPath = join(dir, "corrupt.zip");
+        await buildArchive(zipPath);
+        // flip a byte in the middle of the compressed data
+        const bytes = await readFile(zipPath);
+        bytes[Math.floor(bytes.length / 2)] ^= 0xff;
+        await writeFile(zipPath, bytes);
+        let error;
+        await extractZip(zipPath, join(dir, "corrupt-out")).catch((e) => {
+            error = e;
+        });
+        expect(!!error).toBe(true);
+    });
+    it("refuses to extract outside the target directory", async () => {
+        const zipPath = join(dir, "slip.zip");
+        const out = createWriteStream(zipPath);
+        const closed = new Promise((resolve, reject) => {
+            out.on("finish", () => resolve());
+            out.on("error", reject);
+        });
+        const writer = new ZipStreamWriter(out);
+        // ZipStreamWriter strips leading slashes, so climb out with ..
+        await writer.addBuffer("../escaped.txt", Buffer.from("nope"));
+        await writer.finalize();
+        out.end();
+        await closed;
+        let error;
+        await extractZip(zipPath, join(dir, "slip-out")).catch((e) => {
+            error = e;
+        });
+        expect(error?.message).toContain("outside the target");
+    });
+});
+describe("zip streaming", () => {
+    it("emits the archive while it is still being built", async () => {
+        // the point of the streaming writer: bytes come out as entries go in,
+        // so an archive larger than memory can be produced
+        const zip = await ZipBuilder.toStream();
+        const chunks = [];
+        let bytesBeforeFinish = 0;
+        const consumed = (async () => {
+            for await (const chunk of zip.stream)
+                chunks.push(chunk);
+        })();
+        await zip.addLocalFile("big.bin", join(sourceDir, "big.bin"));
+        await zip.addLocalFile("big2.bin", join(sourceDir, "big.bin"));
+        bytesBeforeFinish = chunks.reduce((n, c) => n + c.length, 0);
+        await zip.finish();
+        await consumed;
+        expect(bytesBeforeFinish).toBeGreaterThan(0);
+        expect(chunks.length).toBeGreaterThan(1);
+        // and what came out is a complete archive
+        const zipPath = join(dir, "streamed.zip");
+        await writeFile(zipPath, Buffer.concat(chunks));
+        const out = join(dir, "streamed-out");
+        await extractZip(zipPath, out);
+        expect(Buffer.compare(await readFile(join(out, "big.bin")), bigContent)).toBe(0);
+        expect(Buffer.compare(await readFile(join(out, "big2.bin")), bigContent)).toBe(0);
+    });
+    it("adds an entry from a stream of unknown length", async () => {
+        // content produced in the main thread - a table dump - goes in chunk by
+        // chunk, so it is never assembled into one buffer anywhere
+        const zipPath = join(dir, "fromstream.zip");
+        const zip = await ZipBuilder.toFile(zipPath);
+        const parts = [
+            Buffer.from("["),
+            ...Array.from({ length: 200 }, (_, i) => Buffer.from(JSON.stringify({ id: i, pad: "x".repeat(1000) }) + ",")),
+            Buffer.from("]"),
+        ];
+        await zip.addStream("tables/rows.json", Readable.from(parts));
+        await zip.addBuffer("pack.json", Buffer.from("{}"));
+        await zip.finish();
+        const out = join(dir, "fromstream-out");
+        await extractZip(zipPath, out);
+        expect(Buffer.compare(await readFile(join(out, "tables/rows.json")), Buffer.concat(parts))).toBe(0);
+        // it fit within the probe, so it is a plain entry any reader can read
+        expect(new Zip(zipPath).readFile("tables/rows.json").length).toBe(Buffer.concat(parts).length);
+    });
+    it("takes every chunk from a source that reuses its buffer", async () => {
+        // a Readable is free to fill and push one buffer over and over. Handing
+        // that buffer to the worker thread must not leave the producer holding a
+        // detached one, which would silently drop every chunk after the first
+        const zipPath = join(dir, "reused-buffer.zip");
+        const chunk = Buffer.alloc(64 * 1024, 65);
+        let pushed = 0;
+        const source = new Readable({
+            read() {
+                this.push(pushed++ < 8 ? chunk : null);
+            },
+        });
+        const zip = await ZipBuilder.toFile(zipPath);
+        await zip.addStream("reused.bin", source);
+        await zip.finish();
+        const out = join(dir, "reused-buffer-out");
+        await extractZip(zipPath, out);
+        const written = await readFile(join(out, "reused.bin"));
+        expect(written.length).toBe(chunk.length * 8);
+        expect(Buffer.compare(written, Buffer.concat(Array(8).fill(chunk)))).toBe(0);
+    });
+    it("stops building when the consumer gives up", async () => {
+        const zip = await ZipBuilder.toStream();
+        zip.stream.destroy(new Error("consumer went away"));
+        let error;
+        try {
+            // eventually the worker is torn down and adding entries fails, rather
+            // than blocking forever on a reader that is never coming back
+            for (let i = 0; i < 200; i++)
+                await zip.addLocalFile(`big${i}.bin`, join(sourceDir, "big.bin"));
+            await zip.finish();
+        }
+        catch (e) {
+            error = e;
+        }
+        await zip.discard();
+        expect(!!error).toBe(true);
+    });
+});
+describe("zip encryption", () => {
+    const password = "hunter2!";
+    it("encrypts entries with the password", async () => {
+        const zipPath = join(dir, "encrypted.zip");
+        await buildArchive(zipPath, password);
+        // entry names stay readable, contents do not
+        const zip = new Zip(zipPath);
+        expect(zip.getEntries().map((e) => e.entryName)).toContain("files/small.txt");
+        expect(() => zip.readFile("files/small.txt")).toThrow();
+        expect(zip.readFile("files/small.txt", password).toString()).toBe("hello world");
+        const out = join(dir, "encrypted-out");
+        await extractZip(zipPath, out, password);
+        expect(Buffer.compare(await readFile(join(out, "files/big.bin")), bigContent)).toBe(0);
+    });
+    it("reports that a password is needed when it is missing or wrong", async () => {
+        const zipPath = join(dir, "encrypted2.zip");
+        await buildArchive(zipPath, password);
+        let missing;
+        await extractZip(zipPath, join(dir, "enc-missing")).catch((e) => {
+            missing = e;
+        });
+        expect(missing?.requiresPassword).toBe(true);
+        let wrong;
+        await extractZip(zipPath, join(dir, "enc-wrong"), "not it").catch((e) => {
+            wrong = e;
+        });
+        expect(wrong?.requiresPassword).toBe(true);
+    });
+    it("restores a backup encrypted by an older Saltcorn", async () => {
+        // Backups used to be made by the system `zip -P`, which puts the sizes in
+        // the local header and takes the password check byte from the CRC, where
+        // the writer here uses a data descriptor and the modification time. Those
+        // archives are still out there and still have to restore.
+        const zipPath = join(dir, "legacy.zip");
+        await writeFile(zipPath, Buffer.from(LEGACY_ZIP_BASE64, "base64"));
+        const out = join(dir, "legacy-out");
+        await extractZip(zipPath, out, password);
+        expect((await readFile(join(out, "small.txt"))).toString()).toBe("hello world");
+        const big = await readFile(join(out, "files/big.txt"));
+        expect(big.length).toBe(100000);
+        expect(big.toString()).toBe("x".repeat(100000));
+        let missing;
+        await extractZip(zipPath, join(dir, "legacy-missing")).catch((e) => {
+            missing = e;
+        });
+        expect(missing?.requiresPassword).toBe(true);
+    });
+});
+describe("zip64", () => {
+    /** write an archive with the writer directly, so options can be set */
+    const writeWith = async (path, options, add) => {
+        const out = createWriteStream(path);
+        const closed = new Promise((resolve, reject) => {
+            out.on("finish", () => resolve());
+            out.on("error", reject);
+        });
+        const writer = new ZipStreamWriter(out, options);
+        await add(writer);
+        await writer.finalize();
+        out.end();
+        await closed;
+    };
+    it("writes entries over the size limit in zip64 format", async () => {
+        // the real threshold is 3.75GB; lower it so the format can be tested
+        // without writing four gigabytes
+        const zipPath = join(dir, "zip64entry.zip");
+        await writeWith(zipPath, { zip64Threshold: 1024 }, async (w) => {
+            await w.addBuffer("big.bin", bigContent);
+            await w.addBuffer("tiny.txt", Buffer.from("small enough"));
+        });
+        const out = join(dir, "zip64entry-out");
+        await extractZip(zipPath, out);
+        expect(Buffer.compare(await readFile(join(out, "big.bin")), bigContent)).toBe(0);
+        expect((await readFile(join(out, "tiny.txt"))).toString()).toBe("small enough");
+        // an independent reader agrees it is a valid zip64 archive
+        expect(new Zip(zipPath).readAsText("tiny.txt")).toBe("small enough");
+    });
+    it("falls back to zip64 for a stream that outgrows the probe", async () => {
+        // an entry of unknown length that does not end within probeLimit has to
+        // be written in zip64 format: there is no way back once the local header
+        // has gone out
+        const zipPath = join(dir, "zip64stream.zip");
+        await writeWith(zipPath, { probeLimit: 1024 }, async (w) => {
+            await w.addStream("long.bin", Readable.from([bigContent]));
+            await w.addStream("short.bin", Readable.from([Buffer.from("brief")]));
+        });
+        const out = join(dir, "zip64stream-out");
+        await extractZip(zipPath, out);
+        expect(Buffer.compare(await readFile(join(out, "long.bin")), bigContent)).toBe(0);
+        expect((await readFile(join(out, "short.bin"))).toString()).toBe("brief");
+    });
+    it("writes a zip64 end of central directory past 65535 entries", async () => {
+        const count = 70000;
+        const zipPath = join(dir, "manyentries.zip");
+        await writeWith(zipPath, { level: 1 }, async (w) => {
+            for (let i = 0; i < count; i++)
+                await w.addBuffer(`e/${i}.txt`, Buffer.from(`entry ${i}`));
+        });
+        const entries = (await Open.file(zipPath)).files;
+        expect(entries.length).toBe(count);
+        expect(entries[count - 1].path).toBe(`e/${count - 1}.txt`);
+    });
+});
+//# sourceMappingURL=zip.test.js.map

package/dist/tests/zip.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zip.test.js","sourceRoot":"","sources":["../../tests/zip.test.ts"],"names":[],"mappings":"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"}

package/gen-cjs-shims.cjs

@@ -0,0 +1,71 @@
+/**
+ * Generates CommonJS interop shims under ./cjs for every importable module.
+ *
+ * This package is ESM ("type": "module"). When an out-of-tree CommonJS package
+ * does `require("@saltcorn/data/models/table")`, Node's require(ESM) returns the
+ * module *namespace* ({ __esModule: true, default: Table }) rather than the
+ * class itself, which breaks `const Table = require(...)`. The package "exports"
+ * map routes the "require" condition to these shims, which unwrap the default
+ * export so CommonJS consumers keep getting the value they got before the ESM
+ * conversion. ESM consumers (the "import" condition) get ./dist directly.
+ *
+ * Run automatically before tsc (see package.json "pretsc"). The shims only
+ * mirror the source module tree, so they can be generated without a build.
+ */
+const fs = require("fs");
+const path = require("path");
+
+const ROOT = __dirname;
+const SRC_SKIP = new Set(["node_modules", "dist", "cjs", "mobile-mocks"]);
+
+function walk(dir, acc = []) {
+  for (const ent of fs.readdirSync(dir, { withFileTypes: true })) {
+    if (ent.isDirectory()) {
+      if (SRC_SKIP.has(ent.name)) continue;
+      walk(path.join(dir, ent.name), acc);
+    } else if (
+      ent.isFile() &&
+      ent.name.endsWith(".ts") &&
+      !ent.name.endsWith(".d.ts") &&
+      !ent.name.endsWith(".test.ts")
+    ) {
+      acc.push(path.join(dir, ent.name));
+    }
+  }
+  return acc;
+}
+
+const SHIM = (
+  distRel
+) => `// CommonJS interop shim — AUTO-GENERATED, DO NOT EDIT.
+// See gen-cjs-shims.cjs.
+"use strict";
+const m = require(${JSON.stringify(distRel)});
+const e = m && m.__esModule && "default" in m ? m.default : m;
+module.exports = e;
+if (e !== m && e && (typeof e === "object" || typeof e === "function")) {
+  for (const k in m) {
+    if (k === "default" || k === "__esModule" || k in e) continue;
+    try {
+      Object.defineProperty(e, k, {
+        get: () => m[k],
+        enumerable: true,
+        configurable: true,
+      });
+    } catch {}
+  }
+}
+`;
+
+let count = 0;
+for (const file of walk(ROOT)) {
+  const rel = path.relative(ROOT, file).replace(/\.ts$/, "");
+  const cjsPath = path.join(ROOT, "cjs", rel + ".cjs");
+  const distRel =
+    path.relative(path.dirname(cjsPath), path.join(ROOT, "dist", rel)) + ".js";
+  const normalized = distRel.startsWith(".") ? distRel : "./" + distRel;
+  fs.mkdirSync(path.dirname(cjsPath), { recursive: true });
+  fs.writeFileSync(cjsPath, SHIM(normalized));
+  count++;
+}
+console.log(`gen-cjs-shims: wrote ${count} shims under cjs/`);

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@saltcorn/admin-models",
-  "version": "1.6.3-beta.1",
+  "version": "1.7.0-alpha.1",
   "description": "models only required by the admin interface for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
+  "type": "module",
   "scripts": {
-    "test": "node --experimental-vm-modules ../../node_modules/jest/bin/jest.js ./tests --runInBand",
+    "test": "cd dist && NODE_ENV=test node --require ../setup-test-schema.cjs --test --test-concurrency=4 --test-force-exit",
+    "gen:cjs-shims": "node gen-cjs-shims.cjs",
+    "pretsc": "node gen-cjs-shims.cjs",
     "tsc": "tsc -p tsconfig.json",
     "clean": "rm -rf ./dist/*"
   },
@@ -12,8 +15,24 @@
   "license": "MIT",
   "main": "dist/index.js",
   "exports": {
-    ".": "./dist/index.js",
-    "./*": "./dist/*.js"
+    ".": {
+      "types": "./dist/index.d.ts",
+      "require": "./cjs/index.cjs",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./*.js": {
+      "types": "./dist/*.d.ts",
+      "require": "./cjs/*.cjs",
+      "import": "./dist/*.js",
+      "default": "./dist/*.js"
+    },
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "require": "./cjs/*.cjs",
+      "import": "./dist/*.js",
+      "default": "./dist/*.js"
+    }
   },
   "typesVersions": {
     "*": {
@@ -24,57 +43,48 @@
   },
   "files": [
     "dist/**/*",
-    "!dist/tsconfig.ref.tsbuildinfo"
+    "!dist/tsconfig.ref.tsbuildinfo",
+    "cjs/**/*.cjs",
+    "gen-cjs-shims.cjs"
   ],
   "dependencies": {
     "@aws-sdk/client-s3": "3.1057.0",
     "@aws-sdk/lib-storage": "3.1057.0",
-    "@saltcorn/types": "1.6.3-beta.1",
-    "@saltcorn/markup": "1.6.3-beta.1",
-    "@saltcorn/db-common": "1.6.3-beta.1",
-    "@saltcorn/data": "1.6.3-beta.1",
-    "adm-zip": "0.5.16",
+    "@saltcorn/types": "1.7.0-alpha.1",
+    "@saltcorn/markup": "1.7.0-alpha.1",
+    "@saltcorn/db-common": "1.7.0-alpha.1",
+    "@saltcorn/data": "1.7.0-alpha.1",
     "chaos-guinea-pig": "0.2.1",
     "csv-stringify": "^6.5.2",
     "csvtojson": "^2.0.10",
     "dateformat": "^4.6.3",
+    "glob-to-regexp": "^0.4.1",
     "lodash": "^4.17.23",
     "node-fetch": "2.6.9",
+    "semver": "^7.6.3",
     "ssh2-sftp-client": "11.0.0",
-    "tmp-promise": "^3.0.3"
+    "tmp-promise": "^3.0.3",
+    "unzipper": "^0.12.5"
   },
   "repository": "github:saltcorn/saltcorn",
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
-    "@saltcorn/sbadmin2": "1.6.3-beta.1",
+    "@saltcorn/sbadmin2": "1.7.0-alpha.1",
     "@types/adm-zip": "0.5.7",
     "@types/dateformat": "5.0.0",
-    "@types/jest": "29.5.14",
+    "@types/glob-to-regexp": "^0.4.4",
     "@types/lodash": "4.14.182",
     "@types/node": "^20.14.7",
     "@types/node-fetch": "2.5.12",
+    "@types/semver": "^7.7.1",
     "@types/ssh2-sftp-client": "9.0.3",
     "@types/tmp": "^0.2.3",
-    "jest": "29.7.0",
-    "ts-jest": "29.2.5",
+    "@types/unzipper": "0.10.11",
+    "adm-zip": "0.5.16",
     "typescript": "5.9.2"
   },
-  "jest": {
-    "transform": {},
-    "preset": "ts-jest",
-    "testEnvironment": "node",
-    "modulePathIgnorePatterns": [
-      ".*\\.js$"
-    ],
-    "moduleNameMapper": {
-      "@saltcorn/sqlite/(.*)": "<rootDir>/../sqlite/dist/$1",
-      "@saltcorn/db-common/(.*)": "<rootDir>/../db-common/dist/$1",
-      "@saltcorn/data/(.*)": "<rootDir>/../saltcorn-data/dist/$1",
-      "@saltcorn/types/(.*)": "<rootDir>/../saltcorn-types/dist/$1"
-    }
-  },
   "overrides": {
     "parse5": "7.2.1",
     "undici": "7.12.0",