make it work a bit more

livekit · Nov 22, 2024 · 69b3968 · 69b3968
1 parent c8e4a69
commit 69b3968
Show file tree

Hide file tree

Showing 13 changed files with 93 additions and 189 deletions.
diff --git a/agents/package.json b/agents/package.json
@@ -3,7 +3,15 @@
   "version": "0.4.6",
   "description": "LiveKit Agents - Node.js",
   "main": "dist/index.js",
+  "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
   "author": "LiveKit",
   "type": "module",
   "repository": "git@github.com:livekit/agents-js.git",
@@ -13,7 +21,7 @@
     "src"
   ],
   "scripts": {
-    "build": "tsup --splitting true --onSuccess \"tsc --declaration --emitDeclarationOnly\"",
+    "build": "tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\"",
     "clean": "rm -rf dist",
     "clean:build": "pnpm clean && pnpm build",
     "lint": "eslint -f unix \"src/**/*.ts\"",

diff --git a/examples/src/multimodal_agent.ts b/examples/src/multimodal_agent.ts
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-const { JobContext, WorkerOptions, cli, defineAgent, llm, multimodal } = require('@livekit/agents');
-const openai = require('@livekit/agents-plugin-openai');
-const { z } = require('zod');
+import agents = require('@livekit/agents');
+import openai = require('@livekit/agents-plugin-openai');
+import z = require('zod');
 
-export default defineAgent({
-  entry: async (ctx: typeof JobContext) => {
+module.exports = agents.defineAgent({
+  entry: async (ctx: agents.JobContext) => {
     await ctx.connect();
 
     console.log('waiting for participant');
@@ -29,7 +29,7 @@ export default defineAgent({
       });
     }
 
-    const fncCtx: llm.FunctionContext = {
+    const fncCtx: agents.llm.FunctionContext = {
       weather: {
         description: 'Get the weather in a location',
         parameters: z.object({
@@ -47,7 +47,7 @@ export default defineAgent({
       },
     };
 
-    const agent = new multimodal.MultimodalAgent({
+    const agent = new agents.multimodal.MultimodalAgent({
       model,
       fncCtx,
     });
@@ -57,13 +57,13 @@ export default defineAgent({
       .then((session) => session as openai.realtime.RealtimeSession);
 
     session.conversation.item.create(
-      llm.ChatMessage.create({
-        role: llm.ChatRole.USER,
+      agents.llm.ChatMessage.create({
+        role: agents.llm.ChatRole.USER,
         text: 'Say "How can I help you today?"',
       }),
     );
     session.response.create();
   },
 });
 
-cli.runApp(new WorkerOptions({ agent: __filename }));
+agents.cli.runApp(new agents.WorkerOptions({ agent: __filename }));
diff --git a/examples/src/pipeline_voice_agent.ts b/examples/src/pipeline_voice_agent.ts
diff --git a/examples/src/stt.ts b/examples/src/stt.ts
diff --git a/examples/src/tts.ts b/examples/src/tts.ts
diff --git a/examples/tsconfig.json b/examples/tsconfig.json
@@ -5,6 +5,7 @@
     // match output dir to input dir. e.g. dist/index instead of dist/src/index
     "rootDir": "./src",
     "declarationDir": "./dist",
-    "outDir": "./dist"
+    "outDir": "./dist",
+    "module": "commonjs"
   }
 }
diff --git a/package.json b/package.json
@@ -48,7 +48,9 @@
   "pnpm": {
     "overrides": {
       "@livekit/protocol": "file:/home/nbsp/src/@livekit/protocol/packages/javascript",
-      "@livekit/rtc-node": "file:/home/nbsp/src/@livekit/node-sdks/packages/livekit-rtc"
+      "@livekit/mutex": "file:/home/nbsp/src/@livekit/ts-mutex",
+      "@livekit/rtc-node": "file:/home/nbsp/src/@livekit/node-sdks/packages/livekit-rtc",
+      "livekit-server-sdk": "file:/home/nbsp/src/@livekit/node-sdks/packages/livekit-server-sdk"
     }
   }
 }
diff --git a/plugins/deepgram/package.json b/plugins/deepgram/package.json
@@ -3,7 +3,15 @@
   "version": "0.4.6",
   "description": "Deepgram plugin for LiveKit Agents for Node.js",
   "main": "dist/index.js",
+  "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
   "author": "LiveKit",
   "type": "module",
   "repository": "git@github.com:livekit/agents-js.git",

diff --git a/plugins/elevenlabs/package.json b/plugins/elevenlabs/package.json
@@ -3,7 +3,15 @@
   "version": "0.4.6",
   "description": "ElevenLabs plugin for LiveKit Node Agents",
   "main": "dist/index.js",
+  "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
   "author": "LiveKit",
   "type": "module",
   "repository": "git@github.com:livekit/agents-js.git",

diff --git a/plugins/openai/package.json b/plugins/openai/package.json
@@ -3,7 +3,15 @@
   "version": "0.6.1",
   "description": "OpenAI plugin for LiveKit Node Agents",
   "main": "dist/index.js",
+  "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
   "author": "LiveKit",
   "type": "module",
   "repository": "git@github.com:livekit/agents-js.git",

diff --git a/plugins/silero/package.json b/plugins/silero/package.json
@@ -3,7 +3,15 @@
   "version": "0.4.6",
   "description": "Silero voice activity detection LiveKit Node Agents",
   "main": "dist/index.js",
+  "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
   "author": "LiveKit",
   "type": "module",
   "repository": "git@github.com:livekit/agents-js.git",