@dignetwork/dig-sdk 0.0.1-alpha.190 → 0.0.1-alpha.192

package/dist/utils/Udi.d.ts

@@ -1,25 +1,25 @@
 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;
-    static isHex(input: string): boolean;
-    static isBase32(input: string): boolean;
-    withRootHash(rootHash: string | Buffer | null): Udi;
-    withResourceKey(resourceKey: string | null): Udi;
+    constructor(chainName: string, storeId: string, rootHash?: string | null, resourceKey?: string | null);
+    static verifyAndFormatHex(input: string): string;
     static fromUrn(urn: string): Udi;
-    toUrn(encoding?: 'hex' | 'base32' | 'base64'): string;
-    bufferToString(buffer: Buffer, encoding: 'hex' | 'base32' | 'base64'): string;
+    static convertToHex(input: string): string;
+    static addBase32Padding(input: string): string;
+    toUrn(encoding?: "hex" | "base32"): string;
+    private formatBufferAsEncoding;
     equals(other: Udi): boolean;
     toString(): string;
     clone(): Udi;
     hashCode(): string;
     get storeId(): string;
     get rootHash(): string | null;
+    get storeIdBase32(): string;
+    get rootHashBase32(): string | null;
 }
 export { Udi };
 //# sourceMappingURL=Udi.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Udi.d.ts","sourceRoot":"","sources":["../../src/utils/Udi.ts"],"names":[],"mappings":"AAUA,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;IAgBtD,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIpC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIvC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,GAAG;IAInD,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,GAAG;IAIhD,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG;IA4BhC,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;IAa7E,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;IAS3B,QAAQ,IAAI,MAAM;IAIlB,KAAK,IAAI,GAAG;IAIZ,QAAQ,IAAI,MAAM;IAOlB,IAAI,OAAO,IAAI,MAAM,CAEpB;IAGD,IAAI,QAAQ,IAAI,MAAM,GAAG,IAAI,CAE5B;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;IAkB1C,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAK9C,KAAK,CAAC,QAAQ,GAAE,KAAK,GAAG,QAAgB,GAAG,MAAM;IAmBjD,OAAO,CAAC,sBAAsB;IAa9B,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;IAW3B,QAAQ,IAAI,MAAM;IAIlB,KAAK,IAAI,GAAG;IASZ,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,CAIlC;CACF;AAED,OAAO,EAAE,GAAG,EAAE,CAAC"}

package/dist/utils/Udi.js

@@ -27,73 +27,71 @@ exports.Udi = void 0;
 const urns = __importStar(require("urns"));
 const crypto_1 = require("crypto");
 const hi_base32_1 = require("hi-base32");
