@nosana/node 1.0.12-rc → 1.0.13-rc

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nosana/node",
-    "version": "1.0.12-rc",
+    "version": "1.0.13-rc",
     "description": "",
     "bin": {
         "nosana-node": "./dist/src/index.js"

package/dist/src/NodeManager/monitoring/log/NodeLog.d.ts

@@ -20,6 +20,7 @@ declare class NodeLog {
     private observers;
     private shared;
     private job;
+    private expiry;
     constructor();
     addObserver(observer: LogObserver): void;
     removeObserver(observer: LogObserver): void;

package/dist/src/NodeManager/monitoring/log/NodeLog.js

@@ -56,6 +56,9 @@ class NodeLog {
                         log: '',
                         timestamp: Date.now(),
                         type: 'process',
+                        payload: {
+                            expiry: this.expiry
+                        }
                     });
                 }
                 if (data.type === 'return') {
@@ -469,6 +472,21 @@ class NodeLog {
                 this.shared.expiry = data.result;
             }
         }
+        if (data.method === 'extendExpiryTime') {
+            if (data.type === 'call') {
+                this.expiry = data.arguments[0];
+                this.addLog({
+                    method: `Job:ExpiryUpdated`,
+                    job: this.job,
+                    log: 'Job expiry time extended',
+                    timestamp: Date.now(),
+                    type: 'update',
+                    payload: {
+                        expiry: this.expiry
+                    }
+                });
+            }
+        }
         if (data.method === 'waitUntilExpired') {
             if (data.type === 'call') {
                 if (this.shared.exposed) {
@@ -1082,6 +1100,12 @@ class NodeLog {
                 }
             }
         }
+        if (data.method === 'register') {
+            if (data.type === 'call') {
+                const timeout = data.arguments[2].timeout;
+                this.expiry = typeof timeout === 'number' ? timeout : Number(timeout);
+            }
+        }
         if (data.method === 'claim') {
             if (data.type === 'call') {
                 this.job = data.arguments[0];

package/dist/src/NodeManager/monitoring/log/console/ConsoleLogger.d.ts

@@ -12,6 +12,8 @@ export declare class ConsoleLogger implements LogObserver {
     private benchmarking;
     private taskManagerActive;
     private running;
+    private expiry;
+    private taskManagerRunInterval;
     spinner: Ora;
     constructor(isNode?: boolean);
     addObserver(): void;

package/dist/src/NodeManager/monitoring/log/console/ConsoleLogger.js

@@ -3,6 +3,7 @@ import ora from 'ora';
 import { MultiBar, Presets, SingleBar } from 'cli-progress';
 import { log } from '../NodeLog.js';
 import { convertFromBytes } from '../../../utils/convertFromBytes.js';
+import { formatTime } from '../../../utils/formatTime.js';
 export const consoleLogging = (() => {
     let instance = null;
     return () => {
@@ -64,6 +65,9 @@ export class ConsoleLogger {
             return;
         }
         if (isNode) {
+            if (log.method === 'Job:ExpiryUpdated') {
+                this.expiry = log.payload?.expiry;
+            }
             // --- TaskManager quiet window ---
             if (log.method === 'TaskManager.start' && log.type === 'process') {
                 // Stop anything currently animating
@@ -75,7 +79,18 @@ export class ConsoleLogger {
                     this.multiProgressBar.stop();
                 this.taskManagerActive = true;
                 this.pending = true;
-                this.spinner = ora(chalk.magenta(`${chalk.bgMagenta.bold(' TASKMANAGER ')} Running ${log.job}...`)).start();
+                this.expiry = log.payload?.expiry;
+                const startTime = Date.now();
+                this.spinner = ora(chalk.magenta(`${chalk.bgMagenta.bold(' TASKMANAGER ')} ${chalk.bgGreen.bold(' Duration: 0s ')} ${chalk.bgCyan.bold(` Max Duration: ${formatTime(this.expiry ?? 0)} `)}`)).start();
+                this.taskManagerRunInterval = setInterval(() => {
+                    if (this.taskManagerActive) {
+                        const duration = (Date.now() - startTime) / 1000;
+                        this.spinner.text = chalk.magenta(`${chalk.bgMagenta.bold(' TASKMANAGER ')} ${chalk.bgGreen.bold(` Duration: ${formatTime(duration)} `)} ${chalk.bgCyan.bold(` Max Duration: ${formatTime((this.expiry ?? 0))} `)}`);
+                    }
+                    else {
+                        clearInterval(this.taskManagerRunInterval);
+                    }
+                }, 5000);
                 // Block everything else until we see TaskManager.stop
                 return;
             }

package/dist/src/NodeManager/node/expiry/expiryHandler.d.ts

@@ -17,7 +17,7 @@ export declare class ExpiryHandler {
     start(): void;
     stop(): void;
     private startOrResetTimer;
-    extendExpiryTime(additionalTimeMs: number): void;
+    extendExpiryTime(additionalTimeMs: number, timeout: number): void;
     expired(run: Run, job: Job): boolean;
     waitUntilExpired(): Promise<void>;
     private shortenedExpiry;

package/dist/src/NodeManager/node/expiry/expiryHandler.js

@@ -1,5 +1,6 @@
 import BN from 'bn.js';
 import ApiEventEmitter from '../api/ApiEventEmitter.js';
+import { logEmitter } from '../../monitoring/proxy/loggingProxy.js';
 export class ExpiryHandler {
     constructor(sdk) {
         this.sdk = sdk;
@@ -33,7 +34,7 @@ export class ExpiryHandler {
                 .mul(new BN(1000))
                 .toNumber();
             if (newExpiryTime != this.expiryEndTime) {
-                this.extendExpiryTime(newExpiryTime - this.expiryEndTime);
+                this.extendExpiryTime(newExpiryTime - this.expiryEndTime, timeout);
             }
         });
         this.onExpireCallback = onExpireCallback;
@@ -75,7 +76,15 @@ export class ExpiryHandler {
             }
         }, remainingTime);
     }
-    extendExpiryTime(additionalTimeMs) {
+    extendExpiryTime(additionalTimeMs, timeout) {
+        // Manually emit log event since internal calls bypass the proxy
+        logEmitter.emit('log', {
+            class: 'ExpiryHandler',
+            method: 'extendExpiryTime',
+            arguments: [timeout],
+            timestamp: new Date().toISOString(),
+            type: 'call',
+        });
         this.expiryEndTime += additionalTimeMs;
         this.startOrResetTimer();
     }

package/dist/src/NodeManager/utils/formatTime.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Converts seconds into a formatted time string (e.g., "1h 23m 45s", "5m 30s", "45s")
+ * @param seconds - The number of seconds to format
+ * @returns Formatted time string with hours, minutes, and/or seconds
+ */
+export declare function formatTime(seconds: number): string;

package/dist/src/NodeManager/utils/formatTime.js

@@ -0,0 +1,20 @@
+/**
+ * Converts seconds into a formatted time string (e.g., "1h 23m 45s", "5m 30s", "45s")
+ * @param seconds - The number of seconds to format
+ * @returns Formatted time string with hours, minutes, and/or seconds
+ */
+export function formatTime(seconds) {
+    const totalSeconds = Math.floor(seconds);
+    const hours = Math.floor(totalSeconds / 3600);
+    const minutes = Math.floor((totalSeconds % 3600) / 60);
+    const secs = totalSeconds % 60;
+    const parts = [];
+    if (hours > 0) {
+        parts.push(`${hours}h`);
+    }
+    if (minutes > 0 || hours > 0) {
+        parts.push(`${minutes}m`);
+    }
+    parts.push(`${secs}s`);
+    return parts.join(' ');
+}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@nosana/node",
-  "version": "1.0.12-rc",
+  "version": "1.0.13-rc",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@nosana/node",
-      "version": "1.0.12-rc",
+      "version": "1.0.13-rc",
       "license": "ISC",
       "dependencies": {
         "@coral-xyz/anchor": "^0.28.1-beta.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nosana/node",
-  "version": "1.0.12-rc",
+  "version": "1.0.13-rc",
   "description": "",
   "bin": {
     "nosana-node": "./dist/src/index.js"