bnb-chain · rrr523 · Aug 30, 2023 · Aug 30, 2023
diff --git a/.changeset/flat-cameras-divide.md b/.changeset/flat-cameras-divide.md
@@ -0,0 +1,5 @@
+---
+'@bnb-chain/greenfield-js-sdk': patch
+---
+
+feat: convert XML enum to number
diff --git a/packages/chain-sdk/src/api/bucket.ts b/packages/chain-sdk/src/api/bucket.ts
@@ -406,6 +406,7 @@ export class Bucket implements IBucket {
           readQuota: Number(res.GetReadQuotaResult.ReadQuotaSize ?? '0'),
           freeQuota: Number(res.GetReadQuotaResult.SPFreeReadQuotaSize ?? '0'),
           consumedQuota: Number(res.GetReadQuotaResult.ReadConsumedSize ?? '0'),
+          freeConsumedSize: Number(res.GetReadQuotaResult.FreeConsumedSize ?? '0'),
         },
         message: 'Get bucket read quota.',
         statusCode: result.status,

diff --git a/packages/chain-sdk/src/clients/spclient/spApis/getBucketMeta.ts b/packages/chain-sdk/src/clients/spclient/spApis/getBucketMeta.ts
@@ -1,4 +1,5 @@
 import { GetBucketMetaResponse } from '@/types';
+import { formatBucketInfo } from '@/types/sp-xml/Common';
 import { XMLParser } from 'fast-xml-parser';
 
 // https://docs.bnbchain.org/greenfield-docs/docs/api/storgae-provider-rest/get_bucket_meta
@@ -8,5 +9,13 @@ export const parseGetBucketMetaResponse = async (data: string) => {
   });
   const res = xmlParser.parse(data) as GetBucketMetaResponse;
 
+  res.GfSpGetBucketMetaResponse.Bucket = {
+    ...res.GfSpGetBucketMetaResponse.Bucket,
+    BucketInfo: formatBucketInfo(res.GfSpGetBucketMetaResponse.Bucket.BucketInfo),
+    DeleteAt: Number(res.GfSpGetBucketMetaResponse.Bucket.DeleteAt),
+    UpdateAt: Number(res.GfSpGetBucketMetaResponse.Bucket.UpdateAt),
+    UpdateTime: Number(res.GfSpGetBucketMetaResponse.Bucket.UpdateTime),
+  };
+
   return res;
 };
diff --git a/packages/chain-sdk/src/clients/spclient/spApis/getUserBuckets.ts b/packages/chain-sdk/src/clients/spclient/spApis/getUserBuckets.ts
@@ -1,5 +1,5 @@
 import { GetUserBucketsResponse } from '@/types';
-import { convertStrToBool } from '@/types/sp-xml/Common';
+import { convertStrToBool, formatBucketInfo } from '@/types/sp-xml/Common';
 import { XMLParser } from 'fast-xml-parser';
 
 // https://docs.bnbchain.org/greenfield-docs/docs/api/storgae-provider-rest/get_user_buckets
