@cartesia/cartesia-js 1.0.0-alpha.4 → 1.0.1

package/dist/lib/index.cjs

@@ -22,6 +22,18 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -134,7 +146,13 @@ var import_partysocket = require("partysocket");
 
 // src/tts/source.ts
 var import_emittery = __toESM(require("emittery"), 1);
-var _emitter, _buffer, _readIndex, _writeIndex, _closed, _sampleRate;
+var ENCODING_MAP = {
+  pcm_f32le: { arrayType: Float32Array, bytesPerElement: 4 },
+  pcm_s16le: { arrayType: Int16Array, bytesPerElement: 2 },
+  pcm_alaw: { arrayType: Uint8Array, bytesPerElement: 1 },
+  pcm_mulaw: { arrayType: Uint8Array, bytesPerElement: 1 }
+};
+var _emitter, _buffer, _readIndex, _writeIndex, _closed, _sampleRate, _encoding, _container, _createBuffer, createBuffer_fn;
 var Source = class {
   /**
    * Create a new Source.
@@ -142,23 +160,44 @@ var Source = class {
    * @param options - Options for the Source.
    * @param options.sampleRate - The sample rate of the audio.
    */
-  constructor({ sampleRate }) {
+  constructor({
+    sampleRate,
+    encoding,
+    container
+  }) {
+    /**
+     * Create a new buffer for the source.
+     *
+     * @param size - The size of the buffer to create.
+     * @returns The new buffer as a TypedArray based on the encoding.
+     */
+    __privateAdd(this, _createBuffer);
     __privateAdd(this, _emitter, new import_emittery.default());
     __privateAdd(this, _buffer, void 0);
     __privateAdd(this, _readIndex, 0);
     __privateAdd(this, _writeIndex, 0);
     __privateAdd(this, _closed, false);
     __privateAdd(this, _sampleRate, void 0);
+    __privateAdd(this, _encoding, void 0);
+    __privateAdd(this, _container, void 0);
     this.on = __privateGet(this, _emitter).on.bind(__privateGet(this, _emitter));
     this.once = __privateGet(this, _emitter).once.bind(__privateGet(this, _emitter));
     this.events = __privateGet(this, _emitter).events.bind(__privateGet(this, _emitter));
     this.off = __privateGet(this, _emitter).off.bind(__privateGet(this, _emitter));
     __privateSet(this, _sampleRate, sampleRate);
-    __privateSet(this, _buffer, new Float32Array(1024));
+    __privateSet(this, _encoding, encoding);
+    __privateSet(this, _container, container);
+    __privateSet(this, _buffer, __privateMethod(this, _createBuffer, createBuffer_fn).call(this, 1024));
   }
   get sampleRate() {
     return __privateGet(this, _sampleRate);
   }
+  get encoding() {
+    return __privateGet(this, _encoding);
+  }
+  get container() {
+    return __privateGet(this, _container);
+  }
   /**
    * Append audio to the buffer.
    *
@@ -172,7 +211,7 @@ var Source = class {
         while (newCapacity < requiredCapacity) {
           newCapacity *= 2;
         }
-        const newBuffer = new Float32Array(newCapacity);
+        const newBuffer = __privateMethod(this, _createBuffer, createBuffer_fn).call(this, newCapacity);
         newBuffer.set(__privateGet(this, _buffer));
         __privateSet(this, _buffer, newBuffer);
       }
@@ -220,6 +259,9 @@ var Source = class {
   get readIndex() {
     return __privateGet(this, _readIndex);
   }
+  get writeIndex() {
+    return __privateGet(this, _writeIndex);
+  }
   /**
    * Close the source. This signals that no more audio will be enqueued.
    *
@@ -241,19 +283,27 @@ _readIndex = new WeakMap();
 _writeIndex = new WeakMap();
 _closed = new WeakMap();
 _sampleRate = new WeakMap();
+_encoding = new WeakMap();
+_container = new WeakMap();
+_createBuffer = new WeakSet();
+createBuffer_fn = function(size) {
+  const { arrayType: ArrayType } = ENCODING_MAP[__privateGet(this, _encoding)];
+  return new ArrayType(size);
+};
 
 // src/tts/utils.ts
 var import_base64_js = __toESM(require("base64-js"), 1);
-function base64ToArray(b64) {
+function base64ToArray(b64, encoding) {
   const byteArrays = filterSentinel(b64).map((b) => import_base64_js.default.toByteArray(b));
+  const { arrayType: ArrayType, bytesPerElement } = ENCODING_MAP[encoding];
   const totalLength = byteArrays.reduce(
-    (acc, arr) => acc + arr.length / Float32Array.BYTES_PER_ELEMENT,
+    (acc, arr) => acc + arr.length / bytesPerElement,
     0
   );
-  const result = new Float32Array(totalLength);
+  const result = new ArrayType(totalLength);
   let offset = 0;
   for (const arr of byteArrays) {
-    const floats = new Float32Array(arr.buffer);
+    const floats = new ArrayType(arr.buffer);
     result.set(floats, offset);
     offset += floats.length;
   }
@@ -271,10 +321,10 @@ function createMessageHandlerForContextId(contextId, handler) {
     let chunk;
     if (message.done) {
       chunk = getSentinel();
-    } else {
+    } else if (message.type === "chunk") {
       chunk = message.data;
     }
-    handler({ chunk, message: event.data });
+    handler({ chunk, message: event.data, data: message });
   };
 }
 function getSentinel() {
@@ -298,14 +348,14 @@ function getEmitteryCallbacks(emitter) {
 }
 
 // src/tts/websocket.ts
-var _isConnected, _sampleRate2, _generateId, generateId_fn;
+var _isConnected, _sampleRate2, _container2, _encoding2, _generateId, generateId_fn;
 var WebSocket = class extends Client {
   /**
    * Create a new WebSocket client.
    *
    * @param args - Arguments to pass to the Client constructor.
    */
-  constructor({ sampleRate }, ...args) {
+  constructor({ sampleRate, container, encoding }, ...args) {
     super(...args);
     /**
      * Generate a unique ID suitable for a streaming context.
@@ -318,37 +368,47 @@ var WebSocket = class extends Client {
     __privateAdd(this, _generateId);
     __privateAdd(this, _isConnected, false);
     __privateAdd(this, _sampleRate2, void 0);
+    __privateAdd(this, _container2, void 0);
+    __privateAdd(this, _encoding2, void 0);
     __privateSet(this, _sampleRate2, sampleRate);
+    __privateSet(this, _container2, container != null ? container : "raw");
+    __privateSet(this, _encoding2, encoding != null ? encoding : "pcm_f32le");
   }
   /**
-   * Send a message over the WebSocket in order to start a stream.
+   * Send a message over the WebSocket to start a stream.
    *
-   * @param inputs - Stream options.
+   * @param inputs - Stream options. Defined in the StreamRequest type.
    * @param options - Options for the stream.
    * @param options.timeout - The maximum time to wait for a chunk before cancelling the stream.
-   * If `0`, the stream will not time out.
+   *                          If set to `0`, the stream will not time out.
    * @returns A Source object that can be passed to a Player to play the audio.
+   * @returns An Emittery instance that emits messages from the WebSocket.
+   * @returns An abort function that can be called to cancel the stream.
    */
-  send(inputs, { timeout = 0 } = {}) {
-    var _a, _b, _c, _d;
+  send(_a, { timeout = 0 } = {}) {
+    var inputs = __objRest(_a, []);
+    var _a2, _b, _c, _d;
     if (!__privateGet(this, _isConnected)) {
       throw new Error("Not connected to WebSocket. Call .connect() first.");
     }
-    const contextId = __privateMethod(this, _generateId, generateId_fn).call(this);
-    (_a = this.socket) == null ? void 0 : _a.send(
-      JSON.stringify(__spreadProps(__spreadValues({
-        context_id: contextId
-      }, inputs), {
-        output_format: {
-          container: "raw",
-          encoding: "pcm_f32le",
-          sample_rate: __privateGet(this, _sampleRate2)
-        }
-      }))
+    if (!inputs.context_id) {
+      inputs.context_id = __privateMethod(this, _generateId, generateId_fn).call(this);
+    }
+    if (!inputs.output_format) {
+      inputs.output_format = {
+        container: __privateGet(this, _container2),
+        encoding: __privateGet(this, _encoding2),
+        sample_rate: __privateGet(this, _sampleRate2)
+      };
+    }
+    (_a2 = this.socket) == null ? void 0 : _a2.send(
+      JSON.stringify(__spreadValues({}, inputs))
     );
     const emitter = new import_emittery2.default();
     const source = new Source({
-      sampleRate: __privateGet(this, _sampleRate2)
+      sampleRate: __privateGet(this, _sampleRate2),
+      encoding: __privateGet(this, _encoding2),
+      container: __privateGet(this, _container2)
     });
     const streamCompleteController = new AbortController();
     let timeoutId = null;
@@ -356,19 +416,26 @@ var WebSocket = class extends Client {
       timeoutId = setTimeout(streamCompleteController.abort, timeout);
     }
     const handleMessage = createMessageHandlerForContextId(
-      contextId,
-      (_0) => __async(this, [_0], function* ({ chunk, message }) {
+      inputs.context_id,
+      (_0) => __async(this, [_0], function* ({ chunk, message, data }) {
         emitter.emit("message", message);
+        if (data.type === "timestamps") {
+          emitter.emit("timestamps", data.word_timestamps);
+          return;
+        }
         if (isSentinel(chunk)) {
           yield source.close();
           streamCompleteController.abort();
           return;
         }
-        yield source.enqueue(base64ToArray([chunk]));
         if (timeoutId) {
           clearTimeout(timeoutId);
           timeoutId = setTimeout(streamCompleteController.abort, timeout);
         }
+        if (!chunk) {
+          return;
+        }
+        yield source.enqueue(base64ToArray([chunk], __privateGet(this, _encoding2)));
       })
     );
     (_b = this.socket) == null ? void 0 : _b.addEventListener("message", handleMessage, {
@@ -398,7 +465,11 @@ var WebSocket = class extends Client {
         clearTimeout(timeoutId);
       }
     });
-    return __spreadValues({ source }, getEmitteryCallbacks(emitter));
+    return __spreadProps(__spreadValues({
+      source
+    }, getEmitteryCallbacks(emitter)), {
+      stop: streamCompleteController.abort.bind(streamCompleteController)
+    });
   }
   /**
    * Authenticate and connect to a Cartesia streaming WebSocket.
@@ -468,6 +539,8 @@ var WebSocket = class extends Client {
 };
 _isConnected = new WeakMap();
 _sampleRate2 = new WeakMap();
+_container2 = new WeakMap();
+_encoding2 = new WeakMap();
 _generateId = new WeakSet();
 generateId_fn = function() {
   return (0, import_human_id.humanId)({

package/dist/lib/index.js

@@ -1,14 +1,14 @@
 import {
   Cartesia
-} from "../chunk-ISRU7PLL.js";
-import "../chunk-SGXUEFII.js";
-import "../chunk-VK7LBMVI.js";
-import "../chunk-IQAXBRHU.js";
-import "../chunk-PQ6CIPFW.js";
-import "../chunk-PQ5EVEEH.js";
+} from "../chunk-OFH3ML4L.js";
+import "../chunk-KUSVZXDT.js";
+import "../chunk-2NA5SEML.js";
+import "../chunk-ASZKHN7Q.js";
+import "../chunk-5M33ZF3Y.js";
 import "../chunk-2BFEKY3F.js";
-import "../chunk-RO7TY474.js";
-import "../chunk-WIFMLPT5.js";
+import "../chunk-BHY7MNGT.js";
+import "../chunk-6YQ6KDIQ.js";
+import "../chunk-GHY2WEOK.js";
 export {
   Cartesia
 };