fix: XML parse boolean

bnb-chain · Aug 29, 2023 · d747e60 · d747e60
1 parent 8b6b2c6
commit d747e60
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git a/.changeset/gorgeous-ligers-give.md b/.changeset/gorgeous-ligers-give.md
@@ -0,0 +1,5 @@
+---
+'@bnb-chain/greenfield-js-sdk': patch
+---
+
+fix: XML boolean parse
diff --git a/packages/chain-sdk/src/clients/spclient/spApis/getObjectMeta.ts b/packages/chain-sdk/src/clients/spclient/spApis/getObjectMeta.ts
@@ -1,4 +1,4 @@
-import { formatObjectInfo } from '@/types';
+import { convertStrToBool, formatObjectInfo } from '@/types/sp-xml/Common';
 import { GetObjectMetaResponse } from '@/types/sp-xml/GetObjectMetaResponse';
 import xml from 'xml2js';
 
@@ -12,7 +12,8 @@ export const parseGetObjectMetaResponse = async (data: string) => {
 
   const Object = res.GfSpGetObjectMetaResponse.Object || {};
   if (Object) {
-    Object.Removed = Boolean(Object.Removed);
+    // @ts-ignore
+    Object.Removed = convertStrToBool(Object.Removed);
     Object.UpdateAt = Number(Object.UpdateAt);
     Object.DeleteAt = Number(Object.DeleteAt);
 

diff --git a/packages/chain-sdk/src/clients/spclient/spApis/getUserBuckets.ts b/packages/chain-sdk/src/clients/spclient/spApis/getUserBuckets.ts
@@ -1,4 +1,5 @@
 import { GetUserBucketsResponse } from '@/types';
+import { convertStrToBool } from '@/types/sp-xml/Common';
 import xml from 'xml2js';
 
 // https://docs.bnbchain.org/greenfield-docs/docs/api/storgae-provider-rest/get_user_buckets
@@ -18,7 +19,8 @@ export const parseGetUserBucketsResponse = async (data: string) => {
     Buckets = Buckets.map((item) => {
       return {
         ...item,
-        Removed: Boolean(item.Removed),
+        // @ts-ignore
+        Removed: convertStrToBool(item.Removed),
         DeleteAt: Number(item.DeleteAt),
         UpdateAt: Number(item.UpdateAt),
         UpdateTime: Number(item.UpdateTime),

diff --git a/packages/chain-sdk/src/clients/spclient/spApis/listObjectsByBucket.ts b/packages/chain-sdk/src/clients/spclient/spApis/listObjectsByBucket.ts
@@ -1,7 +1,5 @@
-import {
-  formatObjectInfo,
-  ListObjectsByBucketNameResponse,
-} from '@/types/sp-xml/ListObjectsByBucketNameResponse';
+import { convertStrToBool, formatObjectInfo } from '@/types/sp-xml/Common';
+import { ListObjectsByBucketNameResponse } from '@/types/sp-xml/ListObjectsByBucketNameResponse';
 import xml from 'xml2js';
 
 // https://docs.bnbchain.org/greenfield-docs/docs/api/storgae-provider-rest/list_objects_by_bucket
@@ -21,7 +19,8 @@ export const parseListObjectsByBucketNameResponse = async (data: string) => {
     Objects = Objects.map((item) => {
       return {
         ...item,
-        Removed: Boolean(item.Removed),
+        // @ts-ignore
+        Removed: convertStrToBool(item.Removed),
         UpdateAt: Number(item.UpdateAt),
         DeleteAt: Number(item.DeleteAt),
         ObjectInfo: formatObjectInfo(item.ObjectInfo),
@@ -35,7 +34,8 @@ export const parseListObjectsByBucketNameResponse = async (data: string) => {
     ...res.GfSpListObjectsByBucketNameResponse,
     Objects,
     CommonPrefixes,
-    IsTruncated: Boolean(res.GfSpListObjectsByBucketNameResponse.IsTruncated),
+    // @ts-ignore
+    IsTruncated: convertStrToBool(res.GfSpListObjectsByBucketNameResponse.IsTruncated),
   };
 
   return res;

diff --git a/packages/chain-sdk/src/types/sp-xml/Common.ts b/packages/chain-sdk/src/types/sp-xml/Common.ts
@@ -74,3 +74,17 @@ export interface ObjectInfo {
   SourceType: keyof typeof SourceType;
   Checksums: string[];
 }
+
+export function formatObjectInfo(o: ObjectInfo) {
+  return {
+    ...o,
+    Id: Number(o.Id),
+    LocalVirtualGroupId: Number(o.LocalVirtualGroupId),
+    PayloadSize: Number(o.PayloadSize),
+    CreateAt: Number(o.CreateAt),
+  };
+}
+
+export function convertStrToBool(str: string) {
+  return String(str).toLowerCase() === 'true';
+}
diff --git a/packages/chain-sdk/src/types/sp-xml/ListObjectsByBucketNameResponse.ts b/packages/chain-sdk/src/types/sp-xml/ListObjectsByBucketNameResponse.ts
@@ -16,13 +16,3 @@ export interface GfSPListObjectsByBucketNameResponse {
   CommonPrefixes: string[];
   ContinuationToken: string;
 }
-
-export function formatObjectInfo(o: ObjectInfo) {
-  return {
-    ...o,
-    Id: Number(o.Id),
-    LocalVirtualGroupId: Number(o.LocalVirtualGroupId),
-    PayloadSize: Number(o.PayloadSize),
-    CreateAt: Number(o.CreateAt),
-  };
-}