@dignetwork/dig-sdk 0.0.1-alpha.186 → 0.0.1-alpha.189

package/dist/utils/Udi.d.ts

@@ -1,18 +1,19 @@
 declare class Udi {
     readonly chainName: string;
-    private readonly _storeId;
-    private readonly _rootHash;
+    private readonly _storeIdHex;
+    private readonly _rootHashHex;
     readonly resourceKey: string | null;
     static readonly nid: string;
     static readonly namespace: string;
-    constructor(chainName: string, storeId: string | Buffer, rootHash?: string | Buffer | null, resourceKey?: string | null);
-    static convertToBuffer(input: string | Buffer): Buffer;
+    constructor(chainName: string, storeId: string, rootHash?: string | null, resourceKey?: string | null);
+    static verifyAndFormatHex(input: string): string;
     static fromUrn(urn: string): Udi;
+    static convertToHex(input: string): string;
     static addBase32Padding(input: string): string;
     static toStandardBase64(base64UrlSafe: string): string;
     static addBase64Padding(base64: string): string;
     toUrn(encoding?: "hex" | "base32" | "base64"): string;
-    bufferToString(buffer: Buffer, encoding: "hex" | "base32" | "base64"): string;
+    private formatBufferAsEncoding;
     static toBase64UrlSafe(base64Standard: string): string;
     equals(other: Udi): boolean;
     toString(): string;

package/dist/utils/Udi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Udi.d.ts","sourceRoot":"","sources":["../../src/utils/Udi.ts"],"names":[],"mappings":"AAIA,cAAM,GAAG;IACP,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAC1C,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAS;IACpC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAoB;gBAGnD,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,GAAE,MAAM,GAAG,MAAM,GAAG,IAAW,EACvC,WAAW,GAAE,MAAM,GAAG,IAAW;IAWnC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM;IAuCtD,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG;IA6BhC,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAK9C,MAAM,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAKtD,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAK/C,KAAK,CAAC,QAAQ,GAAE,KAAK,GAAG,QAAQ,GAAG,QAAgB,GAAG,MAAM;IAgB5D,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM;IAW7E,MAAM,CAAC,eAAe,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;IAItD,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;IAW3B,QAAQ,IAAI,MAAM;IAIlB,KAAK,IAAI,GAAG;IAIZ,QAAQ,IAAI,MAAM;IAMlB,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,QAAQ,IAAI,MAAM,GAAG,IAAI,CAE5B;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,cAAc,IAAI,MAAM,GAAG,IAAI,CAElC;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,cAAc,IAAI,MAAM,GAAG,IAAI,CAElC;CACF;AAED,OAAO,EAAE,GAAG,EAAE,CAAC"}
+{"version":3,"file":"Udi.d.ts","sourceRoot":"","sources":["../../src/utils/Udi.ts"],"names":[],"mappings":"AAIA,cAAM,GAAG;IACP,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAS;IACpC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAoB;gBAGnD,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,WAAW,GAAE,MAAM,GAAG,IAAW;IAWnC,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAOhD,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG;IA4BhC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAuB1C,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAK9C,MAAM,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAItD,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAK/C,KAAK,CAAC,QAAQ,GAAE,KAAK,GAAG,QAAQ,GAAG,QAAgB,GAAG,MAAM;IAgB5D,OAAO,CAAC,sBAAsB;IAY9B,MAAM,CAAC,eAAe,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;IAItD,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;IAW3B,QAAQ,IAAI,MAAM;IAIlB,KAAK,IAAI,GAAG;IAIZ,QAAQ,IAAI,MAAM;IAMlB,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,QAAQ,IAAI,MAAM,GAAG,IAAI,CAE5B;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,cAAc,IAAI,MAAM,GAAG,IAAI,CAElC;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,cAAc,IAAI,MAAM,GAAG,IAAI,CAElC;CACF;AAED,OAAO,EAAE,GAAG,EAAE,CAAC"}

package/dist/utils/Udi.js

@@ -33,54 +33,19 @@ class Udi {
             throw new Error("storeId cannot be empty");
         }
         this.chainName = chainName || "chia";
-        this._storeId = Udi.convertToBuffer(storeId);
-        this._rootHash = rootHash ? Udi.convertToBuffer(rootHash) : null;
+        this._storeIdHex = Udi.verifyAndFormatHex(storeId);
+        this._rootHashHex = rootHash ? Udi.verifyAndFormatHex(rootHash) : null;
         this.resourceKey = resourceKey;
     }
