Compare commits

..
11 changed files with 69 additions and 171 deletions

View file

@ -5,5 +5,4 @@ coverage
*.tsbuildinfo *.tsbuildinfo
bun.lock bun.lock
apps/tauri/src-tauri apps/tauri/src-tauri
apps/electron/release
licenses licenses

View file

@ -60,11 +60,7 @@
} }
], ],
"linux": { "linux": {
"target": [ "target": ["AppImage", "deb", "rpm"],
"AppImage",
"deb",
"rpm"
],
"icon": "build/icons", "icon": "build/icons",
"executableName": "tensamin", "executableName": "tensamin",
"category": "Network", "category": "Network",
@ -77,16 +73,11 @@
} }
}, },
"win": { "win": {
"target": [ "target": ["nsis", "portable"],
"nsis",
"portable"
],
"icon": "build/icons/icon.ico" "icon": "build/icons/icon.ico"
}, },
"mac": { "mac": {
"target": [ "target": ["dmg"],
"dmg"
],
"icon": "build/icons/icon.icns" "icon": "build/icons/icon.icns"
}, },
"publish": null "publish": null

View file

@ -1,11 +1,5 @@
import { createHash } from "node:crypto"; import { createHash } from "node:crypto";
import { import { createReadStream, existsSync, readdirSync, statSync, writeFileSync } from "node:fs";
createReadStream,
existsSync,
readdirSync,
statSync,
writeFileSync,
} from "node:fs";
import { basename, join } from "node:path"; import { basename, join } from "node:path";
import rootPackage from "../../../package.json" with { type: "json" }; import rootPackage from "../../../package.json" with { type: "json" };
@ -61,10 +55,7 @@ const metadata = {
artifacts, artifacts,
}; };
writeFileSync( writeFileSync(join(outDir, "electron-release-metadata.json"), `${JSON.stringify(metadata, null, 2)}\n`);
join(outDir, "electron-release-metadata.json"),
`${JSON.stringify(metadata, null, 2)}\n`,
);
writeFileSync( writeFileSync(
join(outDir, "SHA256SUMS"), join(outDir, "SHA256SUMS"),
`${artifacts.map((artifact) => `${artifact.sha256} ${artifact.name}`).join("\n")}\n`, `${artifacts.map((artifact) => `${artifact.sha256} ${artifact.name}`).join("\n")}\n`,

View file

@ -1,19 +1,9 @@
import { execFile } from "node:child_process"; import { execFile } from "node:child_process";
import { fileURLToPath } from "node:url"; import { fileURLToPath } from "node:url";
import { dirname, join, resolve } from "node:path"; import { dirname, join, resolve } from "node:path";
import { import { app, BrowserWindow, desktopCapturer, ipcMain, session, shell } from "electron";
app,
BrowserWindow,
desktopCapturer,
ipcMain,
session,
shell,
} from "electron";
import { checkForUpdates } from "./updates.js"; import { checkForUpdates } from "./updates.js";
import { import { ipcChannels, type DesktopScreenShareCapabilities } from "../shared/ipc.js";
ipcChannels,
type DesktopScreenShareCapabilities,
} from "../shared/ipc.js";
const __dirname = dirname(fileURLToPath(import.meta.url)); const __dirname = dirname(fileURLToPath(import.meta.url));
const verbose = process.argv.includes("--verbose"); const verbose = process.argv.includes("--verbose");
@ -26,11 +16,7 @@ if (verbose) {
app.commandLine.appendSwitch("log-level", "0"); app.commandLine.appendSwitch("log-level", "0");
} }
if ( if (process.platform === "linux" && process.env.XDG_SESSION_TYPE === "wayland" && !process.env.TENSAMIN_ENABLE_VULKAN) {
process.platform === "linux" &&
process.env.XDG_SESSION_TYPE === "wayland" &&
!process.env.TENSAMIN_ENABLE_VULKAN
) {
app.commandLine.appendSwitch("disable-features", "Vulkan"); app.commandLine.appendSwitch("disable-features", "Vulkan");
} }
@ -101,8 +87,7 @@ async function listAudioOutputs() {
if (!sink || typeof sink !== "object") return null; if (!sink || typeof sink !== "object") return null;
const record = sink as Record<string, unknown>; const record = sink as Record<string, unknown>;
const id = record.index == null ? undefined : String(record.index); const id = record.index == null ? undefined : String(record.index);
const name = const name = typeof record.description === "string" ? record.description : id;
typeof record.description === "string" ? record.description : id;
if (!id || !name) return null; if (!id || !name) return null;
return { id, name, isDefault: false }; return { id, name, isDefault: false };
}) })
@ -128,34 +113,30 @@ async function listScreenShareSources() {
} }
function registerDisplayMediaHandler() { function registerDisplayMediaHandler() {
session.defaultSession.setDisplayMediaRequestHandler( session.defaultSession.setDisplayMediaRequestHandler(async (_request, callback) => {
async (_request, callback) => { verboseLog("display media request", { selectedScreenShareSourceId });
verboseLog("display media request", { selectedScreenShareSourceId });
const sources = await desktopCapturer.getSources({ const sources = await desktopCapturer.getSources({
types: ["screen", "window"], types: ["screen", "window"],
thumbnailSize: { width: 0, height: 0 }, thumbnailSize: { width: 0, height: 0 },
}); });
const selected = sources.find( const selected = sources.find((source) => source.id === selectedScreenShareSourceId);
(source) => source.id === selectedScreenShareSourceId, selectedScreenShareSourceId = null;
); const video = selected ?? sources[0];
selectedScreenShareSourceId = null;
const video = selected ?? sources[0];
if (!video) { if (!video) {
callback({}); callback({});
return; return;
} }
if (process.platform === "win32") { if (process.platform === "win32") {
callback({ video, audio: "loopback" }); callback({ video, audio: "loopback" });
return; return;
} }
callback({ video }); callback({ video });
}, });
);
} }
function registerIpc() { function registerIpc() {
@ -163,26 +144,16 @@ function registerIpc() {
ipcMain.handle(ipcChannels.listScreenShareSources, listScreenShareSources); ipcMain.handle(ipcChannels.listScreenShareSources, listScreenShareSources);
ipcMain.handle(ipcChannels.listScreenShareAudioOutputs, listAudioOutputs); ipcMain.handle(ipcChannels.listScreenShareAudioOutputs, listAudioOutputs);
ipcMain.handle( ipcMain.handle(ipcChannels.getScreenShareCapabilities, getScreenShareCapabilities);
ipcChannels.getScreenShareCapabilities, ipcMain.handle(ipcChannels.selectScreenShareSource, (_event, sourceId: unknown) => {
getScreenShareCapabilities, if (typeof sourceId !== "string" || sourceId.length === 0 || sourceId.length > 256) {
); throw new Error("Invalid screen share source id.");
ipcMain.handle( }
ipcChannels.selectScreenShareSource,
(_event, sourceId: unknown) => {
if (
typeof sourceId !== "string" ||
sourceId.length === 0 ||
sourceId.length > 256
) {
throw new Error("Invalid screen share source id.");
}
selectedScreenShareSourceId = sourceId; selectedScreenShareSourceId = sourceId;
verboseLog("selected screen share source", sourceId); verboseLog("selected screen share source", sourceId);
return true; return true;
}, });
);
ipcMain.handle(ipcChannels.getVersion, () => app.getVersion()); ipcMain.handle(ipcChannels.getVersion, () => app.getVersion());
ipcMain.handle(ipcChannels.checkForUpdates, checkForUpdates); ipcMain.handle(ipcChannels.checkForUpdates, checkForUpdates);
ipcMain.handle(ipcChannels.minimizeWindow, () => { ipcMain.handle(ipcChannels.minimizeWindow, () => {
@ -246,24 +217,18 @@ async function createWindow() {
}); });
if (verbose) { if (verbose) {
mainWindow.webContents.on( mainWindow.webContents.on("console-message", (_event, level, message, line, sourceId) => {
"console-message", const target = level >= 2 ? console.error : console.log;
(_event, level, message, line, sourceId) => { target("[tensamin:renderer]", message, { level, line, sourceId });
const target = level >= 2 ? console.error : console.log; });
target("[tensamin:renderer]", message, { level, line, sourceId });
},
);
mainWindow.webContents.on( mainWindow.webContents.on("did-fail-load", (_event, errorCode, errorDescription, validatedURL) => {
"did-fail-load", console.error("[tensamin:electron] renderer failed to load", {
(_event, errorCode, errorDescription, validatedURL) => { errorCode,
console.error("[tensamin:electron] renderer failed to load", { errorDescription,
errorCode, validatedURL,
errorDescription, });
validatedURL, });
});
},
);
mainWindow.webContents.on("did-finish-load", () => { mainWindow.webContents.on("did-finish-load", () => {
verboseLog("renderer finished loading", mainWindow?.webContents.getURL()); verboseLog("renderer finished loading", mainWindow?.webContents.getURL());

View file

@ -3,21 +3,13 @@ import { createReadStream } from "node:fs";
import { mkdir, rm, writeFile } from "node:fs/promises"; import { mkdir, rm, writeFile } from "node:fs/promises";
import { basename, join } from "node:path"; import { basename, join } from "node:path";
import { app, net } from "electron"; import { app, net } from "electron";
import type { import type { ReleaseArtifact, ReleaseMetadata, UpdateCheckResult } from "../shared/ipc.js";
ReleaseArtifact,
ReleaseMetadata,
UpdateCheckResult,
} from "../shared/ipc.js";
const metadataUrl = process.env.TENSAMIN_UPDATE_METADATA_URL; const metadataUrl = process.env.TENSAMIN_UPDATE_METADATA_URL;
function compareSemver(left: string, right: string) { function compareSemver(left: string, right: string) {
const leftParts = left const leftParts = left.split(/[.-]/).map((part) => Number.parseInt(part, 10) || 0);
.split(/[.-]/) const rightParts = right.split(/[.-]/).map((part) => Number.parseInt(part, 10) || 0);
.map((part) => Number.parseInt(part, 10) || 0);
const rightParts = right
.split(/[.-]/)
.map((part) => Number.parseInt(part, 10) || 0);
const length = Math.max(leftParts.length, rightParts.length); const length = Math.max(leftParts.length, rightParts.length);
for (let index = 0; index < length; index += 1) { for (let index = 0; index < length; index += 1) {
@ -50,9 +42,7 @@ function requestText(url: string): Promise<string> {
const request = net.request(url); const request = net.request(url);
request.on("response", (response) => { request.on("response", (response) => {
if (response.statusCode < 200 || response.statusCode >= 300) { if (response.statusCode < 200 || response.statusCode >= 300) {
reject( reject(new Error(`Update request failed with HTTP ${response.statusCode}.`));
new Error(`Update request failed with HTTP ${response.statusCode}.`),
);
return; return;
} }
@ -96,9 +86,7 @@ async function sha256File(filePath: string) {
return hash.digest("hex"); return hash.digest("hex");
} }
function selectArtifact( function selectArtifact(metadata: ReleaseMetadata): ReleaseArtifact | undefined {
metadata: ReleaseMetadata,
): ReleaseArtifact | undefined {
const platform = platformName(); const platform = platformName();
const arch = archName(); const arch = archName();
@ -114,26 +102,16 @@ export async function checkForUpdates(): Promise<UpdateCheckResult> {
return { available: false, currentVersion, latestVersion: currentVersion }; return { available: false, currentVersion, latestVersion: currentVersion };
} }
const metadata = JSON.parse( const metadata = JSON.parse(await requestText(metadataUrl)) as ReleaseMetadata;
await requestText(metadataUrl),
) as ReleaseMetadata;
const artifact = selectArtifact(metadata); const artifact = selectArtifact(metadata);
if (isDevVersion(metadata.version) !== isDevVersion(currentVersion)) { if (isDevVersion(metadata.version) !== isDevVersion(currentVersion)) {
return { return { available: false, currentVersion, latestVersion: metadata.version };
available: false,
currentVersion,
latestVersion: metadata.version,
};
} }
if (isDevVersion(currentVersion)) { if (isDevVersion(currentVersion)) {
if (!artifact || metadata.version === currentVersion) { if (!artifact || metadata.version === currentVersion) {
return { return { available: false, currentVersion, latestVersion: metadata.version };
available: false,
currentVersion,
latestVersion: metadata.version,
};
} }
return { return {
@ -145,11 +123,7 @@ export async function checkForUpdates(): Promise<UpdateCheckResult> {
} }
if (!artifact || compareSemver(metadata.version, currentVersion) <= 0) { if (!artifact || compareSemver(metadata.version, currentVersion) <= 0) {
return { return { available: false, currentVersion, latestVersion: metadata.version };
available: false,
currentVersion,
latestVersion: metadata.version,
};
} }
return { return {
@ -166,9 +140,7 @@ export async function downloadVerifiedArtifact(artifact: ReleaseArtifact) {
await mkdir(updatesDir, { recursive: true }); await mkdir(updatesDir, { recursive: true });
const destination = join(updatesDir, basename(artifact.name)); const destination = join(updatesDir, basename(artifact.name));
await writeFile(destination, await requestBuffer(artifact.url), { await writeFile(destination, await requestBuffer(artifact.url), { mode: 0o600 });
mode: 0o600,
});
const actualHash = await sha256File(destination); const actualHash = await sha256File(destination);
if (actualHash !== artifact.sha256) { if (actualHash !== artifact.sha256) {

View file

@ -5,4 +5,4 @@
"android_bg": "./background.png", "android_bg": "./background.png",
"android_fg_scale": 100, "android_fg_scale": 100,
"android_monochrome": "./monochrome.png" "android_monochrome": "./monochrome.png"
} }

View file

@ -8,24 +8,12 @@ const clientDir = resolve(tauriDir, "../..");
const tauriIconsDir = join(tauriDir, "src-tauri", "icons"); const tauriIconsDir = join(tauriDir, "src-tauri", "icons");
const electronIconsDir = join(clientDir, "apps", "electron", "build", "icons"); const electronIconsDir = join(clientDir, "apps", "electron", "build", "icons");
const desktopIcons = [ const desktopIcons = ["32x32.png", "64x64.png", "128x128.png", "128x128@2x.png", "icon.png", "icon.ico", "icon.icns"];
"32x32.png",
"64x64.png",
"128x128.png",
"128x128@2x.png",
"icon.png",
"icon.ico",
"icon.icns",
];
await mkdir(electronIconsDir, { recursive: true }); await mkdir(electronIconsDir, { recursive: true });
await Promise.all( await Promise.all(
desktopIcons.map((icon) => desktopIcons.map((icon) => copyFile(join(tauriIconsDir, icon), join(electronIconsDir, icon))),
copyFile(join(tauriIconsDir, icon), join(electronIconsDir, icon)),
),
); );
console.log( console.log(`Synced ${desktopIcons.length} desktop icons to ${electronIconsDir}`);
`Synced ${desktopIcons.length} desktop icons to ${electronIconsDir}`,
);

View file

@ -10,7 +10,7 @@ const tsconfigRootDir = dirname(fileURLToPath(import.meta.url));
export default [ export default [
{ {
ignores: ["**/dist/**", "**/node_modules/**"], ignores: ["**/dist/**", "**/node_modules/**", "**/.tmp/**"],
}, },
js.configs.recommended, js.configs.recommended,
...tseslint.configs.recommended, ...tseslint.configs.recommended,

View file

@ -26,9 +26,7 @@ type ElectronDesktopApi = {
media?: { media?: {
getScreenShareCapabilities?: () => Promise<DesktopScreenShareCapabilities>; getScreenShareCapabilities?: () => Promise<DesktopScreenShareCapabilities>;
listScreenShareSources?: () => Promise<DesktopScreenShareSource[]>; listScreenShareSources?: () => Promise<DesktopScreenShareSource[]>;
listScreenShareAudioOutputs?: () => Promise< listScreenShareAudioOutputs?: () => Promise<DesktopScreenShareAudioOutput[]>;
DesktopScreenShareAudioOutput[]
>;
selectScreenShareSource?: (sourceId: string) => Promise<boolean>; selectScreenShareSource?: (sourceId: string) => Promise<boolean>;
}; };
}; };

View file

@ -60,9 +60,7 @@ const electronReleaseDir = "apps/electron/release";
const copyElectronArtifacts = () => { const copyElectronArtifacts = () => {
if (!existsSync(electronReleaseDir)) { if (!existsSync(electronReleaseDir)) {
console.warn( console.warn(`Skipping Electron artifacts: ${electronReleaseDir} does not exist.`);
`Skipping Electron artifacts: ${electronReleaseDir} does not exist.`,
);
return; return;
} }
@ -83,11 +81,7 @@ const artifacts = await Promise.all(
readdirSync(releasesDir) readdirSync(releasesDir)
.map((file) => join(releasesDir, file)) .map((file) => join(releasesDir, file))
.filter((file) => statSync(file).isFile()) .filter((file) => statSync(file).isFile())
.filter( .filter((file) => !file.endsWith("electron-release-metadata.json") && !file.endsWith("SHA256SUMS"))
(file) =>
!file.endsWith("electron-release-metadata.json") &&
!file.endsWith("SHA256SUMS"),
)
.map(async (filePath) => { .map(async (filePath) => {
const name = filePath.split(/[\\/]/).at(-1)!; const name = filePath.split(/[\\/]/).at(-1)!;

View file

@ -3,7 +3,7 @@
"target": "ES2020", "target": "ES2020",
"module": "nodenext", "module": "nodenext",
"lib": ["ES2020"], "lib": ["ES2020"],
"rootDir": ".", "rootDir": "./scripts",
"strict": true, "strict": true,
"esModuleInterop": true, "esModuleInterop": true,
"skipLibCheck": true, "skipLibCheck": true,
@ -12,6 +12,6 @@
"moduleResolution": "nodenext", "moduleResolution": "nodenext",
"types": ["node"] "types": ["node"]
}, },
"include": ["scripts", "eslint.config.ts"], "include": ["scripts"],
"exclude": ["node_modules", "dist"] "exclude": ["node_modules", "dist"]
} }