cli: add runHeadless function

livekit · Jun 30, 2024 · 2514709 · 2514709
1 parent 00dca94
commit 2514709
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 41 deletions.
diff --git a/agents/package.json b/agents/package.json
@@ -18,7 +18,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@livekit/rtc-node": "^0.4.4",
+    "@livekit/rtc-node": "^0.5.0",
     "@livekit/protocol": "^1.13.0",
     "commander": "^12.0.0",
     "livekit-server-sdk": "^2.1.2",

diff --git a/agents/src/cli.ts b/agents/src/cli.ts
@@ -9,14 +9,13 @@ import { Worker, type WorkerOptions } from './worker.js';
 
 type CliArgs = {
   opts: WorkerOptions;
-  logLevel: string;
   production: boolean;
   watch: boolean;
   event?: EventEmitter;
 };
 
 const runWorker = async (args: CliArgs) => {
-  log.level = args.logLevel;
+  log.level = args.opts.logLevel;
   const worker = new Worker(args.opts);
 
   process.on('SIGINT', async () => {
@@ -41,7 +40,8 @@ export const runApp = (opts: WorkerOptions) => {
     .addOption(
       new Option('--log-level <level>', 'Set the logging level')
         .choices(['trace', 'debug', 'info', 'warn', 'error', 'fatal'])
-        .default('trace'),
+        .default('info')
+        .env('LOG_LEVEL'),
     )
     .addOption(
       new Option('--url <string>', 'LiveKit server or Cloud project websocket URL')
@@ -67,13 +67,28 @@ export const runApp = (opts: WorkerOptions) => {
       opts.wsURL = options.url || opts.wsURL;
       opts.apiKey = options.apiKey || opts.apiKey;
       opts.apiSecret = options.apiSecret || opts.apiSecret;
+      opts.logLevel = options.logLevel || opts.logLevel;
       runWorker({
         opts,
         production: true,
         watch: false,
-        logLevel: options.logLevel,
       });
     });
 
   program.parse();
 };
+
+// like runApp but without calling `start' in the CLI.
+// useful for wrapped applications
+export const runHeadless = (opts: WorkerOptions) => {
+  opts.wsURL = process.env.LIVEKIT_URL || opts.wsURL;
+  opts.apiKey = process.env.LIVEKIT_API_KEY || opts.apiKey;
+  opts.apiSecret = process.env.LIVEKIT_API_SECRET || opts.apiSecret;
+  opts.logLevel = process.env.LOG_LEVEL || opts.logLevel;
+
+  runWorker({
+    opts,
+    production: true,
+    watch: false,
+  });
+};
diff --git a/agents/src/utils.ts b/agents/src/utils.ts
@@ -20,7 +20,7 @@ export const mergeFrames = (buffer: AudioBuffer): AudioFrame => {
     const sampleRate = buffer[0].sampleRate;
     const channels = buffer[0].channels;
     let samplesPerChannel = 0;
-    let data = new Uint16Array();
+    let data = new Int16Array();
 
     for (const frame of buffer) {
       if (frame.sampleRate !== sampleRate) {
@@ -31,7 +31,7 @@ export const mergeFrames = (buffer: AudioBuffer): AudioFrame => {
         throw new TypeError('channel count mismatch');
       }
 
-      data = new Uint16Array([...data, ...frame.data]);
+      data = new Int16Array([...data, ...frame.data]);
       samplesPerChannel += frame.samplesPerChannel;
     }
 

diff --git a/agents/src/worker.ts b/agents/src/worker.ts
@@ -69,6 +69,7 @@ export class WorkerOptions {
   apiSecret?: string;
   host: string;
   port: number;
+  logLevel: string;
 
   constructor({
     requestFunc,
@@ -82,6 +83,7 @@ export class WorkerOptions {
     apiSecret = undefined,
     host = 'localhost',
     port = 8081,
+    logLevel = 'info',
   }: {
     requestFunc: (arg: JobRequest) => Promise<void>;
     cpuLoadFunc?: () => number;
@@ -94,6 +96,7 @@ export class WorkerOptions {
     apiSecret?: string;
     host?: string;
     port?: number;
+    logLevel?: string;
   }) {
     this.requestFunc = requestFunc;
     this.cpuLoadFunc = cpuLoadFunc;
@@ -106,6 +109,7 @@ export class WorkerOptions {
     this.apiSecret = apiSecret;
     this.host = host;
     this.port = port;
+    this.logLevel = logLevel;
   }
 }
 

diff --git a/examples/package.json b/examples/package.json
@@ -12,6 +12,6 @@
   "dependencies": {
     "@livekit/agents": "workspace:*",
     "@livekit/agents-plugin-elevenlabs": "workspace:*",
-    "@livekit/rtc-node": "^0.4.4"
+    "@livekit/rtc-node": "^0.5.0"
   }
 }
diff --git a/plugins/elevenlabs/package.json b/plugins/elevenlabs/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@livekit/agents": "workspace:*",
-    "@livekit/rtc-node": "^0.4.4",
+    "@livekit/rtc-node": "^0.5.0",
     "ws": "^8.16.0"
   }
 }
diff --git a/plugins/elevenlabs/src/tts.ts b/plugins/elevenlabs/src/tts.ts
@@ -220,7 +220,7 @@ export class SynthesizeStream extends tts.SynthesizeStream {
         }).then((msg) => {
           const json = JSON.parse(msg.toString());
           if ('audio' in json) {
-            const data = new Uint16Array(Buffer.from(json.audio, 'base64'));
+            const data = new Int16Array(Buffer.from(json.audio, 'base64'));
             const audioFrame = new AudioFrame(
               data,
               this.config.sampleRate,
@@ -317,7 +317,7 @@ class ChunkedStream extends tts.ChunkedStream {
           {
             text: this.text,
             data: new AudioFrame(
-              new Uint16Array(data.buffer),
+              new Int16Array(data.buffer),
               this.config.sampleRate,
               1,
               data.byteLength / 2,

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/turbo.json b/turbo.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://turborepo.org/schema.json",
-  "globalEnv": ["ELEVEN_API_KEY", "LIVEKIT_URL", "LIVEKIT_API_KEY", "LIVEKIT_API_SECRET"],
+  "globalEnv": ["ELEVEN_API_KEY", "LIVEKIT_URL", "LIVEKIT_API_KEY", "LIVEKIT_API_SECRET", "LOG_LEVEL"],
   "pipeline": {
     "build": {
       "dependsOn": ["^build"],