-    static convertToBuffer(input) {
-        if (Buffer.isBuffer(input)) {
-            if (input.length !== 32) {
-                throw new Error("Buffer must be exactly 32 bytes.");
-            }
-            return input;
-        }
-        // Attempt hex decoding
-        if (/^[a-fA-F0-9]+$/.test(input) && input.length === 64) {
-            try {
-                const buffer = Buffer.from(input, "hex");
-                if (buffer.length === 32)
-                    return buffer;
-            }
-            catch (e) {
-                console.warn("Hex decoding failed, trying next encoding...");
-            }
-        }
-        // Attempt Base32 decoding
-        try {
-            const paddedInput = Udi.addBase32Padding(input.toUpperCase());
-            const buffer = Buffer.from((0, hi_base32_1.decode)(paddedInput, false));
-            if (buffer.length === 32)
-                return buffer;
+    static verifyAndFormatHex(input) {
+        if (!/^[a-fA-F0-9]{64}$/.test(input)) {
+            throw new Error("Input must be a 64-character hex string.");
         }
-        catch (e) {
-            console.warn("Base32 decoding failed, trying Base64 encoding...");
-        }
-        // Attempt Base64 (URL-safe) decoding
-        try {
-            const standardBase64 = Udi.addBase64Padding(Udi.toStandardBase64(input));
-            const buffer = Buffer.from(standardBase64, "base64");
-            if (buffer.length === 32)
-                return buffer;
-        }
-        catch (e) {
-            throw new Error("Invalid input encoding. Must be 32-byte hex, Base32, or Base64 string.");
-        }
-        throw new Error("Failed to decode input as a 32-byte buffer.");
+        return input;
     }
     static fromUrn(urn) {
-        console.log(`Parsing URN: ${urn}`);
         const parsedUrn = urns.parseURN(urn);
-        if (parsedUrn.nid.toLowerCase() !== Udi.nid) {
+        if (parsedUrn.nid !== Udi.nid) {
             throw new Error(`Invalid nid: ${parsedUrn.nid}`);
         }
         const parts = parsedUrn.nss.split(":");
@@ -88,24 +53,46 @@ class Udi {
             throw new Error(`Invalid UDI format: ${parsedUrn.nss}`);
         }
         const chainName = parts[0];
-        const storeId = Udi.convertToBuffer(parts[1].split("/")[0]);
-        let rootHash = null;
+        const storeIdHex = Udi.convertToHex(parts[1].split("/")[0]);
+        let rootHashHex = null;
         if (parts.length > 2) {
-            rootHash = Udi.convertToBuffer(parts[2].split("/")[0]);
+            rootHashHex = Udi.convertToHex(parts[2].split("/")[0]);
         }
         const pathParts = parsedUrn.nss.split("/");
         let resourceKey = null;
         if (pathParts.length > 1) {
             resourceKey = pathParts.slice(1).join("/");
         }
-        return new Udi(chainName, storeId, rootHash, resourceKey);
+        return new Udi(chainName, storeIdHex, rootHashHex, resourceKey);
+    }
+    static convertToHex(input) {
+        // Attempt hex conversion first
+        if (/^[a-fA-F0-9]{64}$/.test(input))
+            return input;
+        // Convert from Base32
+        try {
+            const paddedInput = Udi.addBase32Padding(input);
+            const buffer = Buffer.from((0, hi_base32_1.decode)(paddedInput, false));
+            return buffer.toString("hex");
+        }
+        catch (e) {
+            console.warn("Base32 decoding failed, trying Base64 encoding...");
+        }
+        // Convert from Base64
+        try {
+            const standardBase64 = Udi.addBase64Padding(Udi.toStandardBase64(input));
+            const buffer = Buffer.from(standardBase64, "base64");
+            return buffer.toString("hex");
+        }
+        catch (e) {
+            throw new Error("Invalid input encoding. Must be 32-byte hex, Base32, or Base64 string.");
+        }
     }
     static addBase32Padding(input) {
         const paddingNeeded = (8 - (input.length % 8)) % 8;
         return input + "=".repeat(paddingNeeded);
     }
     static toStandardBase64(base64UrlSafe) {
-        // Convert URL-safe Base64 to standard Base64
         return base64UrlSafe.replace(/-/g, "+").replace(/_/g, "/");
     }
     static addBase64Padding(base64) {
@@ -113,10 +100,10 @@ class Udi {
         return base64 + "=".repeat(paddingNeeded);
     }
     toUrn(encoding = "hex") {
-        const storeIdStr = this.bufferToString(this._storeId, encoding);
+        const storeIdStr = this.formatBufferAsEncoding(this._storeIdHex, encoding);
         let urn = `${Udi.namespace}:${this.chainName}:${storeIdStr}`;
-        if (this._rootHash) {
-            const rootHashStr = this.bufferToString(this._rootHash, encoding);
+        if (this._rootHashHex) {
+            const rootHashStr = this.formatBufferAsEncoding(this._rootHashHex, encoding);
             urn += `:${rootHashStr}`;
         }
         if (this.resourceKey) {
@@ -124,12 +111,13 @@ class Udi {
         }
         return urn;
     }
-    bufferToString(buffer, encoding) {
+    formatBufferAsEncoding(hexString, encoding) {
+        const buffer = Buffer.from(hexString, "hex");
         if (encoding === "hex") {
-            return buffer.toString("hex");
+            return hexString;
         }
         else if (encoding === "base32") {
-            return (0, hi_base32_1.encode)(buffer).toLowerCase().replace(/=+$/, "");
+            return (0, hi_base32_1.encode)(buffer).replace(/=+$/, "");
         }
         else if (encoding === "base64") {
             return Udi.toBase64UrlSafe(buffer.toString("base64"));
@@ -140,18 +128,18 @@ class Udi {
         return base64Standard.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
     }
     equals(other) {
-        return (this._storeId.equals(other._storeId) &&
+        return (this._storeIdHex === other._storeIdHex &&
             this.chainName === other.chainName &&
-            (this._rootHash && other._rootHash
-                ? this._rootHash.equals(other._rootHash)
-                : this._rootHash === other._rootHash) &&
+            (this._rootHashHex && other._rootHashHex
+                ? this._rootHashHex === other._rootHashHex
+                : this._rootHashHex === other._rootHashHex) &&
             this.resourceKey === other.resourceKey);
     }
     toString() {
         return this.toUrn();
     }
     clone() {
-        return new Udi(this.chainName, this._storeId, this._rootHash, this.resourceKey);
+        return new Udi(this.chainName, this._storeIdHex, this._rootHashHex, this.resourceKey);
     }
     hashCode() {
         const hash = (0, crypto_1.createHash)("sha256");
@@ -159,22 +147,22 @@ class Udi {
         return hash.digest("hex");
     }
     get storeId() {
-        return this._storeId.toString("hex");
+        return this._storeIdHex;
     }
     get rootHash() {
-        return this._rootHash ? this._rootHash.toString("hex") : null;
+        return this._rootHashHex;
     }
     get storeIdBase32() {
-        return this.bufferToString(this._storeId, "base32");
+        return this.formatBufferAsEncoding(this._storeIdHex, "base32");
     }
     get rootHashBase32() {
-        return this._rootHash ? this.bufferToString(this._rootHash, "base32") : null;
+        return this._rootHashHex ? this.formatBufferAsEncoding(this._rootHashHex, "base32") : null;
     }
     get storeIdBase64() {
-        return this.bufferToString(this._storeId, "base64");
+        return this.formatBufferAsEncoding(this._storeIdHex, "base64");
     }
     get rootHashBase64() {
-        return this._rootHash ? this.bufferToString(this._rootHash, "base64") : null;
+        return this._rootHashHex ? this.formatBufferAsEncoding(this._rootHashHex, "base64") : null;
     }
 }
 exports.Udi = Udi;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dignetwork/dig-sdk",
-  "version": "0.0.1-alpha.186",
+  "version": "0.0.1-alpha.189",
   "description": "",
   "type": "commonjs",
   "main": "./dist/index.js",