-//
-// This class encapsulates the concept of a Universal Data Identifier (UDI), which is a
-// standardized way to identify resources across the distributed DIG mesh network.
-// The UDI format: urn:dig:chainName:storeId:rootHash/resourceKey
-// This allows unique resource identification across the DIG network.
-//
 class Udi {
     constructor(chainName, storeId, rootHash = null, resourceKey = null) {
         if (!storeId) {
             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)) {
-            return input;
-        }
-        if (Udi.isHex(input)) {
-            return Buffer.from(input, 'hex');
+    static verifyAndFormatHex(input) {
+        if (!/^[a-fA-F0-9]{64}$/.test(input)) {
+            throw new Error("Input must be a 64-character hex string.");
         }
-        if (Udi.isBase32(input)) {
-            return Buffer.from((0, hi_base32_1.decode)(input.toUpperCase(), false)); // Decode with uppercase
-        }
-        throw new Error("Invalid input encoding. Must be 32-byte hex or Base32 string.");
-    }
-    static isHex(input) {
-        return /^[a-fA-F0-9]{64}$/.test(input);
-    }
-    static isBase32(input) {
-        return /^[A-Z2-7]{52}$/.test(input.toUpperCase());
-    }
-    withRootHash(rootHash) {
-        return new Udi(this.chainName, this._storeId, rootHash, this.resourceKey);
-    }
-    withResourceKey(resourceKey) {
-        return new Udi(this.chainName, this._storeId, this._rootHash, resourceKey);
+        return input;
     }
     static fromUrn(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(':');
+        const parts = parsedUrn.nss.split(":");
         if (parts.length < 2) {
             throw new Error(`Invalid UDI format: ${parsedUrn.nss}`);
         }
         const chainName = parts[0];
-        const storeId = parts[1].split('/')[0];
-        let rootHash = null;
+        const storeIdHex = Udi.convertToHex(parts[1].split("/")[0]);
+        let rootHashHex = null;
         if (parts.length > 2) {
-            rootHash = parts[2].split('/')[0];
+            rootHashHex = Udi.convertToHex(parts[2].split("/")[0]);
         }
-        const pathParts = parsedUrn.nss.split('/');
+        const pathParts = parsedUrn.nss.split("/");
         let resourceKey = null;
         if (pathParts.length > 1) {
-            resourceKey = pathParts.slice(1).join('/');
+            resourceKey = pathParts.slice(1).join("/");
+        }
+        return new Udi(chainName, storeIdHex, rootHashHex, resourceKey);
+    }
+    static convertToHex(input) {
+        // Convert from Base32
+        try {
+            const paddedInput = Udi.addBase32Padding(input.toUpperCase());
+            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...");
+        }
+        // Attempt hex conversion first
+        if (/^[a-fA-F0-9]{64}$/.test(input)) {
+            return input;
+        }
+        else {
+            throw new Error("Input must be a 64-character hex string.");
         }
-        return new Udi(chainName, storeId, rootHash, resourceKey);
     }
-    toUrn(encoding = 'hex') {
-        const storeIdStr = this.bufferToString(this._storeId, encoding);
+    static addBase32Padding(input) {
+        const paddingNeeded = (8 - (input.length % 8)) % 8;
+        return input + "=".repeat(paddingNeeded);
+    }
+    toUrn(encoding = "hex") {
+        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) {
@@ -101,42 +99,48 @@ class Udi {
         }
         return urn;
     }
-    bufferToString(buffer, encoding) {
-        switch (encoding) {
-            case 'hex':
-                return buffer.toString('hex');
-            case 'base32':
-                return (0, hi_base32_1.encode)(buffer).toUpperCase().replace(/=+$/, ''); // Convert to uppercase and remove padding
-            case 'base64':
-                return buffer.toString('base64').toLowerCase(); // Convert to lowercase
-            default:
-                throw new Error("Unsupported encoding");
+    formatBufferAsEncoding(hexString, encoding) {
+        const buffer = Buffer.from(hexString, "hex");
+        if (encoding === "hex") {
+            return hexString;
+        }
+        else if (encoding === "base32") {
+            return (0, hi_base32_1.encode)(buffer).replace(/=+$/, ""); // Strip padding for Base32
         }
+        throw new Error("Unsupported encoding type");
     }
     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');
+        const hash = (0, crypto_1.createHash)("sha256");
         hash.update(this.toUrn());
-        return hash.digest('hex');
+        return hash.digest("hex");
     }
-    // Getter for storeId as a hex string
     get storeId() {
-        return this._storeId.toString('hex');
+        return this._storeIdHex;
     }
-    // Getter for rootHash as a hex string
     get rootHash() {
-        return this._rootHash ? this._rootHash.toString('hex') : null;
+        return this._rootHashHex;
+    }
+    get storeIdBase32() {
+        return this.formatBufferAsEncoding(this._storeIdHex, "base32");
+    }
+    get rootHashBase32() {
+        return this._rootHashHex
+            ? this.formatBufferAsEncoding(this._rootHashHex, "base32")
+            : null;
     }
 }
 exports.Udi = Udi;

package/package.json

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