@nosana/node 1.0.0 → 1.0.1-rc

package/dist/NodeManager/configs/configs.d.ts

@@ -9,6 +9,7 @@ export type configType = {
         serverAddr: string;
         serverPort: number;
         containerImage: string;
+        nodeInternalHostName: string;
     };
     api: {
         port: number;

package/dist/NodeManager/configs/configs.js

@@ -13,6 +13,7 @@ export const configs = (options) => {
             serverAddr: loadConfigurationValue('FRP_SERVER_ADDRESS'),
             serverPort: parseInt(loadConfigurationValue('FRP_SERVER_PORT')),
             containerImage: loadConfigurationValue('FRP_SERVER_IMAGE'),
+            nodeInternalHostName: loadConfigurationValue('FRP_NODE_INTERNAL_HOSTNAME', "nosana-node"),
         },
         api: {
             port: parseInt(loadConfigurationValue('API_PORT')),

package/dist/NodeManager/node/api/routes/post/node-validation.js

@@ -162,7 +162,7 @@ export async function postNodeValidation(req, res) {
             return false;
         const a = Number(match[1]), b = Number(match[2]);
         return a < b;
-    })())) && (undefined === input.type || "websocket" === input.type || "web" === input.type || "api" === input.type || "webapi" === input.type || "none" === input.type) && (undefined === input.health_checks || Array.isArray(input.health_checks) && input.health_checks.every((elem, _index8) => "object" === typeof elem && null !== elem && _iu1(elem, true && _exceptionable))) && (1 === Object.keys(input).length || Object.keys(input).every(key => {
+    })())) && (undefined === input.type || "api" === input.type || "websocket" === input.type || "web" === input.type || "webapi" === input.type || "none" === input.type) && (undefined === input.health_checks || Array.isArray(input.health_checks) && input.health_checks.every((elem, _index8) => "object" === typeof elem && null !== elem && _iu1(elem, true && _exceptionable))) && (1 === Object.keys(input).length || Object.keys(input).every(key => {
         if (["port", "type", "health_checks"].some(prop => key === prop))
             return true;
         const value = input[key];
@@ -1012,7 +1012,7 @@ export async function postNodeValidation(req, res) {
             path: _path + ".port",
             expected: "((string & TagBase<__type>) | number)",
             value: input.port
-        }), undefined === input.type || "websocket" === input.type || "web" === input.type || "api" === input.type || "webapi" === input.type || "none" === input.type || _report(_exceptionable, {
+        }), undefined === input.type || "api" === input.type || "websocket" === input.type || "web" === input.type || "webapi" === input.type || "none" === input.type || _report(_exceptionable, {
             path: _path + ".type",
             expected: "(\"api\" | \"none\" | \"web\" | \"webapi\" | \"websocket\" | undefined)",
             value: input.type

package/dist/NodeManager/provider/Provider.js

@@ -41,7 +41,7 @@ export class Provider {
     // set up reverse proxy api for api handler
     async setUpReverseProxyApi(address, port) {
         try {
-            const nodeName = `nosana-node`;
+            const nodeName = configs().frp.nodeInternalHostName;
             const networkName = `api-${address}`;
             const frpc_name = `frpc-api-${address}`;
             await this.containerOrchestration.createNetwork(networkName);

package/dist/NodeManager/provider/containerOrchestration/docker/createDockerRunOptions.d.ts

@@ -0,0 +1,3 @@
+import { ContainerCreateOptions } from "dockerode";
+import { RunContainerArgs } from "../interface";
+export declare function createDockerRunOptions(image: string, { name, cmd, gpu, volumes, env, work_dir, entrypoint, aliases, restart_policy, }: RunContainerArgs, gpuOption: string): ContainerCreateOptions;

package/dist/NodeManager/provider/containerOrchestration/docker/createDockerRunOptions.js

@@ -0,0 +1,61 @@
+function parseRestartPolicy(restart_policy) {
+    if (typeof restart_policy === 'string') {
+        return restart_policy ? { Name: restart_policy, MaximumRetryCount: 0 } : undefined;
+    }
+    if (typeof restart_policy === 'object' && 'policy' in restart_policy) {
+        return {
+            Name: restart_policy.policy,
+            MaximumRetryCount: restart_policy.restart_tries || 0,
+        };
+    }
+    return undefined;
+}
+export function createDockerRunOptions(image, { name, cmd, gpu, volumes, env, work_dir, entrypoint, aliases, restart_policy, }, gpuOption) {
+    const devices = [];
+    if (gpu) {
+        devices.push({
+            ...(gpuOption === 'all'
+                ? { Count: -1 }
+                : { device_ids: gpuOption.split(',') }),
+            Driver: 'nvidia',
+            Capabilities: [['gpu']],
+        });
+    }
+    ;
+    return {
+        name: name,
+        Hostname: '',
+        User: '',
+        AttachStdin: false,
+        AttachStdout: true,
+        AttachStderr: true,
+        Tty: false,
+        OpenStdin: false,
+        StdinOnce: false,
+        Env: Object.entries(env ?? {}).map(([key, value]) => `${key}=${value.toString()}`),
+        Cmd: cmd,
+        Image: image,
+        WorkingDir: work_dir,
+        Entrypoint: entrypoint,
+        NetworkingConfig: {
+            EndpointsConfig: {
+                NOSANA_GATEWAY: aliases ? { Aliases: aliases } : {},
+            },
+        },
+        HostConfig: {
+            ExtraHosts: [
+                'host.docker.internal:8.8.8.8',
+                'host.containers.internal:8.8.8.8',
+            ],
+            Mounts: volumes?.map(({ dest, name, readonly }) => ({
+                Target: dest,
+                Source: name,
+                Type: 'volume',
+                ReadOnly: readonly || false,
+            })),
+            NetworkMode: 'bridge',
+            DeviceRequests: devices,
+            RestartPolicy: parseRestartPolicy(restart_policy),
+        },
+    };
+}

package/dist/NodeManager/provider/containerOrchestration/docker/index.d.ts

@@ -20,7 +20,7 @@ export declare class DockerContainerOrchestration implements ContainerOrchestrat
     getImage(image: string): Promise<Image>;
     listImages(): Promise<ImageInfo[]>;
     deleteImage(image: string, controller?: AbortController): Promise<void>;
-    createNetwork(name: string, controller?: AbortController): Promise<void>;
+    createNetwork(_name: string, controller?: AbortController): Promise<void>;
     hasNetwork(name: string): Promise<boolean>;
     deleteNetwork(name: string, controller?: AbortController): Promise<void>;
     createVolume(name?: string, controller?: AbortController): Promise<VolumeCreateResponse>;

package/dist/NodeManager/provider/containerOrchestration/docker/index.js

@@ -2,6 +2,7 @@ import os from 'os';
 import { DockerExtended } from './dockerExtended/index.js';
 import { createSeverObject } from './utils/createServerObject.js';
 import { checkDeprecationDeadline } from './utils/deadline.js';
+import { createDockerRunOptions } from './createDockerRunOptions.js';
 export class DockerContainerOrchestration {
     constructor(server, gpu) {
         this.name = 'docker';
@@ -91,14 +92,15 @@ export class DockerContainerOrchestration {
                 .remove({ force: true, abortSignal: controller?.signal });
         }
     }
-    async createNetwork(name, controller) {
+    async createNetwork(_name, controller) {
         try {
             if (await this.hasNetwork('NOSANA_GATEWAY'))
                 return;
             await this.docker.createNetwork({
                 Name: 'NOSANA_GATEWAY',
+                Driver: 'bridge',
                 IPAM: {
-                    Driver: 'bridge',
+                    Driver: 'default',
                     Config: [{ Subnet: '192.168.101.0/24', Gateway: '192.168.101.1' }],
                 },
                 abortSignal: controller?.signal,
@@ -223,7 +225,7 @@ export class DockerContainerOrchestration {
                 throw controller.signal.reason;
             }
             const container = await this.docker.createContainer({
-                ...mapRunContainerArgsToContainerCreateOpts(image, args, this.gpu),
+                ...createDockerRunOptions(image, args, this.gpu),
                 abortSignal: controller?.signal,
             });
             await container.start();
@@ -303,64 +305,3 @@ export class DockerContainerOrchestration {
         return `${this.protocol}://${this.host}:${this.port}`;
     }
 }
-function mapRunContainerArgsToContainerCreateOpts(image, { name, cmd, gpu, volumes, env, work_dir, entrypoint, aliases, }, gpuOption) {
-    const devices = gpu
-        ? [
-            {
-                ...(gpuOption === 'all'
-                    ? { Count: -1 }
-                    : { device_ids: gpuOption.split(',') }),
-                Driver: 'nvidia',
-                Capabilities: [['gpu']],
-            },
-        ]
-        : [];
-    const dockerVolumes = [];
-    if (volumes && volumes.length > 0) {
-        for (let i = 0; i < volumes.length; i++) {
-            const volume = volumes[i];
-            dockerVolumes.push({
-                Target: volume.dest,
-                Source: volume.name,
-                Type: 'volume',
-                ReadOnly: volume.readonly || false,
-            });
-        }
-    }
-    const vars = [];
-    if (env) {
-        for (const [key, value] of Object.entries(env)) {
-            vars.push(`${key}=${value}`);
-        }
-    }
-    return {
-        name: name,
-        Hostname: '',
-        User: '',
-        AttachStdin: false,
-        AttachStdout: true,
-        AttachStderr: true,
-        Tty: false,
-        OpenStdin: false,
-        StdinOnce: false,
-        Env: vars,
-        Cmd: cmd,
-        Image: image,
-        WorkingDir: work_dir,
-        Entrypoint: entrypoint,
-        NetworkingConfig: {
-            EndpointsConfig: {
-                NOSANA_GATEWAY: aliases ? { Aliases: aliases } : {},
-            },
-        },
-        HostConfig: {
-            ExtraHosts: [
-                'host.docker.internal:8.8.8.8',
-                'host.containers.internal:8.8.8.8',
-            ],
-            Mounts: dockerVolumes,
-            NetworkMode: 'bridge',
-            DeviceRequests: devices,
-        },
-    };
-}

package/dist/NodeManager/provider/containerOrchestration/podman/index.d.ts

@@ -7,5 +7,6 @@ export declare class PodmanContainerOrchestration extends DockerContainerOrchest
     name: string;
     constructor(server: string, gpu: string);
     libPodAPICall(path: string, options: RequestInit): Promise<Response>;
+    createNetwork(_name: string, controller?: AbortController): Promise<void>;
     runFlowContainer(image: string, args: RunContainerArgs, controller?: AbortController): Promise<Container>;
 }

package/dist/NodeManager/provider/containerOrchestration/podman/index.js

@@ -22,6 +22,26 @@ export class PodmanContainerOrchestration extends DockerContainerOrchestration {
         }
         return fetch(`${this.api}${path}`, options);
     }
+    async createNetwork(_name, controller) {
+        try {
+            if (await this.hasNetwork('NOSANA_GATEWAY'))
+                return;
+            await this.docker.createNetwork({
+                Name: 'NOSANA_GATEWAY',
+                IPAM: {
+                    Driver: 'bridge',
+                    Config: [{ Subnet: '192.168.101.0/24', Gateway: '192.168.101.1' }],
+                },
+                abortSignal: controller?.signal,
+            });
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                error.eventType = 'resource-error';
+            }
+            throw error;
+        }
+    }
     async runFlowContainer(image, args, controller) {
         try {
             let error;

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

@@ -36,4 +36,4 @@ export { logTable, now, sleep, clearLine, askYesNoQuestion, colors, ifStringCast
  * @return {string} The value of the specified environment variable.
  * @throws {Error} If the environment variable is not defined.
  */
-export declare function loadConfigurationValue(key: string): string;
+export declare function loadConfigurationValue(key: string, defaultValue?: string): string;

package/dist/NodeManager/utils/utils.js

@@ -98,9 +98,12 @@ export { logTable, now, sleep, clearLine, askYesNoQuestion, colors, ifStringCast
  * @return {string} The value of the specified environment variable.
  * @throws {Error} If the environment variable is not defined.
  */
-export function loadConfigurationValue(key) {
+export function loadConfigurationValue(key, defaultValue) {
     let value = process.env[key];
     if (!value) {
+        if (defaultValue !== undefined) {
+            return defaultValue;
+        }
         throw new Error(`Missing environment variable ${key}`);
     }
     return value;

package/dist/cli/{address → commands/address}/action.js

@@ -1,4 +1,4 @@
-import { getSDK } from '../../NodeManager/sdk/index.js';
+import { getSDK } from '../../../NodeManager/sdk/index.js';
 export async function getAddress(options, cmd) {
     const nosana = getSDK();
 }

package/dist/cli/{node → commands}/prune/action.js

@@ -4,6 +4,7 @@ import { selectContainerOrchestrationProvider } from '../../../NodeManager/provi
 import { NodeRepository } from '../../../NodeManager/repository/NodeRepository.js';
 export * from './action.js';
 export async function pruneResources(options) {
+    options.provider = process.argv.some(arg => arg === '--docker') ? 'docker' : 'podman';
     try {
         const db = new DB(options.config).db;
         const repository = new NodeRepository(db);

package/dist/cli/{node → commands}/prune/command.js

@@ -2,9 +2,6 @@ import { Command, Option } from 'commander';
 import { pruneResources } from './action.js';
 export const nodePruneCommand = new Command('prune')
     .description('Safely prune none required images and resources.')
-    .addOption(new Option('--provider <provider>', 'provider used to run the job')
-    .choices(['docker', 'podman'])
-    .default('podman'))
     .addOption(new Option('--docker, --podman <URI>', 'Podman/Docker connection URI').default('~/.nosana/podman/podman.sock'))
     .addOption(new Option('-c, --config <path>', 'Config path (to store the flows database and other config)').default('~/.nosana/'))
     .action(pruneResources);

package/dist/cli/{node → commands}/run/__tests__/command.spec.js

@@ -18,11 +18,10 @@ describe('runNodeCommand', () => {
         runNodeCommand.parse(parseArgs);
         expect(runNodeCommand.args[0]).toBe('job definition path');
     });
-    it('should have 7 options', () => {
-        expect(runNodeCommand.options.length).toBe(7);
+    it('should have 6 options', () => {
+        expect(runNodeCommand.options.length).toBe(6);
     });
     it.each([
-        ['--provider', undefined, 'podman'],
         ['--config', '-c', '~/.nosana/'],
         ['--podman', '--docker', '~/.nosana/podman/podman.sock'],
         ['--url', undefined, undefined],

package/dist/cli/{node → commands}/run/action.js

@@ -14,6 +14,7 @@ import { generateRandomId } from '../../../NodeManager/node/utils/generateRandom
 import { getSDK } from '../../../NodeManager/sdk/index.js';
 import { createLoggingProxy } from '../../../NodeManager/monitoring/proxy/loggingProxy.js';
 export async function runJob(jobDefinitionFile, options) {
+    options.provider = process.argv.some(arg => arg === '--docker') ? 'docker' : 'podman';
     try {
         const sdk = getSDK();
         const jobDefinition = await resolveJobDefinition(options, jobDefinitionFile);

package/dist/cli/{node → commands}/run/command.js

@@ -1,13 +1,10 @@
 import { Argument, Command, Option } from 'commander';
 import { runJob } from './action.js';
-import { gpuOption, verboseOption, walletOption } from '../../sharedOptions/index.js';
+import { gpuOption, verboseOption, walletOption } from '../sharedOptions/index.js';
 export * from './action.js';
 export const runNodeCommand = new Command('run')
     .description('Run Job Definition File')
     .addArgument(new Argument('<job-definition-file>', 'Job Definition File').argOptional())
-    .addOption(new Option('--provider <provider>', 'provider used to run the job definition')
-    .choices(['docker', 'podman'])
-    .default('podman'))
     .addOption(new Option('--url <url>', 'Url path for the JSON flow'))
     .addOption(new Option('-c, --config <path>', 'Config path (to store the flows database and other config)').default('~/.nosana/'))
     .addOption(new Option('--docker, --podman <URI>', 'Podman/Docker connection URI').default('~/.nosana/podman/podman.sock'))

package/dist/cli/{node → commands}/start/__tests__/command.spec.js

@@ -18,14 +18,13 @@ describe('startNodeCommand', () => {
         startNodeCommand.parse(parseArgs);
         expect(startNodeCommand.args[0]).toBe('market address');
     });
-    it('should have 9 options', () => {
-        expect(startNodeCommand.options.length).toBe(9);
+    it('should have 8 options', () => {
+        expect(startNodeCommand.options.length).toBe(8);
     });
     it.each([
         ['--network', '-n', 'mainnet'],
         ['--rpc', undefined, undefined],
         ['--wallet', '-w', '~/.nosana/nosana_key.json'],
-        ['--provider', undefined, 'podman'],
         ['--config', '-c', '~/.nosana/'],
         ['--port', '-p', 5001],
         ['--podman', '--docker', '~/.nosana/podman/podman.sock'],

package/dist/cli/{node → commands}/start/action.js

@@ -1,6 +1,7 @@
 import 'rpc-websockets/dist/lib/client.js';
 import NodeManager from '../../../NodeManager/index.js';
 export async function startNode(market, options) {
+    options.provider = process.argv.some(arg => arg === '--docker') ? 'docker' : 'podman';
     const nodeManager = new NodeManager(options);
     while (true) {
         try {

package/dist/cli/{node → commands}/start/command.js

@@ -1,6 +1,6 @@
 import { Command, Option } from 'commander';
 import { startNode } from './action.js';
-import { networkOption, portOption, rpcOption, walletOption, verboseOption, gpuOption } from '../../sharedOptions/index.js';
+import { networkOption, portOption, rpcOption, walletOption, verboseOption, gpuOption } from '../sharedOptions/index.js';
 export * from './action.js';
 export const startNodeCommand = new Command('start')
     .description('Start Nosana Node')
@@ -8,9 +8,6 @@ export const startNodeCommand = new Command('start')
     .addOption(networkOption)
     .addOption(rpcOption)
     .addOption(walletOption)
-    .addOption(new Option('--provider <provider>', 'provider used to run the job')
-    .choices(['docker', 'podman'])
-    .default('podman'))
     .addOption(new Option('--docker, --podman <URI>', 'Podman/Docker connection URI').default('~/.nosana/podman/podman.sock'))
     .addOption(new Option('-c, --config <path>', 'Config path (to store the flows database and other config)').default('~/.nosana/'))
     .addOption(gpuOption)

package/dist/cli/createNosanaCli.d.ts

@@ -1,2 +1,5 @@
 import { Command } from 'commander';
+export * from './commands/run/command.js';
+export * from './commands/start/command.js';
+export * from './commands/prune/command.js';
 export declare const createNosanaCLI: (version: string) => Command;

package/dist/cli/createNosanaCli.js

@@ -1,12 +1,17 @@
 import { Command, Option } from 'commander';
-import { nodeCommand } from './node/index.js';
-import { addressCommand } from './address/command.js';
+import { addressCommand } from './commands/address/command.js';
 import { OUTPUT_EVENTS } from '../output-formatter/outputEvents.js';
 import { outputFormatArgumentParser } from '../output-formatter/outputFormatArgumentParser.js';
 import { outputFormatSelector } from '../output-formatter/outputFormatSelector.js';
 import { setSDK } from '../NodeManager/sdk/index.js';
 import { configs } from '../NodeManager/configs/configs.js';
 import { NodeConfigsSingleton } from '../NodeManager/configs/NodeConfigs.js';
+import { runNodeCommand } from './commands/run/command.js';
+import { startNodeCommand } from './commands/start/command.js';
+import { nodePruneCommand } from './commands/prune/command.js';
+export * from './commands/run/command.js';
+export * from './commands/start/command.js';
+export * from './commands/prune/command.js';
 export const createNosanaCLI = (version) => new Command()
     .name('nosana-node')
     .description('Nosana Node')
@@ -28,5 +33,7 @@ export const createNosanaCLI = (version) => new Command()
     .addOption(new Option('--log <logLevel>', 'Log level')
     .default('debug')
     .choices(['info', 'none', 'debug', 'trace']))
-    .addCommand(nodeCommand)
+    .addCommand(nodePruneCommand)
+    .addCommand(runNodeCommand)
+    .addCommand(startNodeCommand)
     .addCommand(addressCommand);

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env -S node --no-warnings
 /// <reference path="../src/global.d.ts" />
-export * from './cli/node/index.js';
+export * from './cli/createNosanaCli.js';

package/dist/index.js

@@ -4,4 +4,4 @@ import { pkg } from './static/index.js';
 import { startCLI } from './cli/index.js';
 const VERSION = pkg.version;
 startCLI(VERSION);
-export * from './cli/node/index.js';
+export * from './cli/createNosanaCli.js';

package/npm-shrinkwrap.json

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

package/dist/cli/node/__tests__/index.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/cli/node/__tests__/index.spec.js

@@ -1,10 +0,0 @@
-import { nodeCommand } from '../';
-describe('nodeCommand', () => {
-    it('should have only three commands', () => {
-        expect(nodeCommand.commands.length).toBe(3);
-    });
-    it.each([['run'], ['start'], ['prune']])('should contain %s command', (command) => {
-        // @ts-ignore
-        expect(nodeCommand.commands.map((command) => command._name)).toContain(command);
-    });
-});

package/dist/cli/node/index.d.ts

@@ -1,5 +0,0 @@
-import { Command } from 'commander';
-export * from './run/command.js';
-export * from './start/command.js';
-export * from './prune/command.js';
-export declare const nodeCommand: Command;

package/dist/cli/node/index.js

@@ -1,12 +0,0 @@
-import { program } from 'commander';
-import { runNodeCommand } from './run/command.js';
-import { startNodeCommand } from './start/command.js';
-import { nodePruneCommand } from './prune/command.js';
-export * from './run/command.js';
-export * from './start/command.js';
-export * from './prune/command.js';
-export const nodeCommand = program
-    .command('node')
-    .addCommand(nodePruneCommand)
-    .addCommand(runNodeCommand)
-    .addCommand(startNodeCommand);