livekit · nbsp · Nov 27, 2024 · Nov 13, 2024 · Nov 13, 2024 · Nov 13, 2024
diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml
@@ -60,6 +60,11 @@ jobs:
           node-version: 20
           cache: "pnpm"
 
+      - name: Install rename
+        run: |
+          sudo apt-get update
+          sudo apt-get install rename
+
       - name: Install JS dependencies
         run: pnpm install
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -29,6 +29,11 @@ jobs:
           node-version: 20
           cache: "pnpm"
 
+      - name: Install rename
+        run: |
+          sudo apt-get update
+          sudo apt-get install rename
+
       - name: Install dependencies
         run: pnpm install
 

diff --git a/infra/link.pb.go b/infra/link.pb.go
diff --git a/livekit/livekit_agent.pb.go b/livekit/livekit_agent.pb.go
diff --git a/livekit/livekit_agent_dispatch.pb.go b/livekit/livekit_agent_dispatch.pb.go
diff --git a/livekit/livekit_analytics.pb.go b/livekit/livekit_analytics.pb.go
diff --git a/livekit/livekit_egress.pb.go b/livekit/livekit_egress.pb.go
diff --git a/livekit/livekit_ingress.pb.go b/livekit/livekit_ingress.pb.go
diff --git a/livekit/livekit_internal.pb.go b/livekit/livekit_internal.pb.go
diff --git a/livekit/livekit_metrics.pb.go b/livekit/livekit_metrics.pb.go
diff --git a/livekit/livekit_models.pb.go b/livekit/livekit_models.pb.go
diff --git a/livekit/livekit_room.pb.go b/livekit/livekit_room.pb.go
diff --git a/livekit/livekit_rtc.pb.go b/livekit/livekit_rtc.pb.go
diff --git a/livekit/livekit_sip.pb.go b/livekit/livekit_sip.pb.go
diff --git a/livekit/livekit_webhook.pb.go b/livekit/livekit_webhook.pb.go
diff --git a/packages/javascript/.gitignore b/packages/javascript/.gitignore
@@ -1,3 +1,3 @@
 node_modules/
 src/gen
-!src/gen/version.d.ts
+!src/gen/version.d.ts
diff --git a/packages/javascript/package.json b/packages/javascript/package.json
@@ -4,23 +4,31 @@
   "description": "",
   "type": "module",
   "main": "src/index.js",
+  "import": "src/index.cjs",
   "types": "src/index.d.ts",
   "files": [
     "src"
   ],
   "exports": {
     ".": {
       "types": "./src/index.d.ts",
-      "default": "./src/index.js"
+      "import": "./src/index.js",
+      "require": "./src/index.cjs"
     },
     "./*": {
-      "types": "./src/gen/livekit_*_pb.d.ts",
-      "default": "./src/gen/livekit_*_pb.js"
+      "types": "./src/gen/dts/livekit_*_pb.d.ts",
+      "import": "./src/gen/esm/livekit_*_pb.js",
+      "require": "./src/gen/cjs/livekit_*_pb.cjs"
     }
   },
   "scripts": {
-    "generate:version": "genversion --esm --semi src/gen/version.js",
-    "generate:proto": "protoc --es_out src/gen --es_opt target=js+dts -I=../../protobufs ../../protobufs/livekit_*.proto",
+    "generate:version:esm": "genversion --esm --semi src/gen/version.mjs",
+    "generate:version:cjs": "genversion --semi src/gen/version.cjs",
+    "generate:version": "pnpm generate:version:esm && pnpm generate:version:cjs",
+    "generate:proto:esm": "protoc --es_out src/gen --es_opt target=js -I=../../protobufs ../../protobufs/livekit_*.proto",
+    "generate:proto:cjs": "protoc --es_out src/gen --es_opt target=js,js_import_style=legacy_commonjs -I=../../protobufs ../../protobufs/livekit_*.proto && rename \"s/js$/cjs/\" src/gen/*.js && sed -i 's/\\.js\")/.cjs\")/' src/gen/*.cjs",
+    "generate:proto:dts": "protoc --es_out src/gen --es_opt target=dts -I=../../protobufs ../../protobufs/livekit_*.proto",
+    "generate:proto": "pnpm generate:proto:cjs && pnpm generate:proto:esm && pnpm generate:proto:dts",
     "build": "pnpm generate:version && pnpm generate:proto"
   },
   "keywords": [],

diff --git a/packages/javascript/src/index.cjs b/packages/javascript/src/index.cjs
@@ -0,0 +1,28 @@
+// @ts-check
+const { protoInt64 } = require("@bufbuild/protobuf");
+const agentDispatch = require("./gen/livekit_agent_dispatch_pb.cjs");
+const agent = require("./gen/livekit_agent_pb.cjs");
+const egress = require("./gen/livekit_egress_pb.cjs");
+const ingress = require("./gen/livekit_ingress_pb.cjs");
+const metrics = require("./gen/livekit_metrics_pb.cjs");
+const models = require("./gen/livekit_models_pb.cjs");
+const room = require("./gen/livekit_room_pb.cjs");
+const rtc = require("./gen/livekit_rtc_pb.cjs");
+const sip = require("./gen/livekit_sip_pb.cjs");
+const webhook = require("./gen/livekit_webhook_pb.cjs");
+const version = require("./gen/version.cjs");
+
+module.exports = {
+  protoInt64,
+  ...agentDispatch,
+  ...agent,
+  ...egress,
+  ...ingress,
+  ...metrics,
+  ...models,
+  ...room,
+  ...rtc,
+  ...sip,
+  ...webhook,
+  version,
+}
diff --git a/packages/javascript/src/index.js b/packages/javascript/src/index.js
@@ -10,4 +10,4 @@ export * from "./gen/livekit_room_pb.js";
 export * from "./gen/livekit_rtc_pb.js";
 export * from "./gen/livekit_sip_pb.js";
 export * from "./gen/livekit_webhook_pb.js";
-export * from "./gen/version.js";
+export * from "./gen/version.mjs";
diff --git a/rpc/agent.pb.go b/rpc/agent.pb.go
diff --git a/rpc/agent_dispatch.pb.go b/rpc/agent_dispatch.pb.go
diff --git a/rpc/analytics.pb.go b/rpc/analytics.pb.go
diff --git a/rpc/egress.pb.go b/rpc/egress.pb.go
diff --git a/rpc/ingress.pb.go b/rpc/ingress.pb.go
diff --git a/rpc/io.pb.go b/rpc/io.pb.go
diff --git a/rpc/keepalive.pb.go b/rpc/keepalive.pb.go
diff --git a/rpc/participant.pb.go b/rpc/participant.pb.go
diff --git a/rpc/room.pb.go b/rpc/room.pb.go
diff --git a/rpc/roommanager.pb.go b/rpc/roommanager.pb.go
diff --git a/rpc/signal.pb.go b/rpc/signal.pb.go
diff --git a/rpc/sip.pb.go b/rpc/sip.pb.go