@dignetwork/dig-sdk 0.0.1-alpha.97 → 0.0.1-alpha.99

package/dist/DigNetwork/ContentServer.d.ts

@@ -1,11 +1,10 @@
-import http from "http";
-import { Readable } from "stream";
 export declare class ContentServer {
     private ipAddress;
     private storeId;
     private static certPath;
     private static keyPath;
     private static readonly port;
+    private static readonly inactivityTimeout;
     constructor(ipAddress: string, storeId: string);
     getKey(key: string, rootHash: string, challengeHex?: string): Promise<string>;
     getPaymentAddress(): Promise<string | null>;
@@ -15,19 +14,18 @@ export declare class ContentServer {
     getKeysIndex(rootHash?: string): Promise<any>;
     headKey(key: string, rootHash?: string): Promise<{
         success: boolean;
-        headers?: http.IncomingHttpHeaders;
+        headers?: any;
     }>;
     headStore(options?: {
         hasRootHash: string;
     }): Promise<{
         success: boolean;
-        headers?: http.IncomingHttpHeaders;
+        headers?: any;
     }>;
     hasRootHash(rootHash: string): Promise<boolean>;
-    streamKey(key: string, rootHash?: string): Promise<Readable>;
     private head;
     private fetchJson;
-    private fetchWithRetries;
     private fetch;
+    private getAxiosConfig;
 }
 //# sourceMappingURL=ContentServer.d.ts.map

package/dist/DigNetwork/ContentServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContentServer.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/ContentServer.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC,qBAAa,aAAa;IACxB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAS;IAChC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAS;IAC/B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAQ;gBAExB,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAYjC,MAAM,CACjB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC;IAaL,iBAAiB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAe3C,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC;IAM5B,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAM9B,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAM9B,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAY7C,OAAO,CAClB,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAA;KAAE,CAAC;IAYvD,SAAS,CAAC,OAAO,CAAC,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QACjE,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC;KACpC,CAAC;IAUW,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUrD,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;YAgDrD,IAAI;YA0EJ,SAAS;YAMT,gBAAgB;YAiChB,KAAK;CA6GpB"}
+{"version":3,"file":"ContentServer.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/ContentServer.ts"],"names":[],"mappings":"AAMA,qBAAa,aAAa;IACxB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAS;IAChC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAS;IAC/B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAQ;IACpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAQ;gBAErC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAYjC,MAAM,CACjB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC;IAWL,iBAAiB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAc3C,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC;IAM5B,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAM9B,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAM9B,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAU7C,OAAO,CAClB,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,GAAG,CAAA;KAAE,CAAC;IAUlC,SAAS,CAAC,OAAO,CAAC,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QACjE,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;IAQW,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAW9C,IAAI;YAcJ,SAAS;YAMT,KAAK;IA+DnB,OAAO,CAAC,cAAc;CAUvB"}

package/dist/DigNetwork/ContentServer.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContentServer = void 0;
+const axios_1 = __importDefault(require("axios"));
 const fs_1 = __importDefault(require("fs"));
