@nosana/node 1.1.70 → 1.1.71-rc

package/dist/package.json

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

package/dist/src/NodeManager/node/job/jobHandler.d.ts

@@ -12,6 +12,7 @@ export declare class JobHandler {
     private id;
     private job;
     private runSubscriptionId;
+    private accountPollInterval;
     private jobExternalUtil;
     private eventEmitter;
     private finishing;
@@ -37,6 +38,13 @@ export declare class JobHandler {
     nodeStop(): Promise<void>;
     validate(jobDefinition: JobDefinition): Promise<boolean>;
     private listenForAccountChanges;
+    /**
+     * The subscription alone is not enough: a websocket can drop a
+     * notification. Reading the chain on an interval keeps the node from
+     * working a job that has already ended onchain.
+     */
+    private pollForAccountChanges;
+    private stopPollingForAccountChanges;
     private stopListeningForAccountChanges;
     start(job: Job): Promise<boolean>;
     runWithErrorHandling(): Promise<void>;

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

@@ -99,6 +99,9 @@ export class JobHandler {
         await TaskManagerRegistry.getInstance().stop();
         await JobRegistry.getInstance().stop(this.sdk, this.repository);
         this.stopListeningForAccountChanges();
+        // every cycle registers its own listeners, the previous job's must not
+        // answer for the next one
+        this.accountEmitter.removeAllListeners();
         this.clearJob();
     }
     async validate(jobDefinition) {
@@ -141,7 +144,41 @@ export class JobHandler {
             }
         });
     }
+    /**
+     * The subscription alone is not enough: a websocket can drop a
+     * notification. Reading the chain on an interval keeps the node from
+     * working a job that has already ended onchain.
+     */
+    pollForAccountChanges() {
+        const jobAddress = new PublicKey(this.jobId());
+        const interval = setInterval(async () => {
+            try {
+                const jobAccount = await this.sdk.jobs.jobs.account.jobAccount.fetch(jobAddress);
+                // stopped or replaced by the next job while the request was out
+                if (this.accountPollInterval !== interval)
+                    return;
+                if (jobAccount.state >= 2) {
+                    this.stopPollingForAccountChanges();
+                    this.finishing = true;
+                    this.accountEmitter.emit('stopped', jobAccount);
+                    return;
+                }
+                this.accountEmitter.emit('changed', jobAccount);
+            }
+            catch {
+                // an RPC failure says nothing about the job, the next poll retries
+            }
+        }, 60000);
+        this.accountPollInterval = interval;
+    }
+    stopPollingForAccountChanges() {
+        if (this.accountPollInterval) {
+            clearInterval(this.accountPollInterval);
+            this.accountPollInterval = undefined;
+        }
+    }
     stopListeningForAccountChanges() {
+        this.stopPollingForAccountChanges();
         if (this.runSubscriptionId !== undefined) {
             this.sdk.jobs.connection.removeProgramAccountChangeListener(this.runSubscriptionId);
             this.runSubscriptionId = undefined;
@@ -187,6 +224,7 @@ export class JobHandler {
             }
         }
         this.listenForAccountChanges();
+        this.pollForAccountChanges();
         return true;
     }
     async runWithErrorHandling() {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@nosana/node",
-  "version": "1.1.70",
+  "version": "1.1.71-rc",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@nosana/node",
-      "version": "1.1.70",
+      "version": "1.1.71-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.70",
+  "version": "1.1.71-rc",
   "description": "",
   "bin": {
     "nosana-node": "./dist/src/index.js"