@net-protocol/storage 0.1.0 → 0.1.1

package/dist/index.mjs

@@ -740,10 +740,10 @@ function useStorage({
   const outputAsString = outputFormat === "string";
   const storageKeyBytes = key ? getStorageKeyBytes(key, keyFormat) : void 0;
   const formatData = (text, dataHex) => {
-    if (outputAsString) {
-      return [text, hexToString(dataHex)];
-    }
-    return [text, dataHex];
+    return {
+      text,
+      value: outputAsString ? hexToString(dataHex) : dataHex
+    };
   };
   const [routerData, setRouterData] = useState();
   const [routerChunkLoading, setRouterChunkLoading] = useState(false);
@@ -765,6 +765,10 @@ function useStorage({
       }
       const [isChunkedStorage, text, data] = routerHook.data;
       if (!isChunkedStorage) {
+        if (!data || typeof data !== "string") {
+          setRouterData(void 0);
+          return;
+        }
         const formatted = formatData(text, data);
         setRouterData(formatted);
         return;
@@ -797,10 +801,10 @@ function useStorage({
           setRouterData(void 0);
         } else {
           if (outputAsString) {
-            setRouterData([text, assembledString]);
+            setRouterData({ text, value: assembledString });
           } else {
             const hexData = stringToHex(assembledString);
-            setRouterData([text, hexData]);
+            setRouterData({ text, value: hexData });
           }
         }
       } catch (error) {
@@ -887,6 +891,11 @@ function useStorage({
           args: [storageKeyBytes2, operatorAddress, index]
         });
         const [text, data] = result;
+        if (!data || typeof data !== "string") {
+          setHistoricalData(void 0);
+          setHistoricalLoading(false);
+          return;
+        }
         setHistoricalData(formatData(text, data));
       } catch (error) {
         console.error(
@@ -899,7 +908,15 @@ function useStorage({
       }
     }
     fetchHistoricalVersion();
-  }, [chainId, key, operatorAddress, index, enabled, isLatestVersion, outputAsString]);
+  }, [
+    chainId,
+    key,
+    operatorAddress,
+    index,
+    enabled,
+    isLatestVersion,
+    outputAsString
+  ]);
   if (!isLatestVersion) {
     return {
       data: historicalData,
@@ -914,7 +931,14 @@ function useStorage({
       error: routerHook.error || routerChunkError
     };
   }
-  const formattedDirectData = latestData ? formatData(latestData[0], latestData[1]) : void 0;
+  const formattedDirectData = latestData ? (() => {
+    const result = latestData;
+    const [text, valueHex] = result;
+    if (!valueHex || typeof valueHex !== "string") {
+      return void 0;
+    }
+    return formatData(text, valueHex);
+  })() : void 0;
   return {
     data: formattedDirectData,
     isLoading: latestLoading,
@@ -956,9 +980,11 @@ function useStorageForOperatorAndKey({
   chainId,
   key,
   operatorAddress,
-  keyFormat
+  keyFormat,
+  outputFormat = "hex"
 }) {
   const storageKeyBytes = key ? getStorageKeyBytes(key, keyFormat) : void 0;
+  const outputAsString = outputFormat === "string";
   const readContractArgs = {
     abi: STORAGE_CONTRACT.abi,
     address: STORAGE_CONTRACT.address,
@@ -971,7 +997,13 @@ function useStorageForOperatorAndKey({
   };
   const { data, isLoading, error } = useReadContract(readContractArgs);
   return {
-    data,
+    data: data ? (() => {
+      const [text, valueHex] = data;
+      return {
+        text,
+        value: outputAsString ? hexToString(valueHex) : valueHex
+      };
+    })() : void 0,
     isLoading,
     error
   };
@@ -1181,11 +1213,9 @@ function useXmlStorage({
   index,
   keyFormat,
   useRouter,
-  returnFormat = "object",
   outputFormat = "hex"
 }) {
   const isPreviewMode = !!content;
-  const returnAsTuple = returnFormat === "tuple";
   const outputAsString = outputFormat === "string";
   const {
     data: metadata,
@@ -1208,8 +1238,8 @@ function useXmlStorage({
   const metadataString = useMemo(() => {
     if (skipXmlParsing) return "";
     if (isPreviewMode) return content || "";
-    if (!metadata?.[1]) return "";
-    return metadata[1];
+    if (!metadata?.value) return "";
+    return metadata.value;
   }, [skipXmlParsing, isPreviewMode, content, metadata]);
   useMemo(() => {
     if (!metadataString) return [];
@@ -1260,78 +1290,22 @@ function useXmlStorage({
     if (skipXmlParsing || !metadataString) return false;
     return containsXmlReferences(metadataString);
   }, [metadataString, skipXmlParsing]);
-  if (returnAsTuple) {
-    if (skipXmlParsing) {
-      if (isPreviewMode) {
-        const contentValue = content || "";
-        return {
-          data: contentValue ? outputAsString ? [metadata?.[0] || "", contentValue] : [
-            metadata?.[0] || "",
-            stringToHex(contentValue)
-          ] : void 0,
-          isLoading: metadataLoading,
-          error: metadataError
-        };
-      } else {
-        const dataValue = metadata?.[1];
-        return {
-          data: dataValue ? outputAsString ? [metadata?.[0] || "", dataValue] : [
-            metadata?.[0] || "",
-            stringToHex(dataValue)
-          ] : void 0,
-          isLoading: metadataLoading,
-          error: metadataError
-        };
-      }
-    }
-    if (isXml) {
-      if (!assembledData) {
-        return {
-          data: void 0,
-          isLoading: metadataLoading || chunksLoading,
-          error: metadataError || chunksError
-        };
-      }
-      const hexData = stringToHex(assembledData);
-      return {
-        data: outputAsString ? [metadata?.[0] || "", assembledData] : [metadata?.[0] || "", hexData],
-        isLoading: metadataLoading || chunksLoading,
-        error: metadataError || chunksError
-      };
-    } else {
-      if (!metadata) {
-        return {
-          data: void 0,
-          isLoading: metadataLoading,
-          error: metadataError
-        };
-      }
-      const dataValue = metadata[1];
-      const returnValue = dataValue ? outputAsString ? [metadata[0], dataValue] : [
-        metadata[0],
-        stringToHex(dataValue)
-      ] : void 0;
-      return {
-        data: returnValue,
-        isLoading: metadataLoading,
-        error: metadataError
-      };
-    }
-  }
+  const formatValue = (value) => {
+    if (!value) return "";
+    return outputAsString ? value : stringToHex(value);
+  };
   if (skipXmlParsing) {
     return {
-      data: isPreviewMode ? content || "" : metadata?.[1] || "",
-      // metadata[1] is already a plain string
-      filename: metadata?.[0] || "",
+      text: metadata?.text || "",
+      value: isPreviewMode ? content || "" : formatValue(metadata?.value),
       isLoading: metadataLoading,
       error: metadataError,
       isXml: false
     };
   }
   return {
-    data: isXml ? assembledData : isPreviewMode ? content || "" : metadata?.[1] || "",
-    // metadata[1] is already a plain string
-    filename: metadata?.[0] || "",
+    text: metadata?.text || "",
+    value: isXml ? formatValue(assembledData) : isPreviewMode ? content || "" : formatValue(metadata?.value),
     isLoading: metadataLoading || isXml && chunksLoading,
     error: metadataError || chunksError,
     isXml
@@ -1368,16 +1342,13 @@ function useStorageFromRouter({
       }
       const [isChunkedStorage, text, data] = routerResult;
       if (!isChunkedStorage) {
-        setAssembledData([text, data]);
+        setAssembledData({ text, value: data });
         return;
       }
       setIsChunkLoading(true);
       setChunkError(void 0);
       try {
-        const [chunkCount] = decodeAbiParameters(
-          [{ type: "uint8" }],
-          data
-        );
+        const [chunkCount] = decodeAbiParameters([{ type: "uint8" }], data);
         if (chunkCount === 0) {
           setAssembledData(void 0);
           return;
@@ -1393,7 +1364,7 @@ function useStorageFromRouter({
           setAssembledData(void 0);
         } else {
           const hexData = stringToHex(assembledString);
-          setAssembledData([text, hexData]);
+          setAssembledData({ text, value: hexData });
         }
       } catch (error) {
         setChunkError(error);
@@ -1617,7 +1588,8 @@ var StorageClient = class {
     });
     try {
       const result = await readContract(this.client, config);
-      return result;
+      const [text, value] = result;
+      return { text, value };
     } catch {
       return null;
     }
@@ -1635,7 +1607,8 @@ var StorageClient = class {
     });
     try {
       const result = await readContract(this.client, config);
-      return result;
+      const [text, value] = result;
+      return { text, value };
     } catch {
       return null;
     }
@@ -1822,7 +1795,8 @@ var StorageClient = class {
         functionName: "getForOperatorAndKey",
         args: [params.operator, storageKeyBytes]
       });
-      return result;
+      const [text, value] = result;
+      return { text, value };
     } catch {
       return null;
     }
@@ -1862,8 +1836,9 @@ var StorageClient = class {
         if (!result) {
           throw new Error("StoredDataNotFound");
         }
-        [text, data] = result;
-        data = hexToString(data);
+        const resultObj = result;
+        text = resultObj.text;
+        data = hexToString(resultObj.value);
       }
     } else {
       const result = await this.getViaRouter({
@@ -1933,7 +1908,9 @@ var StorageClient = class {
       throw new Error("Chunks array cannot be empty");
     }
     if (params.chunks && params.chunks.length > 255) {
-      throw new Error(`Too many chunks: ${params.chunks.length} exceeds maximum of 255`);
+      throw new Error(
+        `Too many chunks: ${params.chunks.length} exceeds maximum of 255`
+      );
     }
   }
   /**
@@ -1945,7 +1922,9 @@ var StorageClient = class {
     const transactionConfigs = [];
     for (const xmlChunk of params.xmlChunks) {
       const chunks = chunkDataForStorage(xmlChunk);
-      const chunkedHash = keccak256HashString(xmlChunk + params.operatorAddress);
+      const chunkedHash = keccak256HashString(
+        xmlChunk + params.operatorAddress
+      );
       chunkedStorageHashes.push(chunkedHash);
       const config = this.prepareChunkedPut({
         key: chunkedHash,
@@ -1970,7 +1949,10 @@ var StorageClient = class {
    */
   preparePut(params) {
     this.validateStorageParams({ key: params.key });
-    const keyBytes32 = getStorageKeyBytes(params.key, params.keyFormat);
+    const keyBytes32 = getStorageKeyBytes(
+      params.key,
+      params.keyFormat
+    );
     const valueHex = normalizeDataOrEmpty(params.value);
     return {
       to: STORAGE_CONTRACT.address,
@@ -1984,7 +1966,10 @@ var StorageClient = class {
    */
   prepareChunkedPut(params) {
     this.validateStorageParams({ key: params.key, chunks: params.chunks });
-    const keyBytes32 = getStorageKeyBytes(params.key, params.keyFormat);
+    const keyBytes32 = getStorageKeyBytes(
+      params.key,
+      params.keyFormat
+    );
     for (const chunk of params.chunks) {
       if (!chunk.startsWith("0x")) {
         throw new Error(`Invalid chunk format: ${chunk} must be a hex string`);
@@ -2006,7 +1991,10 @@ var StorageClient = class {
     }
     const bulkEntries = params.entries.map((entry) => {
       this.validateStorageParams({ key: entry.key });
-      const keyBytes32 = getStorageKeyBytes(entry.key, params.keyFormat);
+      const keyBytes32 = getStorageKeyBytes(
+        entry.key,
+        params.keyFormat
+      );
       const valueHex = normalizeDataOrEmpty(entry.value);
       return {
         key: keyBytes32,
@@ -2046,7 +2034,10 @@ var StorageClient = class {
         keyFormat: params.keyFormat
       });
       return {
-        transactionConfigs: [metadataConfig, ...chunkedResult.transactionConfigs],
+        transactionConfigs: [
+          metadataConfig,
+          ...chunkedResult.transactionConfigs
+        ],
         topLevelHash: result.topLevelHash,
         metadata: chunkedResult.xmlMetadata
       };