rename buffer with to_bytes

eclipse-zenoh · Jan 10, 2025 · 6240bfd · 6240bfd
1 parent 7768203
commit 6240bfd
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/zenoh-ts/src/pubsub.ts b/zenoh-ts/src/pubsub.ts
@@ -295,11 +295,11 @@ export class Publisher {
     let _attachment = null;
     if (put_options.attachment != null) {
       let att_bytes = new ZBytes(put_options.attachment);
-      _attachment = Array.from(att_bytes.buffer());
+      _attachment = Array.from(att_bytes.to_bytes());
     }
 
     return this._remote_publisher.put(
-      Array.from(zbytes.buffer()),
+      Array.from(zbytes.to_bytes()),
       _attachment,
       _encoding.toString(),
       _timestamp,
@@ -353,7 +353,7 @@ export class Publisher {
     let _attachment = null;
     if (delete_options.attachment != null) {
       let att_bytes = new ZBytes(delete_options.attachment);
-      _attachment = Array.from(att_bytes.buffer());
+      _attachment = Array.from(att_bytes.to_bytes());
     }
 
     let _timestamp = null;

diff --git a/zenoh-ts/src/querier.ts b/zenoh-ts/src/querier.ts
@@ -215,10 +215,10 @@ export class Querier {
     let _encoding = get_options?.encoding?.toString()
 
     if (get_options?.attachment != undefined) {
-      _attachment = Array.from(new ZBytes(get_options?.attachment).buffer())
+      _attachment = Array.from(new ZBytes(get_options?.attachment).to_bytes())
     }
     if (get_options?.payload != undefined) {
-      _payload = Array.from(new ZBytes(get_options?.payload).buffer())
+      _payload = Array.from(new ZBytes(get_options?.payload).to_bytes())
     }
     if (get_options?.parameters != undefined) {
       _parameters = get_options?.parameters;

diff --git a/zenoh-ts/src/query.ts b/zenoh-ts/src/query.ts
@@ -244,7 +244,7 @@ export class Query {
     let qr_variant: QueryReplyVariant = {
       Reply: {
         key_expr: _key_expr.toString(),
-        payload: b64_str_from_bytes(z_bytes.buffer()),
+        payload: b64_str_from_bytes(z_bytes.to_bytes()),
 
       },
     };
@@ -258,7 +258,7 @@ export class Query {
   reply_err(payload: IntoZBytes): void {
     let z_bytes: ZBytes = new ZBytes(payload);
     let qr_variant: QueryReplyVariant = {
-      ReplyErr: { payload: b64_str_from_bytes(z_bytes.buffer()) },
+      ReplyErr: { payload: b64_str_from_bytes(z_bytes.to_bytes()) },
     };
     this.reply_ws(qr_variant);
   }

diff --git a/zenoh-ts/src/sample.ts b/zenoh-ts/src/sample.ts
@@ -327,7 +327,7 @@ export function SampleWS_from_Sample(
   attachement: ZBytes | undefined,
 ): SampleWS {
   let key_expr: OwnedKeyExprWrapper = sample.keyexpr().toString();
-  let value: Array<number> = Array.from(sample.payload().buffer());
+  let value: Array<number> = Array.from(sample.payload().to_bytes());
 
   let sample_kind: SampleKindWS;
   if (sample.kind() == SampleKind.DELETE) {
@@ -344,7 +344,7 @@ export function SampleWS_from_Sample(
 
   let attach = null;
   if (attachement != null) {
-    attach = b64_str_from_bytes(new Uint8Array(attachement.buffer()));
+    attach = b64_str_from_bytes(new Uint8Array(attachement.to_bytes()));
   }
 
   let sample_ws: SampleWS = {

diff --git a/zenoh-ts/src/session.ts b/zenoh-ts/src/session.ts
@@ -244,12 +244,12 @@ export class Session {
     _express = put_opts?.express?.valueOf();
 
     if (put_opts?.attachment != undefined) {
-      _attachment = Array.from(new ZBytes(put_opts?.attachment).buffer())
+      _attachment = Array.from(new ZBytes(put_opts?.attachment).to_bytes())
     }
 
     this.remote_session.put(
       key_expr.toString(),
-      Array.from(z_bytes.buffer()),
+      Array.from(z_bytes.to_bytes()),
       _encoding,
       _congestion_control,
       _priority,
@@ -296,7 +296,7 @@ export class Session {
     let _timestamp;
 
     if (delete_opts?.attachment != undefined) {
-      _attachment = Array.from(new ZBytes(delete_opts?.attachment).buffer())
+      _attachment = Array.from(new ZBytes(delete_opts?.attachment).to_bytes())
     }
 
     if (delete_opts?.timestamp != undefined) {
@@ -398,10 +398,10 @@ export class Session {
       _timeout_millis = Duration.milliseconds.from(get_options?.timeout);
     }
     if (get_options?.attachment != undefined) {
-      _attachment = Array.from(new ZBytes(get_options?.attachment).buffer())
+      _attachment = Array.from(new ZBytes(get_options?.attachment).to_bytes())
     }
     if (get_options?.payload != undefined) {
-      _payload = Array.from(new ZBytes(get_options?.payload).buffer())
+      _payload = Array.from(new ZBytes(get_options?.payload).to_bytes())
     }
 
     let chan: SimpleChannel<ReplyWS> = this.remote_session.get(

diff --git a/zenoh-ts/src/z_bytes.ts b/zenoh-ts/src/z_bytes.ts
@@ -59,15 +59,14 @@ export class ZBytes {
   }
 
   /**
-  * returns the length of the ZBytes buffer
+  * returns if the ZBytes Buffer is empty
   * 
-  * @returns number
+  * @returns boolean
   */
   is_empty(): boolean {
     return this._buffer.length == 0;
   }
 
-
   /**
    * returns an empty ZBytes buffer
    * 
@@ -82,7 +81,7 @@ export class ZBytes {
    * 
    * @returns Uint8Array
    */
-  buffer(): Uint8Array {
+  to_bytes(): Uint8Array {
     return this._buffer
   }