Skip to content

fix(dictation): CLI executable builds again with local dictation #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
collissimo wants to merge 1 commit into from
Closed

fix(dictation): CLI executable builds again with local dictation #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions apps/server/src/dictation/localDictation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type * as TranscribeCpp from "transcribe-cpp";
import * as NodeServices from "@effect/platform-node/NodeServices";
import * as Effect from "effect/Effect";
import * as Path from "effect/Path";
import * as NodeModule from "node:module";
import * as NodePath from "node:path";

import { CloudDictation } from "./cloudDictation.ts";
Expand All @@ -19,6 +20,9 @@ import {
import { findModel, findVadModel, modelDirectories } from "./modelFiles.ts";
import { DEFAULT_STRUCTURE_CODEWORDS, removeFillers, splitCodeword } from "./transcriptText.ts";

// A single-executable cannot resolve package imports; require reads both native packages from disk.
const requireNative = NodeModule.createRequire(import.meta.url);

const IDLE_UNLOAD_MS = 15 * 60_000;
export const HOUSEKEEPING_INTERVAL_MS = 30_000;
// oxlint-disable-next-line t3code/no-global-process-runtime -- Also runs in the desktop worker, which has no Effect runtime.
Expand Down Expand Up @@ -46,7 +50,7 @@ const disableVulkanCoopmat = async (): Promise<void> => {
const name = "GGML_VK_DISABLE_COOPMAT";
if (process.env[name] !== undefined) return;
if (PLATFORM === "win32") {
const koffi = (await import("koffi")).default;
const koffi = requireNative("koffi") as typeof import("koffi");
koffi.load("ucrtbase.dll").func("int _putenv_s(str, str)")(name, "1");
}
process.env[name] = "1";
Expand All @@ -55,7 +59,12 @@ const disableVulkanCoopmat = async (): Promise<void> => {
// transcribe-cpp dlopens a native library; it is only loaded once someone dictates.
const loadTranscribeCpp = async (): Promise<TranscribeModule> => {
await disableVulkanCoopmat();
const module = (await import("transcribe-cpp")) as TranscribeModule;
// transcribe-cpp only exports an import entry, so require takes its file on disk.
const packagePath = NodeModule.findPackageJSON("transcribe-cpp", import.meta.url);
if (!packagePath) throw new Error("The transcribe-cpp package is not installed.");
const module = requireNative(
NodePath.join(NodePath.dirname(packagePath), "dist/index.js"),
) as TranscribeModule;
if (!process.env.TRANSCRIBE_LIBRARY) {
// In the desktop app the package sits in an asar archive, which the OS loader cannot read;
// its DLLs are unpacked beside the archive.
Expand Down