@@ -73,6 +73,7 @@ import {
7373} from "./update-release-package-versions.ts";
7474import * as HostProcess from "@t3tools/shared/HostProcess";
7575import { symlinksSupported } from "@t3tools/shared/testing/symlinks";
76+ import gnomeCaptureBundle from "../apps/desktop/gnome-extension/bundle.json" with { type: "json" };
7677
7778const encodeModuleUrl = Schema.encodeEffect(Schema.fromJsonString(Schema.String));
7879const decodePackageVersion = Schema.decodeUnknownEffect(
@@ -257,13 +258,6 @@ const linuxNativeEntries = (arch: "arm64" | "x64") => [
257258 `node_modules/@napi-rs/keyring/keyring.linux-${arch}-gnu.node`,
258259 `node_modules/@ff-labs/fff-bin-linux-${arch}-gnu/libfff_c.so`,
259260];
260- const linuxGnomeFiles = [
261- "metadata.json",
262- "extension.js",
263- "captureService.js",
264- "captureFeedback.js",
265- "feedbackGeometry.js",
266- ];
267261const linuxElfHeader = (arch: "arm64" | "x64") => {
268262 const header = new Uint8Array(64);
269263 header.set([0x7f, 0x45, 0x4c, 0x46, 2, 1, 1]);
@@ -314,7 +308,7 @@ const makeLinuxPayloadFixture = Effect.fn("test.makeLinuxPayloadFixture")(functi
314308 yield* fs.writeFile(filePath, linuxElfHeader(input.arch));
315309 yield* fs.chmod(filePath, 0o755);
316310 }
317- for (const entry of linuxGnomeFiles ) {
311+ for (const entry of gnomeCaptureBundle.files ) {
318312 const filePath = path.join(packagedAppDir, "resources/gnome-extension", entry);
319313 yield* fs.makeDirectory(path.dirname(filePath), { recursive: true });
320314 yield* fs.writeFileString(filePath, "{}");
@@ -1462,100 +1456,61 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
14621456 ),
14631457 );
14641458
1465- it.effect("rejects missing Linux payload files and archive entries ", () =>
1459+ it.effect("rejects incomplete Linux payloads and wrong-architecture binaries ", () =>
14661460 Effect.scoped(
14671461 Effect.gen(function* () {
14681462 const fs = yield* FileSystem.FileSystem;
14691463 const path = yield* Path.Path;
1470- for (const arch of ["arm64", "x64"] as const) {
1471- const fixture = yield* makeLinuxPayloadFixture({ arch });
1472- const files = [
1473- "resources/app.asar",
1474- ...linuxExecutables,
1475- ...linuxGnomeFiles.map((file) => `resources/gnome-extension/${file}`),
1476- ...linuxNativeEntries(arch).map((file) => `resources/app.asar.unpacked/${file}`),
1477- "resources/app.asar.unpacked/node_modules/extra/addon.node",
1478- ];
1479- for (const file of files) {
1480- const filePath = path.join(fixture.packagedAppDir, file);
1481- yield* fs.rename(filePath, `${filePath}.saved`);
1482- const error = yield* validateLinuxPackagedPayload({
1483- stageDistDir: fixture.stageDistDir,
1484- targetArch: arch,
1485- }).pipe(Effect.flip);
1486- assert.instanceOf(error, LinuxPackagedPayloadValidationError);
1487- assert.include(error.filePath, file);
1488- yield* fs.rename(`${filePath}.saved`, filePath);
1489- }
1490- for (const omitEntry of [...linuxAsarEntries, ...linuxNativeEntries(arch)]) {
1491- const missing = yield* makeLinuxPayloadFixture({ arch, omitEntry });
1492- const error = yield* validateLinuxPackagedPayload({
1493- stageDistDir: missing.stageDistDir,
1494- targetArch: arch,
1495- }).pipe(Effect.flip);
1496- assert.instanceOf(error, LinuxPackagedPayloadValidationError);
1497- assert.include(error.filePath, omitEntry);
1498- }
1499- yield* fs.writeFileString(
1500- path.join(fixture.packagedAppDir, "resources/app.asar"),
1501- "invalid archive",
1502- );
1503- const invalidArchive = yield* validateLinuxPackagedPayload({
1464+ const fixture = yield* makeLinuxPayloadFixture({ arch: "arm64" });
1465+ const expectRejected = Effect.fn("test.expectLinuxPayloadRejected")(function* (
1466+ file: string,
1467+ ) {
1468+ const error = yield* validateLinuxPackagedPayload({
15041469 stageDistDir: fixture.stageDistDir,
1505- targetArch: arch ,
1470+ targetArch: "arm64" ,
15061471 }).pipe(Effect.flip);
1507- assert.instanceOf(invalidArchive, LinuxPackagedPayloadValidationError);
1508- assert.include(invalidArchive.filePath, "app.asar");
1472+ assert.instanceOf(error, LinuxPackagedPayloadValidationError);
1473+ assert.include(error.filePath, file);
1474+ });
1475+
1476+ for (const file of [
1477+ "resources/app.asar.unpacked/node_modules/extra/addon.node",
1478+ "resources/browser-secret/t3-browser-secret",
1479+ "resources/gnome-extension/extension.js",
1480+ ]) {
1481+ const filePath = path.join(fixture.packagedAppDir, file);
1482+ yield* fs.rename(filePath, `${filePath}.saved`);
1483+ yield* expectRejected(file);
1484+ yield* fs.rename(`${filePath}.saved`, filePath);
15091485 }
1486+
1487+ const nativePath = path.join(
1488+ fixture.packagedAppDir,
1489+ "resources/app.asar.unpacked/node_modules/node-pty/build/Release/pty.node",
1490+ );
1491+ yield* fs.writeFile(nativePath, linuxElfHeader("x64"));
1492+ yield* expectRejected(nativePath);
1493+ yield* fs.writeFile(nativePath, linuxElfHeader("arm64"));
1494+
1495+ const helperPath = path.join(fixture.packagedAppDir, "t3code");
1496+ yield* fs.chmod(helperPath, 0o644);
1497+ yield* expectRejected(helperPath);
1498+ yield* fs.chmod(helperPath, 0o755);
1499+
1500+ const missingServer = yield* makeLinuxPayloadFixture({
1501+ arch: "arm64",
1502+ omitEntry: "apps/server/dist/bin.mjs",
1503+ });
1504+ const error = yield* validateLinuxPackagedPayload({
1505+ stageDistDir: missingServer.stageDistDir,
1506+ targetArch: "arm64",
1507+ }).pipe(Effect.flip);
1508+ assert.instanceOf(error, LinuxPackagedPayloadValidationError);
1509+ assert.include(error.filePath, "apps/server/dist/bin.mjs");
15101510 }),
15111511 ),
15121512 );
15131513
1514- it.effect(
1515- "rejects Linux binaries of the wrong architecture, invalid ELF headers and non-executable helpers",
1516- () =>
1517- Effect.scoped(
1518- Effect.gen(function* () {
1519- const fs = yield* FileSystem.FileSystem;
1520- const path = yield* Path.Path;
1521- for (const arch of ["arm64", "x64"] as const) {
1522- const fixture = yield* makeLinuxPayloadFixture({ arch });
1523- for (const file of [
1524- ...linuxExecutables,
1525- ...linuxNativeEntries(arch).map((entry) => `resources/app.asar.unpacked/${entry}`),
1526- ]) {
1527- const filePath = path.join(fixture.packagedAppDir, file);
1528- for (const header of [
1529- linuxElfHeader(arch === "arm64" ? "x64" : "arm64"),
1530- new Uint8Array(),
1531- new Uint8Array(64),
1532- ]) {
1533- yield* fs.writeFile(filePath, header);
1534- const error = yield* validateLinuxPackagedPayload({
1535- stageDistDir: fixture.stageDistDir,
1536- targetArch: arch,
1537- }).pipe(Effect.flip);
1538- assert.instanceOf(error, LinuxPackagedPayloadValidationError);
1539- assert.equal(error.filePath, filePath);
1540- }
1541- yield* fs.writeFile(filePath, linuxElfHeader(arch));
1542- }
1543- for (const file of linuxExecutables) {
1544- const filePath = path.join(fixture.packagedAppDir, file);
1545- yield* fs.chmod(filePath, 0o644);
1546- const error = yield* validateLinuxPackagedPayload({
1547- stageDistDir: fixture.stageDistDir,
1548- targetArch: arch,
1549- }).pipe(Effect.flip);
1550- assert.instanceOf(error, LinuxPackagedPayloadValidationError);
1551- assert.equal(error.filePath, filePath);
1552- yield* fs.chmod(filePath, 0o755);
1553- }
1554- }
1555- }),
1556- ),
1557- );
1558-
15591514 it.effect("rejects a Linux app whose packaged server cannot resolve", () =>
15601515 Effect.scoped(
15611516 Effect.gen(function* () {
0 commit comments