-const http_1 = __importDefault(require("http"));
-const url_1 = require("url");
+const https_1 = __importDefault(require("https"));
 const ssl_1 = require("../utils/ssl");
 class ContentServer {
     constructor(ipAddress, storeId) {
@@ -20,13 +20,11 @@ class ContentServer {
     }
     // Method to get the content of a specified key from the peer, with optional challenge query
     async getKey(key, rootHash, challengeHex) {
-        // Construct the base URL
         let url = `https://${this.ipAddress}:${ContentServer.port}/chia.${this.storeId}.${rootHash}/${key}`;
-        // If a challenge is provided, append it as a query parameter
         if (challengeHex) {
             url += `?challenge=${challengeHex}`;
         }
-        return this.fetchWithRetries(url);
+        return this.fetch(url);
     }
     // Method to get the payment address from the peer
     async getPaymentAddress() {
@@ -90,219 +88,89 @@ class ContentServer {
         }
         return false;
     }
-    streamKey(key, rootHash) {
-        let udi = `chia.${this.storeId}`;
-        if (rootHash) {
-            udi += `.${rootHash}`;
-        }
-        return new Promise((resolve, reject) => {
-            const url = `https://${this.ipAddress}:${ContentServer.port}/${udi}/${key}`;
-            const urlObj = new url_1.URL(url);
-            const requestOptions = {
-                hostname: urlObj.hostname,
-                port: urlObj.port || ContentServer.port,
-                path: urlObj.pathname + urlObj.search,
-                method: "GET",
+    // Helper method to perform HEAD requests using axios
+    async head(url) {
+        try {
+            const config = this.getAxiosConfig();
+            const response = await axios_1.default.head(url, config);
+            return {
+                success: response.status >= 200 && response.status < 300,
+                headers: response.headers,
             };
-            const request = http_1.default.request(requestOptions, (response) => {
-                if (response.statusCode === 200) {
-                    resolve(response); // Resolve with the readable stream
-                }
-                else if (response.statusCode === 301 || response.statusCode === 302) {
-                    // Handle redirects
-                    const redirectUrl = response.headers.location;
-                    if (redirectUrl) {
-                        this.streamKey(redirectUrl).then(resolve).catch(reject);
-                    }
-                    else {
-                        reject(new Error("Redirected without a location header"));
-                    }
-                }
-                else {
-                    reject(new Error(`Failed to retrieve data from ${url}. Status code: ${response.statusCode}`));
-                }
-            });
-            request.on("error", (error) => {
-                console.error(`GET Request error for ${url}:`, error);
-                reject(error);
-            });
-            request.end();
-        });
-    }
-    // Helper method to perform HEAD requests
-    async head(url, maxRedirects = 5) {
-        return new Promise((resolve, reject) => {
-            try {
-                // Parse the input URL
-                const urlObj = new url_1.URL(url);
-                const requestOptions = {
-                    hostname: urlObj.hostname,
-                    port: urlObj.port ||
-                        (urlObj.protocol === "http:" ? 80 : ContentServer.port),
-                    path: urlObj.pathname + urlObj.search,
-                    method: "HEAD",
-                    key: fs_1.default.readFileSync(ContentServer.keyPath),
-                    cert: fs_1.default.readFileSync(ContentServer.certPath),
-                    rejectUnauthorized: false,
-                };
-                const request = http_1.default.request(requestOptions, (response) => {
-                    const { statusCode, headers } = response;
-                    // If status code is 2xx, return success
-                    if (statusCode && statusCode >= 200 && statusCode < 300) {
-                        resolve({ success: true, headers });
-                    }
-                    // Handle 3xx redirection
-                    else if (statusCode &&
-                        statusCode >= 300 &&
-                        statusCode < 400 &&
-                        headers.location) {
-                        if (maxRedirects > 0) {
-                            let redirectUrl = headers.location;
-                            // Check if the redirect URL is relative
-                            if (!/^https?:\/\//i.test(redirectUrl)) {
-                                // Resolve the relative URL based on the original URL
-                                redirectUrl = new url_1.URL(redirectUrl, url).toString();
-                                console.log(`Resolved relative redirect to: ${redirectUrl}`);
-                            }
-                            else {
-                                console.log(`Redirecting to: ${redirectUrl}`);
-                            }
-                            // Recursively follow the redirection
-                            this.head(redirectUrl, maxRedirects - 1)
-                                .then(resolve)
-                                .catch(reject);
-                        }
-                        else {
-                            reject({ success: false, message: "Too many redirects" });
-                        }
-                    }
-                    else {
-                        // For other status codes, consider it a failure
-                        resolve({ success: false });
-                    }
-                });
-                request.on("error", (error) => {
-                    console.error(`HEAD ${url}:`, error.message);
-                    reject({ success: false });
-                });
-                request.end();
-            }
-            catch (err) {
-                console.error(`Invalid URL: ${url}`, err);
-                reject({ success: false, message: "Invalid URL" });
-            }
-        });
+        }
+        catch (error) {
+            return { success: false };
+        }
     }
     // Helper method to fetch JSON data from a URL
     async fetchJson(url) {
-        const response = await this.fetchWithRetries(url);
+        const response = await this.fetch(url);
         return JSON.parse(response);
     }
-    // Helper method to fetch content with retries and redirection handling
-    async fetchWithRetries(url) {
-        let attempt = 0;
-        const maxRetries = 1;
-        const initialDelay = 2000; // 2 seconds
-        const maxDelay = 10000; // 10 seconds
-        const delayMultiplier = 1.5;
-        let delay = initialDelay;
-        while (attempt < maxRetries) {
-            try {
-                return await this.fetch(url);
-            }
-            catch (error) {
-                if (attempt < maxRetries - 1) {
-                    console.warn(`Attempt ${attempt + 1} failed: ${error.message}. Retrying in ${delay / 1000} seconds...`);
-                    await new Promise((resolve) => setTimeout(resolve, delay));
-                    delay = Math.min(maxDelay, delay * delayMultiplier);
-                }
-                else {
-                    console.error(`Failed to retrieve data from ${url}. Aborting.`);
-                    throw new Error(`Failed to retrieve data: ${error.message}`);
-                }
-            }
-            attempt++;
-        }
-        throw new Error(`Failed to retrieve data from ${url} after ${maxRetries} attempts.`);
-    }
-    // Core method to fetch content from a URL with a 5-second inactivity timeout
-    async fetch(url, maxRedirects = 5) {
+    // Core method to fetch content from a URL with a 5-second inactivity timeout, handling redirects
+    async fetch(url) {
+        const config = this.getAxiosConfig();
+        // Create a cancel token for the inactivity timeout
+        const source = axios_1.default.CancelToken.source();
         return new Promise((resolve, reject) => {
-            const urlObj = new url_1.URL(url);
-            const timeoutDuration = 5000; // 5 seconds
-            let timeout = null; // Initialize timeout
-            const requestOptions = {
-                hostname: urlObj.hostname,
-                port: urlObj.port || ContentServer.port,
-                path: urlObj.pathname + urlObj.search, // Include query params
-                method: "GET",
-                key: fs_1.default.readFileSync(ContentServer.keyPath),
-                cert: fs_1.default.readFileSync(ContentServer.certPath),
-                rejectUnauthorized: false,
+            let timeout = null;
+            const resetTimeout = () => {
+                if (timeout) {
+                    clearTimeout(timeout);
+                }
+                timeout = setTimeout(() => {
+                    source.cancel(`Request timed out after ${ContentServer.inactivityTimeout / 1000} seconds of inactivity`);
+                }, ContentServer.inactivityTimeout);
             };
-            const request = http_1.default.request(requestOptions, (response) => {
+            axios_1.default
+                .get(url, {
+                ...config,
+                cancelToken: source.token,
+                responseType: "stream", // Use stream to track data transfer
+                maxRedirects: 5, // Axios follows up to 5 redirects by default
+            })
+                .then((response) => {
                 let data = "";
-                // Set timeout for inactivity
-                timeout = setTimeout(() => {
-                    console.error(`Request timeout: No data received for ${timeoutDuration / 1000} seconds.`);
-                    request.destroy(); // Use destroy instead of abort
-                    reject(new Error(`Request timed out after ${timeoutDuration / 1000} seconds of inactivity`));
-                }, timeoutDuration);
-                const resetTimeout = () => {
+                response.data.on("data", (chunk) => {
+                    data += chunk;
+                    resetTimeout(); // Reset the timeout when data is received
+                });
+                response.data.on("end", () => {
                     if (timeout) {
-                        clearTimeout(timeout);
-                    }
-                    timeout = setTimeout(() => {
-                        console.error(`Request timeout: No data received for ${timeoutDuration / 1000} seconds.`);
-                        request.destroy(); // Use destroy instead of abort
-                        reject(new Error(`Request timed out after ${timeoutDuration / 1000} seconds of inactivity`));
-                    }, timeoutDuration);
-                };
-                if (response.statusCode === 200) {
-                    response.on("data", (chunk) => {
-                        data += chunk;
-                        resetTimeout(); // Reset the timeout every time data is received
-                    });
-                    response.on("end", () => {
-                        if (timeout) {
-                            clearTimeout(timeout);
-                        }
-                        resolve(data);
-                    });
-                }
-                else if ((response.statusCode === 301 || response.statusCode === 302) &&
-                    response.headers.location) {
-                    // Handle redirects
-                    if (maxRedirects > 0) {
-                        const redirectUrl = new url_1.URL(response.headers.location, url); // Resolve relative URLs based on the original URL
-                        if (timeout) {
-                            clearTimeout(timeout);
-                        }
-                        this.fetch(redirectUrl.toString(), maxRedirects - 1)
-                            .then(resolve)
-                            .catch(reject);
-                    }
-                    else {
-                        reject(new Error("Too many redirects"));
+                        clearTimeout(timeout); // Clear timeout on stream end
                     }
-                }
-                else {
+                    resolve(data);
+                });
+                response.data.on("error", (error) => {
                     if (timeout) {
                         clearTimeout(timeout);
                     }
-                    reject(new Error(`Failed to retrieve data from ${url}. Status code: ${response.statusCode}`));
+                    reject(error);
+                });
+            })
+                .catch((error) => {
+                if (axios_1.default.isCancel(error)) {
+                    console.error("Request canceled:", error.message);
                 }
-            });
-            request.on("error", (error) => {
-                if (timeout) {
-                    clearTimeout(timeout);
+                else {
+                    console.error(`Failed to retrieve data from ${url}:`, error.message);
                 }
-                console.error(`GET ${url}:`, error.message);
                 reject(error);
             });
-            request.end();
         });
     }
+    // Helper method to configure axios with HTTPS settings
+    getAxiosConfig() {
+        return {
+            httpsAgent: new https_1.default.Agent({
+                cert: fs_1.default.readFileSync(ContentServer.certPath),
+                key: fs_1.default.readFileSync(ContentServer.keyPath),
+                rejectUnauthorized: false,
+            }),
+            timeout: 0, // Disable axios timeout (we're using inactivity timeout)
+        };
+    }
 }
 exports.ContentServer = ContentServer;
 ContentServer.port = 4161;
+ContentServer.inactivityTimeout = 5000; // Inactivity timeout in milliseconds (5 seconds)

package/dist/DigNetwork/PropagationServer.d.ts

@@ -1,4 +1,5 @@
 import https from "https";
+import { PassThrough } from "stream";
 export declare class PropagationServer {
     storeId: string;
     sessionId: string;
@@ -10,6 +11,7 @@ export declare class PropagationServer {
     username: string | undefined;
     password: string | undefined;
     private static readonly port;
+    private static readonly inactivityTimeout;
     constructor(ipAddress: string, storeId: string);
     /**
      * Initialize the Wallet instance.
@@ -19,6 +21,10 @@ export declare class PropagationServer {
      * Create an Axios HTTPS Agent with self-signed certificate allowance.
      */
     createHttpsAgent(): https.Agent;
+    /**
+     * Adds a custom inactivity timeout for large file transfers.
+     */
+    addInactivityTimeout(stream: PassThrough, timeoutMs: number): PassThrough;
     /**
      * Check if the store and optional root hash exist by making a HEAD request.
      */

package/dist/DigNetwork/PropagationServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PropagationServer.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/PropagationServer.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,OAAO,CAAC;AAyB1B,qBAAa,iBAAiB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAQ;gBAExB,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAY9C;;OAEG;IACG,gBAAgB;IAOtB;;OAEG;IACH,gBAAgB;IAQhB;;OAEG;IACG,gBAAgB,CACpB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,cAAc,EAAE,OAAO,CAAA;KAAE,CAAC;IA0C7D;;OAEG;IACG,kBAAkB,CAAC,QAAQ,EAAE,MAAM;IAuDzC;;OAEG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,CAAC;IAyBlD;;;OAGG;IACG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAoGhD;;OAEG;IACG,mBAAmB;IAgCzB;;OAEG;WACU,WAAW,CACtB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;IA2DnB;;;OAGG;IACG,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA0ElD;;OAEG;IACG,cAAc,CAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IA0B7C;;;OAGG;IACG,YAAY,CAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM;IA+FjB;;OAEG;WACU,aAAa,CACxB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;CA2FpB"}
+{"version":3,"file":"PropagationServer.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/PropagationServer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,OAAO,CAAC;AAW1B,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAiBrC,qBAAa,iBAAiB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAQ;IACpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAQ;gBAErC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAY9C;;OAEG;IACG,gBAAgB;IAOtB;;OAEG;IACH,gBAAgB;IAQhB;;OAEG;IACH,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM;IAyB3D;;OAEG;IACG,gBAAgB,CACpB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,cAAc,EAAE,OAAO,CAAA;KAAE,CAAC;IA0C7D;;OAEG;IACG,kBAAkB,CAAC,QAAQ,EAAE,MAAM;IAuDzC;;OAEG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,CAAC;IAyBlD;;;OAGG;IACG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAuGhD;;OAEG;IACG,mBAAmB;IAgCzB;;OAEG;WACU,WAAW,CACtB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;IA2DnB;;;OAGG;IACG,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgFlD;;OAEG;IACG,cAAc,CAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IA0B7C;;;OAGG;IACG,YAAY,CAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM;IAwGjB;;OAEG;WACU,aAAa,CACxB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;CA2FpB"}

package/dist/DigNetwork/PropagationServer.js

@@ -4,26 +4,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PropagationServer = void 0;
-// Import necessary modules and dependencies
 const axios_1 = __importDefault(require("axios"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const cli_progress_1 = __importDefault(require("cli-progress"));
 const form_data_1 = __importDefault(require("form-data"));
-const blockchain_1 = require("../blockchain");
-const ssl_1 = require("../utils/ssl");
-const credentialsUtils_1 = require("../utils/credentialsUtils");
+const fs_1 = __importDefault(require("fs"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const https_1 = __importDefault(require("https"));
-const cli_progress_1 = __importDefault(require("cli-progress"));
-const colorette_1 = require("colorette");
-const config_1 = require("../utils/config");
-const hashUtils_1 = require("../utils/hashUtils");
-const nanospinner_1 = require("nanospinner");
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
 const progress_stream_1 = __importDefault(require("progress-stream"));
-const stream_1 = require("stream");
 const asyncPool_1 = require("../utils/asyncPool");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const os_1 = __importDefault(require("os"));
+const nanospinner_1 = require("nanospinner");
+const hashUtils_1 = require("../utils/hashUtils");
+const ssl_1 = require("../utils/ssl");
+const colorette_1 = require("colorette");
 const merkle_1 = require("../utils/merkle");
+const stream_1 = require("stream");
+const credentialsUtils_1 = require("../utils/credentialsUtils");
+const config_1 = require("../utils/config");
+const blockchain_1 = require("../blockchain");
 // Helper function to trim long filenames with ellipsis and ensure consistent padding
 function formatFilename(filename, maxLength = 30) {
     if (!filename) {
@@ -62,6 +61,26 @@ class PropagationServer {
             rejectUnauthorized: false,
         });
     }
+    /**
+     * Adds a custom inactivity timeout for large file transfers.
+     */
+    addInactivityTimeout(stream, timeoutMs) {
+        let timeoutId;
+        const resetTimeout = () => {
+            clearTimeout(timeoutId);
+            timeoutId = setTimeout(() => {
+                stream.destroy(new Error(`Inactivity timeout after ${timeoutMs / 1000} seconds`));
+            }, timeoutMs);
+        };
+        // Reset timeout every time data is received
+        stream.on("data", resetTimeout);
+        // Set the initial timeout
+        resetTimeout();
+        // Clear the timeout when the stream ends
+        stream.on("end", () => clearTimeout(timeoutId));
+        stream.on("error", () => clearTimeout(timeoutId)); // Handle errors
+        return stream;
+    }
     /**
      * Check if the store and optional root hash exist by making a HEAD request.
      */
@@ -201,8 +220,8 @@ class PropagationServer {
             progressStream.on("progress", (progress) => {
                 progressBar.update(progress.transferred);
             });
-            // Create a PassThrough stream
-            const passThroughStream = new stream_1.PassThrough();
+            // Add inactivity timeout to the progress stream
+            const passThroughStream = this.addInactivityTimeout(new stream_1.PassThrough(), PropagationServer.inactivityTimeout);
             // Pipe the read stream through the progress stream into the PassThrough stream
             fileReadStream.pipe(progressStream).pipe(passThroughStream);
             // Use form-data to construct the request body
@@ -348,7 +367,9 @@ class PropagationServer {
             progressStream.on("progress", (progress) => {
                 progressBar.update(progress.transferred);
             });
-            response.data.pipe(progressStream);
+            // Add inactivity timeout to the progress stream
+            const passThroughStream = this.addInactivityTimeout(new stream_1.PassThrough(), PropagationServer.inactivityTimeout);
+            response.data.pipe(progressStream).pipe(passThroughStream);
             progressStream.on("data", (chunk) => {
                 dataBuffers.push(chunk);
             });
@@ -436,7 +457,12 @@ class PropagationServer {
             progressStream.on("progress", (progress) => {
                 progressBar.update(progress.transferred);
             });
-            response.data.pipe(progressStream).pipe(fileWriteStream);
+            // Add inactivity timeout to the progress stream
+            const passThroughStream = this.addInactivityTimeout(new stream_1.PassThrough(), PropagationServer.inactivityTimeout);
+            response.data
+                .pipe(progressStream)
+                .pipe(passThroughStream)
+                .pipe(fileWriteStream);
             // Wait for both the file write stream and the progress stream to finish
             await Promise.all([
                 new Promise((resolve, reject) => {
@@ -534,3 +560,4 @@ class PropagationServer {
 }
 exports.PropagationServer = PropagationServer;
 PropagationServer.port = 4159; // Static port used for all requests
+PropagationServer.inactivityTimeout = 5000; // Inactivity timeout in milliseconds (5 seconds)

package/dist/blockchain/FullNodePeer.d.ts

@@ -5,7 +5,13 @@ export declare class FullNodePeer {
     private peer;
     private static deprioritizedIps;
     private constructor();
-    static connect(): Promise<Peer>;
+    /**
+     * Connect to the best peer, optionally using custom certificate and key file paths.
+     * @param {string} [certFilePath] - Optional custom certificate file path.
+     * @param {string} [keyFilePath] - Optional custom key file path.
+     * @returns {Promise<Peer>} The connected peer.
+     */
+    static connect(certFilePath?: string, keyFilePath?: string): Promise<Peer>;
     private static isPortReachable;
     private static isValidIpAddress;
     /**

package/dist/blockchain/FullNodePeer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FullNodePeer.d.ts","sourceRoot":"","sources":["../../src/blockchain/FullNodePeer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAqBpD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAkD;IAC3E,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAA0B;IAChE,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAA0B;IAMzD,OAAO;WAIa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5C,OAAO,CAAC,MAAM,CAAC,eAAe;IAiB9B,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAM/B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;mBASZ,eAAe;mBA2Df,UAAU;IA2B/B,OAAO,CAAC,MAAM,CAAC,eAAe;mBAkDT,WAAW;IAuGzB,OAAO,IAAI,IAAI;WAIF,mBAAmB,CACrC,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC;CAwBpB"}
+{"version":3,"file":"FullNodePeer.d.ts","sourceRoot":"","sources":["../../src/blockchain/FullNodePeer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAqBpD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAkD;IAC3E,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAA0B;IAChE,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAA0B;IAQzD,OAAO;IAIP;;;;;OAKG;WACiB,OAAO,CACzB,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAKhB,OAAO,CAAC,MAAM,CAAC,eAAe;IAiB9B,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAM/B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;mBASZ,eAAe;mBA6Df,UAAU;IA2B/B,OAAO,CAAC,MAAM,CAAC,eAAe;mBAyDT,WAAW;IA+HzB,OAAO,IAAI,IAAI;WAIF,mBAAmB,CACrC,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC;CAwBpB"}

package/dist/blockchain/FullNodePeer.js

@@ -30,8 +30,14 @@ class FullNodePeer {
     constructor(peer) {
         this.peer = peer;
     }
-    static async connect() {
-        const peer = await FullNodePeer.getBestPeer();
+    /**
+     * Connect to the best peer, optionally using custom certificate and key file paths.
+     * @param {string} [certFilePath] - Optional custom certificate file path.
+     * @param {string} [keyFilePath] - Optional custom key file path.
+     * @returns {Promise<Peer>} The connected peer.
+     */
+    static async connect(certFilePath, keyFilePath) {
+        const peer = await FullNodePeer.getBestPeer(certFilePath, keyFilePath);
         return new FullNodePeer(peer).peer;
     }
     static isPortReachable(host, port, timeout = CONNECTION_TIMEOUT) {
@@ -158,7 +164,8 @@ class FullNodePeer {
                         }
                         catch (error) {
                             // If the error is WebSocket-related or timeout, reset the peer
-                            if (error.message.includes("WebSocket") || error.message.includes("Operation timed out")) {
+                            if (error.message.includes("WebSocket") ||
+                                error.message.includes("Operation timed out")) {
                                 FullNodePeer.cachedPeer = null;
                                 // @ts-ignore
                                 FullNodePeer.memoizedFetchNewPeerIPs.cache.clear();
@@ -175,17 +182,33 @@ class FullNodePeer {
             },
         });
     }
-    static async getBestPeer() {
+    static async getBestPeer(certFilePath, keyFilePath) {
         const now = Date.now();
         if (FullNodePeer.cachedPeer &&
             now - FullNodePeer.cachedPeer.timestamp < CACHE_DURATION) {
             return FullNodePeer.cachedPeer.peer;
         }
-        const sslFolder = path_1.default.resolve(os_1.default.homedir(), ".dig", "ssl");
-        const certFile = path_1.default.join(sslFolder, "public_dig.crt");
-        const keyFile = path_1.default.join(sslFolder, "public_dig.key");
-        if (!fs_1.default.existsSync(sslFolder)) {
-            fs_1.default.mkdirSync(sslFolder, { recursive: true });
+        let certFile;
+        let keyFile;
+        // If certFilePath or keyFilePath is provided, ensure both are provided
+        if (certFilePath && keyFilePath) {
+            certFile = certFilePath;
+            keyFile = keyFilePath;
+            if (!fs_1.default.existsSync(certFile)) {
+                throw new Error(`Certificate file not found: ${certFile}`);
+            }
+            if (!fs_1.default.existsSync(keyFile)) {
+                throw new Error(`Key file not found: ${keyFile}`);
+            }
+        }
+        else {
+            // Use default paths if no custom paths are provided
+            const sslFolder = path_1.default.resolve(os_1.default.homedir(), ".dig", "ssl");
+            certFile = path_1.default.join(sslFolder, "public_dig.crt");
+            keyFile = path_1.default.join(sslFolder, "public_dig.key");
+            if (!fs_1.default.existsSync(sslFolder)) {
+                throw new Error(`SSL folder not found: ${sslFolder}`);
+            }
         }
         new chia_server_coin_1.Tls(certFile, keyFile);
         const peerIPs = await FullNodePeer.getPeerIPs();
@@ -230,7 +253,9 @@ class FullNodePeer {
         // Prioritize LOCALHOST, TRUSTED_NODE_IP, and CHIA_NODES_HOST if they have the highest peak height
         let bestPeerIndex = validHeights.findIndex((height, index) => height === highestPeak &&
             !FullNodePeer.deprioritizedIps.has(peerIPs[index]) && // Exclude deprioritized IPs
-            (peerIPs[index] === LOCALHOST || peerIPs[index] === trustedNodeIp || peerIPs[index] === CHIA_NODES_HOST));
+            (peerIPs[index] === LOCALHOST ||
+                peerIPs[index] === trustedNodeIp ||
+                peerIPs[index] === CHIA_NODES_HOST));
         // If LOCALHOST, TRUSTED_NODE_IP, or CHIA_NODES_HOST don't have the highest peak, select any peer with the highest peak
         if (bestPeerIndex === -1) {
             bestPeerIndex = validHeights.findIndex((height) => height === highestPeak);

package/dist/blockchain/ServerCoin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServerCoin.d.ts","sourceRoot":"","sources":["../../src/blockchain/ServerCoin.ts"],"names":[],"mappings":"AACA,OAAO,EAML,UAAU,IAAI,gBAAgB,EAE/B,MAAM,8BAA8B,CAAC;AAItC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAYrD,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAS;IACxB,gBAAuB,iBAAiB,eAEtC;gBAEU,OAAO,EAAE,MAAM;IAKd,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA4D3E,kBAAkB,CAC7B,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAsBH,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAoDjD,oBAAoB;IAerB,gBAAgB,CAC3B,KAAK,EAAE,MAAM,EACb,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAgDP,mBAAmB,CAC9B,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,kBAAkB,CAC7B,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,wBAAwB,CACnC,KAAK,EAAE,MAAM,EACb,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;WAeN,eAAe,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAKpD,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiFrD,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WA+B1C,uBAAuB;YAkE7B,sBAAsB;IAWvB,uBAAuB,CAClC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC;WAuBL,sBAAsB,CAAC,mBAAmB,EAAE,IAAI,GAAG;QAC/D,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CA2BF"}
+{"version":3,"file":"ServerCoin.d.ts","sourceRoot":"","sources":["../../src/blockchain/ServerCoin.ts"],"names":[],"mappings":"AACA,OAAO,EAML,UAAU,IAAI,gBAAgB,EAE/B,MAAM,8BAA8B,CAAC;AAItC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAYrD,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAS;IACxB,gBAAuB,iBAAiB,eAEtC;gBAEU,OAAO,EAAE,MAAM;IAKd,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA4D3E,kBAAkB,CAC7B,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAsBH,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAoDjD,oBAAoB;IAerB,gBAAgB,CAC3B,KAAK,EAAE,MAAM,EACb,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAoDP,mBAAmB,CAC9B,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,kBAAkB,CAC7B,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,wBAAwB,CACnC,KAAK,EAAE,MAAM,EACb,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;WAeN,eAAe,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAKpD,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiFrD,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WA+B1C,uBAAuB;YAkE7B,sBAAsB;IAWvB,uBAAuB,CAClC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC;WAuBL,sBAAsB,CAAC,mBAAmB,EAAE,IAAI,GAAG;QAC/D,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CA2BF"}

package/dist/blockchain/ServerCoin.js

@@ -30,7 +30,7 @@ class ServerCoin {
             const serverCoinCreationCoins = await (0, coins_1.selectUnspentCoins)(peer, BigInt(serverCoinCollateral), BigInt(1000000));
             const { epoch: currentEpoch } = ServerCoin.getCurrentEpoch();
             const epochBasedHint = (0, datalayer_driver_1.morphLauncherId)(Buffer.from(this.storeId, "hex"), BigInt(currentEpoch));
-            const newServerCoin = (0, datalayer_driver_1.createServerCoin)(publicSyntheticKey, serverCoinCreationCoins, epochBasedHint, [peerIp], BigInt(serverCoinCollateral), BigInt(1000000));
+            const newServerCoin = (0, datalayer_driver_1.createServerCoin)(publicSyntheticKey, serverCoinCreationCoins, epochBasedHint, [peerIp, publicSyntheticKey.toString("hex")], BigInt(serverCoinCollateral), BigInt(1000000));
             const combinedCoinSpends = [...newServerCoin.coinSpends];
             const sig = (0, datalayer_driver_1.signCoinSpends)(combinedCoinSpends, [await wallet.getPrivateSyntheticKey()], false);
             const err = await peer.broadcastSpend(combinedCoinSpends, [sig]);
@@ -117,6 +117,9 @@ class ServerCoin {
         for (const coinState of filteredCoinStates) {
             const serverCoin = await peer.fetchServerCoin(coinState, maxClvmCost);
             const peerUrl = serverCoin.memoUrls[0];
+            // The second memo URL is the public key
+            // We will utilize this for future features
+            const publicKey = serverCoin.memoUrls[1];
             if (!blacklist.includes(peerUrl)) {
                 serverCoinPeers.add(peerUrl);
             }

package/package.json

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