@dignetwork/dig-sdk 0.0.1-alpha.181 → 0.0.1-alpha.183

package/dist/utils/Udi.d.ts

@@ -7,14 +7,12 @@ declare class Udi {
     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;
     static addBase32Padding(input: string): string;
-    withRootHash(rootHash: string | Buffer | null): Udi;
-    withResourceKey(resourceKey: string | null): Udi;
-    static fromUrn(urn: string): Udi;
-    toUrn(encoding?: "hex" | "base32"): string;
-    bufferToString(buffer: Buffer, encoding: "hex" | "base32"): 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;
+    static toBase64UrlSafe(base64Standard: string): string;
     equals(other: Udi): boolean;
     toString(): string;
     clone(): Udi;
@@ -23,6 +21,8 @@ declare class Udi {
     get rootHash(): string | null;
     get storeIdBase32(): string;
     get rootHashBase32(): string | null;
+    get storeIdBase64(): string;
+    get rootHashBase64(): 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":"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;IAmBtD,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIpC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIvC,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAM9C,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,QAAgB,GAAG,MAAM;IAgBjD,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM;IAMlE,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"}
+{"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,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,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"}

package/dist/utils/Udi.js

@@ -1,30 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Udi = void 0;
-const urns = __importStar(require("urns"));
 const crypto_1 = require("crypto");
 const hi_base32_1 = require("hi-base32");
 class Udi {
@@ -39,55 +15,54 @@ class Udi {
     }
     static convertToBuffer(input) {
         if (Buffer.isBuffer(input)) {
+            if (input.length !== 32) {
+                throw new Error("Buffer must be exactly 32 bytes.");
+            }
             return input;
         }
-        if (Udi.isHex(input)) {
-            return Buffer.from(input, "hex");
+        // 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...");
+            }
         }
-        if (Udi.isBase32(input)) {
+        // Attempt Base32 decoding
+        try {
             const paddedInput = Udi.addBase32Padding(input.toUpperCase());
-            return Buffer.from((0, hi_base32_1.decode)(paddedInput, false)); // Decode as UTF-8
+            const buffer = Buffer.from((0, hi_base32_1.decode)(paddedInput, false));
+            if (buffer.length === 32)
+                return buffer;
         }
-        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.toLowerCase());
+        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.");
     }
     static addBase32Padding(input) {
-        // Calculate required padding
         const paddingNeeded = (8 - (input.length % 8)) % 8;
         return input + "=".repeat(paddingNeeded);
     }
-    withRootHash(rootHash) {
-        return new Udi(this.chainName, this._storeId, rootHash, this.resourceKey);
-    }
-    withResourceKey(resourceKey) {
-        return new Udi(this.chainName, this._storeId, this._rootHash, resourceKey);
+    static toStandardBase64(base64UrlSafe) {
+        return base64UrlSafe.replace(/-/g, "+").replace(/_/g, "/");
     }
-    static fromUrn(urn) {
-        const parsedUrn = urns.parseURN(urn);
-        if (parsedUrn.nid.toLowerCase() !== Udi.nid) {
-            throw new Error(`Invalid nid: ${parsedUrn.nid}`);
-        }
-        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;
-        if (parts.length > 2) {
-            rootHash = 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);
+    static addBase64Padding(base64) {
+        const paddingNeeded = (4 - (base64.length % 4)) % 4;
+        return base64 + "=".repeat(paddingNeeded);
     }
     toUrn(encoding = "hex") {
         const storeIdStr = this.bufferToString(this._storeId, encoding);
@@ -102,9 +77,19 @@ class Udi {
         return urn;
     }
     bufferToString(buffer, encoding) {
-        return encoding === "hex"
-            ? buffer.toString("hex")
-            : (0, hi_base32_1.encode)(buffer).toLowerCase().replace(/=+$/, "");
+        if (encoding === "hex") {
+            return buffer.toString("hex");
+        }
+        else if (encoding === "base32") {
+            return (0, hi_base32_1.encode)(buffer).toLowerCase().replace(/=+$/, "");
+        }
+        else if (encoding === "base64") {
+            return Udi.toBase64UrlSafe(buffer.toString("base64"));
+        }
+        throw new Error("Unsupported encoding type");
+    }
+    static toBase64UrlSafe(base64Standard) {
+        return base64Standard.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
     }
     equals(other) {
         return (this._storeId.equals(other._storeId) &&
@@ -135,9 +120,13 @@ class Udi {
         return this.bufferToString(this._storeId, "base32");
     }
     get rootHashBase32() {
-        return this._rootHash
-            ? this.bufferToString(this._rootHash, "base32")
-            : null;
+        return this._rootHash ? this.bufferToString(this._rootHash, "base32") : null;
+    }
+    get storeIdBase64() {
+        return this.bufferToString(this._storeId, "base64");
+    }
+    get rootHashBase64() {
+        return this._rootHash ? this.bufferToString(this._rootHash, "base64") : null;
     }
 }
 exports.Udi = Udi;

package/package.json

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