@nosana/node 1.1.59 → 1.1.61-rc

package/dist/package.json

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

package/dist/src/NodeManager/node/api/routes/wss/log.d.ts

@@ -11,4 +11,4 @@ export declare function wssTaskManagerLogRoute(ws: WebSocket, _: string, { jobAd
     group?: string;
     opId?: string;
     type?: string;
-}): void;
+}): Promise<void>;

package/dist/src/NodeManager/node/api/routes/wss/log.js

@@ -1,3 +1,4 @@
+import WebSocket from 'ws';
 import { logStreaming } from '../../../../monitoring/streaming/LogStreamer.js';
 import { getSDK } from '../../../../sdk/index.js';
 import { TaskManagerRegistry } from '../../../task/TaskManagerRegistry.js';
@@ -10,8 +11,17 @@ export async function wssLogRoute(ws, _, { jobAddress }) {
     const walletAddress = sdk.solana.wallet.toString();
     logStreaming(walletAddress).subscribe(ws, jobAddress);
 }
-export function wssTaskManagerLogRoute(ws, _, { jobAddress, group, opId, type, }) {
-    const task = TaskManagerRegistry.getInstance().get(jobAddress);
+export async function wssTaskManagerLogRoute(ws, _, { jobAddress, group, opId, type, }) {
+    const registry = TaskManagerRegistry.getInstance();
+    const deadline = Date.now() + 30000;
+    let task = registry.get(jobAddress);
+    // A run is visible on-chain before the node has finished loading the job
+    // definition and registering its TaskManager. Keep the authenticated socket
+    // open during that short startup window instead of forcing clients to race it.
+    while (!task && Date.now() < deadline && ws.readyState === WebSocket.OPEN) {
+        await new Promise((resolve) => setTimeout(resolve, 250));
+        task = registry.get(jobAddress);
+    }
     if (!task)
         return ws.close(1008, 'Invalid job address');
     task.subscribe(ws, (log) => {
@@ -29,6 +39,8 @@ export function wssTaskManagerLogRoute(ws, _, { jobAddress, group, opId, type, }
         try {
             ws.send(JSON.stringify({ path: 'flog', data: JSON.stringify(log) }));
         }
-        catch { }
+        catch {
+            // The client may disconnect while historical logs are being replayed.
+        }
     }
 }

package/dist/src/NodeManager/node/job/jobExternalUtil.js

@@ -3,6 +3,7 @@ import { IpfsClientSingleton } from '../../../ipfs/IpfsClient.js';
 import { JobDefinitionStrategySelector } from './defination/JobDefinitionStrategy.js';
 import { ResultReturnStrategySelector } from './result/ResultReturnStrategy.js';
 import { createInitialFlow } from '../task/helpers/createInitialFlow.js';
+const JOB_DEFINITION_RETRY_DELAYS_SECONDS = [0.5, 1, 18.5];
 export class JobExternalUtil {
     constructor(repository) {
         this.repository = repository;
@@ -12,10 +13,11 @@ export class JobExternalUtil {
             return await IpfsClientSingleton.retrieve(ipfsHash);
         }
         catch (error) {
-            if (attempts >= 2) {
+            const retryDelay = JOB_DEFINITION_RETRY_DELAYS_SECONDS[attempts];
+            if (retryDelay === undefined) {
                 throw error;
             }
-            await sleep(10);
+            await sleep(retryDelay);
             return this.retrieveJobDefinitionWithRetry(ipfsHash, attempts + 1);
         }
     }

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

@@ -1,7 +1,14 @@
+// Neither the timeout nor a rejected promise can confirm how the wrapped work
+// ended, so both abort as a failure. 'quit' is StopReasons.QUIT, spelled out
+// here to keep this utility off TaskManager's import graph.
+const ABORT_REASON = 'quit';
 export function promiseTimeoutWrapper(promise, expiry_time, abortController) {
     const timeoutError = new Error('Promise took too long to settle, expiry timeout met.');
+    // The caller's controller is an operation's own, and its abort reason is read
+    // back as a StopReason. A bare abort() would set the reason to a DOMException,
+    // which resolves to no status at all.
     const timer = setTimeout(() => {
-        abortController.abort();
+        abortController.abort(ABORT_REASON);
     }, expiry_time * 1000);
     if (abortController.signal.aborted) {
         return Promise.reject(timeoutError);
@@ -19,7 +26,7 @@ export function promiseTimeoutWrapper(promise, expiry_time, abortController) {
         promise
             .then((value) => resolve(value))
             .catch((error) => {
-            abortController.abort();
+            abortController.abort(ABORT_REASON);
             reject(error);
         })
             .finally(onSettled);

package/npm-shrinkwrap.json

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

package/package.json

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