@@ -16,17 +16,9 @@ export const parseGetUserBucketsResponse = async (data: string) => {
     }
 
     Buckets = Buckets.map((item) => {
-      const BucketInfo = {
-        ...item.BucketInfo,
-        CreateAt: Number(item.BucketInfo.CreateAt),
-        // PrimarySpId: Number(item.BucketInfo.PrimarySpId),
-        GlobalVirtualGroupFamilyId: Number(item.BucketInfo.GlobalVirtualGroupFamilyId),
-        ChargedReadQuota: Number(item.BucketInfo.ChargedReadQuota),
-      };
-
       return {
         ...item,
-        BucketInfo,
+        BucketInfo: formatBucketInfo(item.BucketInfo),
         // @ts-ignore
         Removed: convertStrToBool(item.Removed),
         DeleteAt: Number(item.DeleteAt),

diff --git a/packages/chain-sdk/src/tests/parsexml.spec.ts b/packages/chain-sdk/src/tests/parsexml.spec.ts
@@ -141,12 +141,12 @@ describe('parseListObjectsByBucketNameResponse', () => {
           Id: 739112,
           LocalVirtualGroupId: 1,
           PayloadSize: 205,
-          Visibility: '1',
+          Visibility: 1,
           ContentType: 'application/x-yaml',
           CreateAt: 1692971564,
-          ObjectStatus: '1',
-          RedundancyType: '0',
-          SourceType: '0',
+          ObjectStatus: 1,
+          RedundancyType: 0,
+          SourceType: 0,
           Checksums: [
             'a7554caa696d4db8c8ea4500ad2eac6244bca79e3c3193db8cc699a7e89cf341',
             'b054fd20d637bfa706182288d687f2c0f0ef5afaa4114170bc18699b268e9c28',
@@ -247,12 +247,12 @@ describe('parseListObjectsByBucketNameResponse', () => {
           Id: 739112,
           LocalVirtualGroupId: 1,
           PayloadSize: 205,
-          Visibility: '1',
+          Visibility: 1,
           ContentType: 'application/x-yaml',
           CreateAt: 1692971564,
-          ObjectStatus: '1',
-          RedundancyType: '0',
-          SourceType: '0',
+          ObjectStatus: 1,
+          RedundancyType: 0,
+          SourceType: 0,
           Checksums: [
             'a7554caa696d4db8c8ea4500ad2eac6244bca79e3c3193db8cc699a7e89cf341',
             'b054fd20d637bfa706182288d687f2c0f0ef5afaa4114170bc18699b268e9c28',
@@ -277,12 +277,12 @@ describe('parseListObjectsByBucketNameResponse', () => {
           Id: 739112,
           LocalVirtualGroupId: 1,
           PayloadSize: 205,
-          Visibility: '1',
+          Visibility: 1,
           ContentType: 'application/x-yaml',
           CreateAt: 1692971564,
-          ObjectStatus: '1',
-          RedundancyType: '0',
-          SourceType: '0',
+          ObjectStatus: 1,
+          RedundancyType: 0,
+          SourceType: 0,
           Checksums: [
             'a7554caa696d4db8c8ea4500ad2eac6244bca79e3c3193db8cc699a7e89cf341',
             'b054fd20d637bfa706182288d687f2c0f0ef5afaa4114170bc18699b268e9c28',
@@ -358,14 +358,14 @@ describe('parseGetUserBucketsResponse', () => {
         BucketInfo: {
           Owner: '0x1C893441AB6c1A75E01887087ea508bE8e07AAae',
           BucketName: 'false',
-          Visibility: '1',
+          Visibility: 1,
           Id: '1156769',
-          SourceType: '0',
+          SourceType: 0,
           CreateAt: 1693279149,
           PaymentAddress: '0x1C893441AB6c1A75E01887087ea508bE8e07AAae',
           GlobalVirtualGroupFamilyId: 8,
           ChargedReadQuota: 0,
-          BucketStatus: '0',
+          BucketStatus: 0,
         },
         Removed: false,
         DeleteAt: 0,
@@ -380,14 +380,14 @@ describe('parseGetUserBucketsResponse', () => {
         BucketInfo: {
           Owner: '0x1C893441AB6c1A75E01887087ea508bE8e07AAae',
           BucketName: 'false',
-          Visibility: '1',
+          Visibility: 1,
           Id: '1156769',
-          SourceType: '0',
+          SourceType: 0,
           CreateAt: 1693279149,
           PaymentAddress: '0x1C893441AB6c1A75E01887087ea508bE8e07AAae',
           GlobalVirtualGroupFamilyId: 8,
           ChargedReadQuota: 0,
-          BucketStatus: '0',
+          BucketStatus: 0,
         },
         Removed: false,
         DeleteAt: 0,
@@ -434,14 +434,14 @@ describe('parseGetUserBucketsResponse', () => {
         BucketInfo: {
           Owner: '0x1C893441AB6c1A75E01887087ea508bE8e07AAae',
           BucketName: 'false',
-          Visibility: '1',
+          Visibility: 1,
           Id: '1156769',
-          SourceType: '0',
+          SourceType: 0,
           CreateAt: 1693279149,
           PaymentAddress: '0x1C893441AB6c1A75E01887087ea508bE8e07AAae',
           GlobalVirtualGroupFamilyId: 8,
           ChargedReadQuota: 0,
-          BucketStatus: '0',
+          BucketStatus: 0,
         },
         Removed: false,
         DeleteAt: 0,

diff --git a/packages/chain-sdk/src/types/sp-xml/Common.ts b/packages/chain-sdk/src/types/sp-xml/Common.ts
@@ -1,11 +1,3 @@
-import {
-  BucketStatus,
-  ObjectStatus,
-  RedundancyType,
-  SourceType,
-  VisibilityType,
-} from '@bnb-chain/greenfield-cosmos-types/greenfield/storage/common';
-
 export interface BucketMeta {
   BucketInfo: BucketInfo;
   Removed: boolean;
@@ -19,17 +11,17 @@ export interface BucketMeta {
 }
 
 export interface BucketInfo {
-  Owner: string;
+  // PrimarySpId: number;
   BucketName: string;
-  Visibility: keyof typeof VisibilityType;
-  Id: string;
-  SourceType: keyof typeof SourceType;
+  BucketStatus: number;
+  ChargedReadQuota: number;
   CreateAt: number;
-  PaymentAddress: string;
-  // PrimarySpId: number;
   GlobalVirtualGroupFamilyId: number;
-  ChargedReadQuota: number;
-  BucketStatus: keyof typeof BucketStatus;
+  Id: string;
+  Owner: string;
+  PaymentAddress: string;
+  SourceType: number;
+  Visibility: number;
 }
 
 export interface StreamRecord {
@@ -59,29 +51,46 @@ export interface ObjectMeta {
 }
 
 export interface ObjectInfo {
-  Owner: string;
-  Creator: string;
   BucketName: string;
-  ObjectName: string;
+  Checksums: string[];
+  ContentType: string;
+  CreateAt: number;
+  Creator: string;
   Id: number;
   LocalVirtualGroupId: number;
+  ObjectName: string;
+  ObjectStatus: number;
+  Owner: string;
   PayloadSize: number;
-  Visibility: keyof typeof VisibilityType;
-  ContentType: string;
-  CreateAt: number;
-  ObjectStatus: keyof typeof ObjectStatus;
-  RedundancyType: keyof typeof RedundancyType;
-  SourceType: keyof typeof SourceType;
-  Checksums: string[];
+  RedundancyType: number;
+  SourceType: number;
+  Visibility: number;
+}
+
+export function formatBucketInfo(o: BucketInfo) {
+  return {
+    ...o,
+    // PrimarySpId: Number(item.BucketInfo.PrimarySpId),
+    BucketStatus: Number(o.BucketStatus),
+    ChargedReadQuota: Number(o.ChargedReadQuota),
+    CreateAt: Number(o.CreateAt),
+    GlobalVirtualGroupFamilyId: Number(o.GlobalVirtualGroupFamilyId),
+    SourceType: Number(o.SourceType),
+    Visibility: Number(o.Visibility),
+  };
 }
 
 export function formatObjectInfo(o: ObjectInfo) {
   return {
     ...o,
+    CreateAt: Number(o.CreateAt),
     Id: Number(o.Id),
     LocalVirtualGroupId: Number(o.LocalVirtualGroupId),
+    ObjectStatus: Number(o.ObjectStatus),
     PayloadSize: Number(o.PayloadSize),
-    CreateAt: Number(o.CreateAt),
+    RedundancyType: Number(o.RedundancyType),
+    SourceType: Number(o.SourceType),
+    Visibility: Number(o.Visibility),
   };
 }
 

diff --git a/packages/chain-sdk/src/types/storage.ts b/packages/chain-sdk/src/types/storage.ts
@@ -88,6 +88,7 @@ export interface IQuotaProps {
   readQuota: number;
   freeQuota: number;
   consumedQuota: number;
+  freeConsumedSize: number;
 }
 
 export type TBaseGetCreateObject = {