@nosana/node 1.1.45 → 1.1.47-rc

package/dist/package.json

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

package/dist/src/NodeManager/checkForMaintenance.d.ts

@@ -1 +1 @@
-export declare function checkForMaintenance(): Promise<void>;
+export declare function checkForMaintenance(inJobLoop?: boolean): Promise<void>;

package/dist/src/NodeManager/checkForMaintenance.js

@@ -18,7 +18,7 @@ function displayUpcomingMaintenanceNotice(status) {
     }
     console.log("");
 }
-export async function checkForMaintenance() {
+export async function checkForMaintenance(inJobLoop = false) {
     const status = await getMaintenanceStatus();
     if (!status?.maintenance) {
         if (status?.startsAt || status?.expectedEndAt || status?.reason) {
@@ -34,7 +34,7 @@ export async function checkForMaintenance() {
         cleared = true;
     });
     while (!cleared) {
-        await validateCLIVersion();
+        await validateCLIVersion(inJobLoop);
         await Promise.race([sleep(NPM_POLL_INTERVAL_S), maintenanceFinished]);
     }
 }

package/dist/src/NodeManager/index.d.ts

@@ -2,6 +2,11 @@ export default class NodeManager {
     private node;
     private apiHandler;
     private exiting;
+    private apiStarted;
+    /**
+     * Seeded from the environment so the loop survives the process being
+     * replaced by an update.
+     */
     inJobLoop: boolean;
     constructor(options: {
         [key: string]: any;

package/dist/src/NodeManager/index.js

@@ -12,10 +12,16 @@ import { ping } from './monitoring/ping/PingHandler.js';
 import { LogMonitoringRegistry } from './monitoring/LogMonitoringRegistry.js';
 import { checkWSLStatus } from './utils/wslCheck.js';
 import { HostManager } from './node/market/hostManager.js';
+import { IN_JOB_LOOP_ENV } from '../exitCodes.js';
 export default class NodeManager {
     constructor(options) {
         this.exiting = false;
-        this.inJobLoop = false;
+        this.apiStarted = false;
+        /**
+         * Seeded from the environment so the loop survives the process being
+         * replaced by an update.
+         */
+        this.inJobLoop = process.env[IN_JOB_LOOP_ENV] === 'true';
         this.node = createLoggingProxy(new BasicNode(options));
         /**
          * the node class makes the api but we pass the api to the NodeManager class
@@ -62,7 +68,7 @@ export default class NodeManager {
          * start the api of the node and register all the routes of the nodes,
          * we call this here in the init so the api survives restarts between jobs
          */
-        if (!this.inJobLoop) {
+        if (!this.apiStarted) {
             await this.apiHandler.preventMultipleApiStarts();
             await this.apiHandler.start();
             /**
@@ -71,12 +77,13 @@ export default class NodeManager {
              * make a call to the backend per interval to show live ness to the backend
              */
             await ping();
+            this.apiStarted = true;
         }
     }
     async start(marketArg) {
         this.exiting = false;
         if (this.inJobLoop) {
-            await Promise.all([validateCLIVersion(), checkForMaintenance()]);
+            await Promise.all([validateCLIVersion(true), checkForMaintenance(true)]);
         }
         /**
          * maintenance

package/dist/src/cli/commands/start/action.js

@@ -1,5 +1,9 @@
 import 'rpc-websockets/dist/lib/client.js';
 import NodeManager from '../../../NodeManager/index.js';
+import { EXIT_CODES } from '../../../exitCodes.js';
+import { validateCLIVersion } from '../../../version/index.js';
+/** Failures no restart resolves: the node reports them and stops. */
+const TERMINAL_ERRORS = ['NodeBannedError', 'NodeNotQualifiedError'];
 export async function startNode(market, options) {
     options.provider = process.argv.some(arg => arg === '--docker') ? 'docker' : 'podman';
     const nodeManager = new NodeManager(options);
@@ -28,6 +32,8 @@ export async function startNode(market, options) {
             console.error('Get support in our Discord Server. Join:');
             console.error('https://nosana.com/discord');
             console.error('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n');
+            // Terminal, and exits without stopping the node: the market position and
+            // run belong to the node holding this key.
             if (error.name == 'NodeAlreadyActiveError') {
                 process.exit();
             }
@@ -37,12 +43,14 @@ export async function startNode(market, options) {
                 }
                 catch (error) { }
                 await nodeManager.delay(60);
+                // Checked here too, as `start()` is out of reach when `init()` fails.
+                await validateCLIVersion(true);
                 continue;
             }
             else {
                 await nodeManager.error();
                 await nodeManager.stop();
-                process.exit();
+                process.exit(TERMINAL_ERRORS.includes(error.name) ? 0 : EXIT_CODES.RESTART);
             }
         }
     }

package/dist/src/exitCodes.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Exit codes the auto-update wrapper acts on; it stops on any other code.
+ * Keep in sync with `auto-update/src/index.ts`.
+ */
+export declare const EXIT_CODES: {
+    readonly UPDATE: 129;
+    readonly UPDATE_IN_JOB_LOOP: 76;
+    readonly RESTART: 75;
+};
+/** Set by the wrapper on the process that replaces a node in the job loop. */
+export declare const IN_JOB_LOOP_ENV = "NOSANA_NODE_IN_JOB_LOOP";

package/dist/src/exitCodes.js

@@ -0,0 +1,11 @@
+/**
+ * Exit codes the auto-update wrapper acts on; it stops on any other code.
+ * Keep in sync with `auto-update/src/index.ts`.
+ */
+export const EXIT_CODES = {
+    UPDATE: 129,
+    UPDATE_IN_JOB_LOOP: 76,
+    RESTART: 75,
+};
+/** Set by the wrapper on the process that replaces a node in the job loop. */
+export const IN_JOB_LOOP_ENV = 'NOSANA_NODE_IN_JOB_LOOP';

package/dist/src/version/index.d.ts

@@ -1 +1,2 @@
-export declare function validateCLIVersion(): Promise<void>;
+/** @param inJobLoop the process that replaces this one stays in the job loop. */
+export declare function validateCLIVersion(inJobLoop?: boolean): Promise<void>;

package/dist/src/version/index.js

@@ -1,13 +1,15 @@
 import chalk from 'chalk';
 import { pkg } from '../static/index.js';
+import { EXIT_CODES } from '../exitCodes.js';
 function requiresNewVersion(required, current) {
     return parseInt(required) > parseInt(current);
 }
-function exitCleanly(currentVersion, latestVersion) {
+function exitCleanly(currentVersion, latestVersion, inJobLoop) {
     console.log(chalk.red(`You are currently running Nosana CLI version ${currentVersion}. Version ${latestVersion} has been released, please update your CLI to the latest version using npm install ${pkg.name}.`));
-    process.exit(129);
+    process.exit(inJobLoop ? EXIT_CODES.UPDATE_IN_JOB_LOOP : EXIT_CODES.UPDATE);
 }
-export async function validateCLIVersion() {
+/** @param inJobLoop the process that replaces this one stays in the job loop. */
+export async function validateCLIVersion(inJobLoop = false) {
     try {
         const [current_major, current_minor, current_patch] = pkg.version.split('.');
         if (parseInt(current_major) === 0 &&
@@ -27,18 +29,18 @@ export async function validateCLIVersion() {
         if (parseInt(required_major) === parseInt(current_major)) {
             if (parseInt(required_minor) === parseInt(current_minor)) {
                 if (requiresNewVersion(required_patch, current_patch)) {
-                    exitCleanly(pkg.version, registryLatestVersion);
+                    exitCleanly(pkg.version, registryLatestVersion, inJobLoop);
                 }
             }
             else {
                 if (requiresNewVersion(required_minor, current_minor)) {
-                    exitCleanly(pkg.version, registryLatestVersion);
+                    exitCleanly(pkg.version, registryLatestVersion, inJobLoop);
                 }
             }
         }
         else {
             if (requiresNewVersion(required_major, current_major)) {
-                exitCleanly(pkg.version, registryLatestVersion);
+                exitCleanly(pkg.version, registryLatestVersion, inJobLoop);
             }
         }
     }

package/npm-shrinkwrap.json

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