@nosana/node 1.1.14-rc → 1.1.15-rc

package/dist/src/NodeManager/node/market/marketHandler.js

@@ -1,8 +1,19 @@
+import chalk from "chalk";
+import { HostManager } from "./hostManager.js";
+import { Benchmark } from "./benchmark.js";
+import { NodeNotRegisteredError } from "../../errors/NodeNotRegisteredError.js";
+import { NodeBannedError } from "../../errors/NodeBannedError.js";
+import { NodeNotQualifiedError } from "../../errors/NodeNotQualifiedError.js";
+import { MarketAccessHandler } from "./marketAccess.js";
+import { sleep } from "../../utils/utils.js";
 export class MarketHandler {
-    constructor(sdk) {
+    constructor(sdk, provider, repository) {
         this.sdk = sdk;
+        this.provider = provider;
+        this.repository = repository;
         this.inMarket = false;
         this.address = this.sdk.solana.provider.wallet.publicKey;
+        this.marketAccessHandler = new MarketAccessHandler(this.sdk);
     }
     clear() {
         this.market = undefined;
@@ -13,6 +24,77 @@ export class MarketHandler {
     setInMarket() {
         this.inMarket = true;
     }
+    async request(requestedMarket) {
+        const result = await HostManager.requestMarket(requestedMarket);
+        // Not registered - caller will handle registration and retry
+        if (result.notRegistered) {
+            throw new NodeNotRegisteredError();
+        }
+        // Node is banned
+        if (result.status === "REJECTED") {
+            throw new NodeBannedError();
+        }
+        // Host manager wants us to run a benchmark first
+        if (result.jobDefinition) {
+            const benchmark = new Benchmark(result.benchmarkId ?? result.jobDefinition.id, result.jobDefinition, this.sdk, this.provider, this.repository);
+            await benchmark.run();
+            return await this.request(requestedMarket);
+        }
+        // Sign and send SFT mint/burn transaction if provided
+        if (result.market?.sftTx) {
+            await this.marketAccessHandler.mintAccessKey(result.market.sftTx);
+            await sleep(30);
+            await HostManager.syncNodeAfterMint(this.address.toString());
+        }
+        if (result.feedbackReport) {
+            this.logFeedbackReport(result.feedbackReport);
+        }
+        if (!result.market?.address) {
+            throw new NodeNotQualifiedError();
+        }
+        const onchainMarket = await this.sdk.jobs.getMarket(result.market.address);
+        if (!onchainMarket) {
+            throw new Error(`Requested market ${result.market.address} not found on-chain`);
+        }
+        if (result.feedbackReport && !result.feedbackReport.passed) {
+            console.log(chalk.yellow("Some thresholds are still below the target market requirements, but access was granted. Continuing."));
+        }
+        this.market = onchainMarket;
+        return onchainMarket;
+    }
+    logFeedbackReport(report) {
+        const targetMarketLabel = report.marketName ?? report.marketAddress;
+        const total = report.metrics.length;
+        let passedCount = 0;
+        let nameWidth = 24;
+        for (const metric of report.metrics) {
+            if (metric.passed)
+                passedCount++;
+            if (metric.metricKey.length > nameWidth)
+                nameWidth = metric.metricKey.length;
+        }
+        const failedCount = total - passedCount;
+        console.log("\n" + chalk.bgCyan.black.bold("  TARGET MARKET  ") + "\n");
+        console.log(`  ${chalk.bold(targetMarketLabel)}`);
+        console.log();
+        for (const metric of report.metrics) {
+            const icon = metric.passed ? chalk.green("  ✔ ") : chalk.red("  ✖ ");
+            const measuredStr = metric.measuredValue !== undefined
+                ? `  ${chalk.cyan(`measured: ${metric.measuredValue}`)}`
+                : "";
+            console.log(icon + chalk.bold(metric.metricKey.padEnd(nameWidth)) + measuredStr);
+            console.log(chalk.gray(`    rule: ${metric.ruleDescription}`));
+            if (!metric.passed && metric.failureMessage) {
+                console.log(chalk.yellow(`    ↳ ${metric.failureMessage}`));
+            }
+        }
+        if (report.passed) {
+            console.log(chalk.bgGreen.black.bold(`  Node currently meets all ${total} market requirements for ${targetMarketLabel}  `) + "\n");
+        }
+        else {
+            console.log(chalk.bgYellow.black.bold(`  Node currently meets ${passedCount} of ${total} market requirements for ${targetMarketLabel} — ${failedCount} still need improvement  `) + "\n");
+        }
+    }
     async check(market) {
         try {
             return await this.sdk.jobs.getMarket(market);
@@ -38,7 +120,7 @@ export class MarketHandler {
             return this.market;
         }
         catch (error) {
-            throw new Error('market does not exists');
+            throw new Error("market does not exists");
         }
     }
     getMarket() {
@@ -50,7 +132,7 @@ export class MarketHandler {
             return this.market;
         }
         catch (error) {
-            throw new Error('market does not exists');
+            throw new Error("market does not exists");
         }
     }
     async checkQueuedInMarket() {
@@ -66,7 +148,7 @@ export class MarketHandler {
     }
     async join(accessKey) {
         if (!this.market) {
-            throw new Error('market not defined');
+            throw new Error("market not defined");
         }
         try {
             await this.sdk.jobs.work(this.market.address, accessKey);
@@ -105,7 +187,7 @@ export class MarketHandler {
             updateCallback(queuedMarketInfo);
         }
         catch (error) {
-            console.warn('\nCould not update queue status', error);
+            console.warn("\nCould not update queue status", error);
         }
         // Check market queue status every minute
         this.checkQueuedInterval = setInterval(async () => {
@@ -114,7 +196,7 @@ export class MarketHandler {
                 updateCallback(queuedMarketInfo);
             }
             catch (error) {
-                console.warn('\nCould not update queue status', error);
+                console.warn("\nCould not update queue status", error);
             }
         }, 60000);
     }

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

@@ -1,16 +1,6 @@
-import { Client } from '@nosana/sdk';
-import { Provider } from '../../provider/Provider.js';
-import { NodeRepository } from '../../repository/NodeRepository.js';
 export declare class RegisterHandler {
-    private sdk;
-    private provider;
-    private repository;
-    private nodeId;
     private answers;
-    constructor(sdk: Client, provider: Provider, repository: NodeRepository);
-    private gainConstent;
-    private generateHeaders;
-    private runSpecs;
-    private submitOnboarding;
+    constructor();
+    private gainConsent;
     register(): Promise<void>;
 }

package/dist/src/NodeManager/node/register/index.js

@@ -1,88 +1,44 @@
 import chalk from 'chalk';
 import { confirm, input } from '@inquirer/prompts';
-import { configs } from '../../configs/configs.js';
-import { specsAndNetworkJob } from '../../../static/index.js';
+import { HostManager } from '../market/hostManager.js';
 import { applyLoggingProxyToClass } from '../../monitoring/proxy/loggingProxy.js';
-import { generateRandomId } from '../utils/generateRandomId.js';
-import TaskManager from '../task/TaskManager.js';
 export class RegisterHandler {
-    constructor(sdk, provider, repository) {
-        this.sdk = sdk;
-        this.provider = provider;
-        this.repository = repository;
-        this.nodeId = this.sdk.solana.provider.wallet.publicKey.toString();
+    constructor() {
         applyLoggingProxyToClass(this);
     }
-    async gainConstent() {
+    async gainConsent() {
         this.answers = {
             email: await input({
-                message: 'Your Email Address',
+                message: "Your Email Address",
                 validate: (value) => /\S+@\S+\.\S+/.test(value),
             }),
             discord: await input({
-                message: 'Join our Discord server for direct support from the team and community: https://nosana.com/discord. \nDiscord username:',
+                message: "Join our Discord server for direct support from the team and community: https://nosana.com/discord. \nDiscord username:",
             }),
             twitter: await input({
                 message: "What is your Twitter username? (If you don't use Twitter, leave blank)",
             }),
         };
         if (!this.answers.email) {
-            console.log(chalk.red('Email address is required'));
+            console.log(chalk.red("Email address is required"));
             process.exit();
         }
         const accept = await confirm({
-            message: `Have you read the Participation Agreement and agree to the terms and conditions contained within?\nParticipation agreement: ${chalk.blue('https://drive.google.com/file/d/1dFWCT5Zon08pCPrftdxB9ByvbuDafTwy/view')}`,
+            message: `Have you read the Participation Agreement and agree to the terms and conditions contained within?\nParticipation agreement: ${chalk.blue("https://drive.google.com/file/d/1dFWCT5Zon08pCPrftdxB9ByvbuDafTwy/view")}`,
         });
         if (!accept) {
-            console.log(chalk.red('To continue you must agree to the terms and conditions'));
+            console.log(chalk.red("To continue you must agree to the terms and conditions"));
             process.exit();
         }
     }
-    // TODO: convert backend to support sdk.authorization.generate()
-    async generateHeaders() {
-        const conf = configs();
-        const signature = (await this.sdk.solana.signMessage(conf.signMessage));
-        const base64Signature = Buffer.from(signature).toString('base64');
-        return `${this.nodeId}:${base64Signature}`;
-    }
-    async runSpecs() {
-        const flowId = generateRandomId(32);
-        const task = new TaskManager(this.provider, this.repository, flowId, this.sdk.solana.wallet.publicKey.toString(), specsAndNetworkJob);
-        task.bootstrap();
-        await task.start();
-        const result = this.repository.getFlow(flowId);
-        if (!result || result.state.status !== 'success') {
-            throw new Error('Registration Benchmark Failed');
-        }
-        return result;
-    }
-    async submitOnboarding(results) {
+    async register() {
+        await this.gainConsent();
         try {
-            const headers = new Headers();
-            headers.append('Authorization', await this.generateHeaders());
-            headers.append('Content-Type', 'application/json');
-            const joinTestGridResult = await fetch(`${configs().backendUrl}/nodes/join-test-grid`, {
-                method: 'POST',
-                headers,
-                body: JSON.stringify({
-                    ...this.answers,
-                    nodeAddress: this.nodeId,
-                    results,
-                }),
-            });
-            if (!joinTestGridResult.ok) {
-                console.error('Error whilst submiting onboarding request.');
-                process.exit();
-            }
+            await HostManager.register(this.answers.email, this.answers.discord, this.answers.twitter);
         }
         catch (error) {
-            console.error('Error whilst submiting onboarding request.', error);
+            console.error('Error registering node:', error);
             process.exit();
         }
     }
-    async register() {
-        await this.gainConstent();
-        const results = await this.runSpecs();
-        await this.submitOnboarding(results.state.opStates);
-    }
 }

package/dist/src/NodeManager/node/resource/resourceManager.d.ts

@@ -1,3 +1,4 @@
+import { Market } from '@nosana/sdk';
 import { Resource } from '@nosana/sdk/dist/types/resources.js';
 import { ContainerOrchestrationInterface } from '../../provider/containerOrchestration/interface.js';
 import { NodeRepository } from '../../repository/NodeRepository.js';
@@ -11,7 +12,7 @@ export declare class ResourceManager {
     volumes: VolumeManager;
     constructor(containerOrchestration: ContainerOrchestrationInterface, repository: NodeRepository);
     resyncResourcesDB(): Promise<void>;
-    fetchMarketRequiredResources(market: string): Promise<void>;
+    fetchMarketRequiredResources(market: Market | string): Promise<void>;
     prune(): Promise<void>;
     getResourceVolumes(resources: Resource[], controller: AbortController): Promise<{
         dest: string;

package/dist/src/NodeManager/node/resource/resourceManager.js

@@ -1,4 +1,4 @@
-import { clientSelector } from '../../client/index.js';
+import { HostManager } from '../market/hostManager.js';
 import { createResourceName } from './helpers/createResourceName.js';
 import { ImageManager } from './image/imageManager.js';
 import { VolumeManager } from './volume/volumeManager.js';
@@ -17,10 +17,10 @@ export class ResourceManager {
         }
     }
     async fetchMarketRequiredResources(market) {
-        this.required_market = market;
+        this.required_market = typeof market === 'string' ? market : market.address.toString();
         try {
-            const { data, error } = await clientSelector().GET('/api/markets/{id}/required-resources', { params: { path: { id: market } } });
-            if (error) {
+            const data = await HostManager.getMarketRequiredResources(this.required_market);
+            if (!data) {
                 return;
             }
             await this.images.pullMarketRequiredImages(data.required_images);

package/dist/src/NodeManager/sdk/index.js

@@ -9,6 +9,7 @@ import { colors } from '../utils/utils.js';
 import { OUTPUT_EVENTS } from '../../output-formatter/outputEvents.js';
 import { outputFormatSelector } from '../../output-formatter/outputFormatSelector.js';
 import { configs } from '../configs/configs.js';
+import { HostManager } from '../node/market/hostManager.js';
 let nosana;
 let nosBalance, solBalance;
 export function setSDKInstance(instance) {
@@ -62,24 +63,13 @@ export async function setSDK(network, rpc, market, keyfile, options) {
     }
     nosana = new Client(network, wallet, config);
     if (!rpc && network === 'mainnet' && wallet) {
-        // sign message for authentication
-        const signature = (await nosana.solana.signMessage(envConfig.signMessage));
-        const base64Signature = Buffer.from(signature).toString('base64');
-        const node = nosana.solana.wallet.publicKey.toString();
         try {
-            const response = await fetch(`${envConfig.backendUrl}/rpc`, {
-                method: 'GET',
-                headers: {
-                    Authorization: `${node}:${base64Signature}`,
-                    'Content-Type': 'application/json',
-                },
-            });
-            const rpcFromBackend = await response.json();
-            if (response.status !== 200) {
+            const rpcFromHostManager = await HostManager.getRpcUrl();
+            if (typeof rpcFromHostManager !== 'string') {
                 console.log(chalk.yellow('Using default solana RPC. Some commands might not work, please provide your own with the --rpc option'));
                 // throw new Error(rpcFromBackend.message);
             }
-            config.solana.network = rpcFromBackend.url;
+            config.solana.network = rpcFromHostManager;
             nosana = new Client(network, wallet, config);
         }
         catch (e) {

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

@@ -48,7 +48,7 @@ export function checkWSLStatus(systemEnvironment) {
     }
     if (isWSLBlockActive()) {
         displayWSLBlockMessage();
-        throw new WSLBlockedError();
+        // throw new WSLBlockedError();
     }
     displayWSLWarning();
 }

package/dist/src/cli/createNosanaCli.js

@@ -6,6 +6,7 @@ import { outputFormatSelector } from '../output-formatter/outputFormatSelector.j
 import { setSDK } from '../NodeManager/sdk/index.js';
 import { configs } from '../NodeManager/configs/configs.js';
 import { NodeConfigsSingleton } from '../NodeManager/configs/NodeConfigs.js';
+import { IpfsClientSingleton } from '../ipfs/IpfsClient.js';
 import { runNodeCommand } from './commands/run/command.js';
 import { startNodeCommand } from './commands/start/command.js';
 import { nodePruneCommand } from './commands/prune/command.js';
@@ -23,6 +24,7 @@ export const createNosanaCLI = (version) => new Command()
     .hook('preAction', async (command, actionCommand) => {
     const opts = actionCommand.optsWithGlobals();
     NodeConfigsSingleton.getInstance(opts);
+    IpfsClientSingleton.set();
     let market = opts.market;
     if (opts.network || opts.wallet) {
         await setSDK(opts.network, opts.rpc, market, opts.wallet, actionCommand.opts());

package/dist/src/ipfs/IpfsClient.d.ts

@@ -0,0 +1,7 @@
+import { type IPFSConfig, type NosanaIpfsClient } from '@nosana/ipfs';
+export declare const IpfsClientSingleton: {
+    set(config?: Partial<IPFSConfig>): NosanaIpfsClient;
+    pin: (data: object) => Promise<string>;
+    pinFile: (path: string) => Promise<string>;
+    retrieve: <T>(hash: string | Array<number>) => Promise<T>;
+};

package/dist/src/ipfs/IpfsClient.js

@@ -0,0 +1,17 @@
+import { createIpfsClient, } from '@nosana/ipfs';
+let instance = null;
+function getInstance() {
+    if (!instance) {
+        throw new Error('IpfsClient has not been initialized. Call IpfsClientSingleton.set() first.');
+    }
+    return instance;
+}
+export const IpfsClientSingleton = {
+    set(config) {
+        instance = createIpfsClient(config);
+        return instance;
+    },
+    pin: (data) => getInstance().pin(data),
+    pinFile: (path) => getInstance().pinFile(path),
+    retrieve: (hash) => getInstance().retrieve(hash),
+};

package/npm-shrinkwrap.json

@@ -1,16 +1,17 @@
 {
   "name": "@nosana/node",
-  "version": "1.1.14-rc",
+  "version": "1.1.15-rc",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@nosana/node",
-      "version": "1.1.14-rc",
+      "version": "1.1.15-rc",
       "license": "ISC",
       "dependencies": {
         "@coral-xyz/anchor": "^0.28.1-beta.1",
         "@inquirer/prompts": "^4.3.0",
+        "@nosana/ipfs": "^2.2.6",
         "@nosana/sdk": "^0.4.81",
         "@solana/web3.js": "^1.78.0",
         "bn.js": "^5.2.1",
@@ -1580,6 +1581,33 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@nosana/ipfs": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/@nosana/ipfs/-/ipfs-2.2.6.tgz",
+      "integrity": "sha512-T9FraaJu/BlC2nyG2Xx2zzBeSf+FSeUkWrkV7vNxG36fmILqhnX9eqtrTpHVNtVtsC+jS6W2b/NANQ/OFgY+VA==",
+      "license": "MIT",
+      "dependencies": {
+        "bs58": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=20.18.0"
+      }
+    },
+    "node_modules/@nosana/ipfs/node_modules/base-x": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.1.tgz",
+      "integrity": "sha512-uAZ8x6r6S3aUM9rbHGVOIsR15U/ZSc82b3ymnCPsT45Gk1DDvhDPdIgB5MrhirZWt+5K0EEPQH985kNqZgNPFw==",
+      "license": "MIT"
+    },
+    "node_modules/@nosana/ipfs/node_modules/bs58": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
+      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
+      "license": "MIT",
+      "dependencies": {
+        "base-x": "^4.0.0"
+      }
+    },
     "node_modules/@nosana/sdk": {
       "version": "0.4.81",
       "resolved": "https://registry.npmjs.org/@nosana/sdk/-/sdk-0.4.81.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nosana/node",
-  "version": "1.1.14-rc",
+  "version": "1.1.15-rc",
   "description": "",
   "bin": {
     "nosana-node": "./dist/src/index.js"
@@ -12,7 +12,8 @@
     "dev:podman:start": "./podman-run.sh start",
     "dev:podman:run": "./podman-run.sh run",
     "build": "npm run prepare && tsc && cp .env ./dist/ && cp .env.prd ./dist/ && cp .env.dev ./dist/",
-    "generate": "openapi-typescript http://dashboard.k8s.prd.nos.ci/api/swagger/json -o ./src/NodeManager/client/schema.d.ts",
+    "generate": "npm run generate:host-manager",
+    "generate:host-manager": "openapi-typescript https://host-manager.k8s.dev.nos.ci/swagger/json -o ./src/NodeManager/clients/hostManager/schema.d.ts",
     "test": "APP_ENV=development DOCKER_CERT_PATH= vitest run",
     "ci:test": "APP_ENV=development DOCKER_CERT_PATH= vitest run --coverage --reporter=junit --outputFile=./test-report.xml",
     "test:watch": "APP_ENV=development DOCKER_CERT_PATH= vitest",
@@ -71,6 +72,7 @@
   "dependencies": {
     "@coral-xyz/anchor": "^0.28.1-beta.1",
     "@inquirer/prompts": "^4.3.0",
+    "@nosana/ipfs": "^2.2.6",
     "@nosana/sdk": "^0.4.81",
     "@solana/web3.js": "^1.78.0",
     "bn.js": "^5.2.1",
@@ -103,4 +105,4 @@
     "util": "^0.12.5",
     "yaml": "^2.8.0"
   }
-}
+}

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

@@ -1,4 +0,0 @@
-import createClient from 'openapi-fetch';
-import { paths } from './schema.js';
-export type QueryClient = ReturnType<typeof createClient<paths>>;
-export declare const clientSelector: () => QueryClient;

package/dist/src/NodeManager/client/index.js

@@ -1,14 +0,0 @@
-import createClient from 'openapi-fetch';
-import { configs } from '../configs/configs.js';
-export const clientSelector = () => {
-    let instance = undefined;
-    if (!instance) {
-        instance = createClient({
-            baseUrl: configs().backendUrl?.replace('/api', '') || '',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-        });
-    }
-    return instance;
-};

package/dist/src/NodeManager/node/api/middlewares/rest/verifyBackendSignatureMiddleware.d.ts

@@ -1,3 +0,0 @@
-import { NextFunction, Response } from 'express';
-import { NodeAPIRequest } from '../../types/index.js';
-export declare function verifyBackendSignatureMiddleware(req: NodeAPIRequest, res: Response, next: NextFunction): Promise<Response<any, Record<string, any>> | undefined>;

package/dist/src/NodeManager/node/api/middlewares/rest/verifyBackendSignatureMiddleware.js

@@ -1,20 +0,0 @@
-import { PublicKey } from '@solana/web3.js';
-import { getSDK } from '../../../../sdk/index.js';
-import { configs } from '../../../../configs/configs.js';
-export async function verifyBackendSignatureMiddleware(req, res, next) {
-    const sdk = getSDK();
-    try {
-        if (!sdk.authorization.validateHeader(req.headers, {
-            expiry: 300,
-            key: 'x-session-id',
-            publicKey: new PublicKey(configs().backendAuthorizationAddress),
-        })) {
-            return res.status(401).send('Unauthorized Request');
-        }
-        res.locals['session_id'] = req.headers['x-session-id'].split(':')[0];
-        next();
-    }
-    catch (error) {
-        res.status(401).send(`Unauthorized Request: ${error.message}`);
-    }
-}

package/dist/src/NodeManager/node/api/routes/post/node-validation.d.ts

@@ -1,4 +0,0 @@
-import { Response } from 'express';
-import { JobDefinition } from '@nosana/sdk';
-import { NodeAPIRequest } from '../../types/index.js';
-export declare function postNodeValidation(req: NodeAPIRequest<{}, JobDefinition>, res: Response): Promise<Response<any, Record<string, any>> | undefined>;