@nosana/node 1.0.7 → 1.0.8-rc

package/dist/package.json

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

package/dist/src/NodeManager/node/task/TaskManager.d.ts

@@ -50,6 +50,7 @@ export interface TaskLog {
 }
 export type OperationData = {
     host?: string;
+    container_ip?: string;
     endpoint?: {
         [key: string]: string;
     };
@@ -197,6 +198,7 @@ export default class TaskManager {
     setResult: (opId: string, key: string, value: any) => void;
     setResults: (opId: string, values: Record<string, any>) => void;
     setHost: (opId: string, host: string) => void;
+    setContainerIp: (opId: string, ip: string) => void;
     setDefaults: (flowId: string, project: string, jobDefinition: JobDefinition) => void;
     rehydrateEndpointsForOperation: (flowId: string, project: string, jobDefinition: JobDefinition, opId: string) => void;
     getByPath: (opId: string, path: string) => any;

package/dist/src/NodeManager/node/task/TaskManager.js

@@ -13,7 +13,7 @@ import { createDependencyMap } from './executions/createDependencyMap.js';
 import { getCurrentGroup, getCurrentGroupStatus, getGroupStatus, getOperationsStatus, getOperationStatus, } from './operations/getOperationsInfos.js';
 import { addLog, getAllLogs, getLogsByGroup, getLogsByOp, subscribe, unsubscribe, } from './loggers/logManager.js';
 import { moveTaskManagerGroupOperations } from './operations/moveTaskManagerGroupOperation.js';
-import { setResult, setResults, setHost, setDefaults, rehydrateEndpointsForOperation, getByPath, resolveLiteralsInString, interpolate, interpolateOperation, transformCollections, } from './globalStore/index.js';
+import { setResult, setResults, setHost, setDefaults, setContainerIp, rehydrateEndpointsForOperation, getByPath, resolveLiteralsInString, interpolate, interpolateOperation, transformCollections, } from './globalStore/index.js';
 import { configs } from '../../configs/configs.js';
 import { getSDK } from '../../sdk/index.js';
 export const StopReasons = {
@@ -155,6 +155,7 @@ export default class TaskManager {
         this.setResult = setResult.bind(this);
         this.setResults = setResults.bind(this);
         this.setHost = setHost.bind(this);
+        this.setContainerIp = setContainerIp.bind(this);
         this.setDefaults = setDefaults.bind(this);
         this.rehydrateEndpointsForOperation =
             rehydrateEndpointsForOperation.bind(this);

package/dist/src/NodeManager/node/task/globalStore/index.d.ts

@@ -1,6 +1,7 @@
 export { setResult } from './setResult.js';
 export { setResults } from './setResults.js';
 export { setHost } from './setHost.js';
+export { setContainerIp } from './setContainerIp.js';
 export { setDefaults, rehydrateEndpointsForOperation } from './setDefaults.js';
 export { getByPath } from './getByPath.js';
 export { resolveLiteralsInString } from './resolveLiteralsInString.js';

package/dist/src/NodeManager/node/task/globalStore/index.js

@@ -1,6 +1,7 @@
 export { setResult } from './setResult.js';
 export { setResults } from './setResults.js';
 export { setHost } from './setHost.js';
+export { setContainerIp } from './setContainerIp.js';
 export { setDefaults, rehydrateEndpointsForOperation } from './setDefaults.js';
 export { getByPath } from './getByPath.js';
 export { resolveLiteralsInString } from './resolveLiteralsInString.js';

package/dist/src/NodeManager/node/task/globalStore/setContainerIp.d.ts

@@ -0,0 +1,2 @@
+import TaskManager from '../TaskManager.js';
+export declare function setContainerIp(this: TaskManager, opId: string, internalIp: string): void;

package/dist/src/NodeManager/node/task/globalStore/setContainerIp.js

@@ -0,0 +1,9 @@
+export function setContainerIp(opId, internalIp) {
+    const op = (this.globalOpStore[opId] ??= {});
+    op.container_ip = internalIp;
+    // Host updated; attempt endpoint rehydration for this op
+    const flow = this.repository.getFlow(this.job);
+    if (flow) {
+        this.rehydrateEndpointsForOperation(flow.id, flow.project, flow.jobDefinition, opId);
+    }
+}

package/dist/src/NodeManager/node/task/operations/runTaskManagerOperation.js

@@ -136,6 +136,9 @@ export async function runTaskManagerOperation(flow, op, dependent) {
     emitter.on('updateOpHost', (body) => {
         this.setHost(op.id, body.name);
     });
+    emitter.on('setContainerInternalIp', (ip) => {
+        this.setContainerIp(op.id, ip);
+    });
     /**
      * Subscribes to the 'start' event, which marks the official beginning of an operation’s execution.
      *

package/dist/src/NodeManager/provider/Provider.js

@@ -212,7 +212,7 @@ export class Provider {
                     const resourceVolumes = await this.resourceManager.getResourceVolumes(op.args.resources ?? [], controller);
                     volumes.push(...resourceVolumes);
                 }
-                container = await this.containerOrchestration.runFlowContainer(op.args.image ?? flow.jobDefinition.global?.image, {
+                const createContainerOptions = {
                     name,
                     cmd,
                     env,
@@ -225,8 +225,22 @@ export class Provider {
                     aliases,
                     restart_policy: op.args.restart_policy,
                     runtime: op.args.trusted_execution_env
-                });
+                };
+                if (op.args.trusted_execution_env) {
+                    await this.containerOrchestration.pullImage("busybox");
+                    await this.resourceManager.images.setImage("busybox");
+                    await this.containerOrchestration.runFlowContainer("busybox", {
+                        name: `bridge-${name}`,
+                        cmd: ['sleep', 'infinity'],
+                    });
+                    createContainerOptions.bind_network_to_container = `bridge-${name}`;
+                }
+                container = await this.containerOrchestration.runFlowContainer(op.args.image ?? flow.jobDefinition.global?.image, createContainerOptions);
+                const info = await container.inspect();
                 emitter.emit('updateOpState', { providerId: container.id });
+                if (info.NetworkSettings?.Networks["NOSANA_GATEWAY"].IPAddress) {
+                    emitter.emit('setContainerInternalIp', info.NetworkSettings.Networks["NOSANA_GATEWAY"].IPAddress);
+                }
                 stateManager = new ContainerStateManager(container, controller, emitter, op.args.restart_policy);
                 await stateManager.startMonitoring();
                 if (isOpExposed(op)) {
@@ -277,8 +291,10 @@ export class Provider {
         try {
             const index = getOpStateIndex(flow.jobDefinition.ops, op.id);
             const name = flow.id + '-' + index;
-            const opContainer = await this.containerOrchestration.getContainerByName(name);
-            const frpcContainer = await this.containerOrchestration.getContainerByName('frpc-' + name);
+            const [opContainer, getSupportContainers] = await Promise.all([
+                this.containerOrchestration.getContainerByName(name),
+                this.containerOrchestration.getContainersByName([`frpc-${name}`, `bridge-${name}`]),
+            ]);
             if (opContainer) {
                 const info = await this.containerOrchestration.stopAndDeleteContainer(opContainer.id);
                 if (info) {
@@ -289,8 +305,8 @@ export class Provider {
                     });
                 }
             }
-            if (frpcContainer) {
-                await this.containerOrchestration.stopAndDeleteContainer(frpcContainer.id);
+            if (getSupportContainers) {
+                await Promise.all(getSupportContainers.map((container) => this.containerOrchestration.stopAndDeleteContainer(container.id)));
             }
             await this.containerOrchestration.deleteNetwork(name);
             if (flow.jobDefinition.ops[index]

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

@@ -1,3 +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, runtime }: RunContainerArgs, gpuOption: string): ContainerCreateOptions;
+export declare function createDockerRunOptions(image: string, { name, cmd, gpu, volumes, env, work_dir, entrypoint, aliases, restart_policy, runtime, bind_network_to_container }: RunContainerArgs, gpuOption: string): ContainerCreateOptions;

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

@@ -10,7 +10,7 @@ function parseRestartPolicy(restart_policy) {
     }
     return undefined;
 }
-export function createDockerRunOptions(image, { name, cmd, gpu, volumes, env, work_dir, entrypoint, aliases, restart_policy, runtime }, gpuOption) {
+export function createDockerRunOptions(image, { name, cmd, gpu, volumes, env, work_dir, entrypoint, aliases, restart_policy, runtime, bind_network_to_container }, gpuOption) {
     const devices = [];
     if (gpu) {
         devices.push({
@@ -37,11 +37,13 @@ export function createDockerRunOptions(image, { name, cmd, gpu, volumes, env, wo
         Image: image,
         WorkingDir: work_dir,
         Entrypoint: entrypoint,
-        NetworkingConfig: {
-            EndpointsConfig: {
-                NOSANA_GATEWAY: aliases ? { Aliases: aliases } : {},
-            },
-        },
+        ...(!bind_network_to_container ? {
+            NetworkingConfig: {
+                EndpointsConfig: {
+                    NOSANA_GATEWAY: aliases ? { Aliases: aliases } : {},
+                },
+            }
+        } : {}),
         HostConfig: {
             ExtraHosts: [
                 'host.docker.internal:8.8.8.8',
@@ -53,7 +55,7 @@ export function createDockerRunOptions(image, { name, cmd, gpu, volumes, env, wo
                 Type: 'volume',
                 ReadOnly: readonly || false,
             })),
-            NetworkMode: 'bridge',
+            NetworkMode: bind_network_to_container ? bind_network_to_container : 'bridge',
             DeviceRequests: devices,
             ...(runtime === 'SEV-SNP' ? {
                 Devices: [

package/dist/src/NodeManager/provider/containerOrchestration/interface.d.ts

@@ -22,6 +22,7 @@ export type RunContainerArgs = {
     restart_policy?: RestartPolicy;
     aliases?: string[] | undefined;
     runtime?: string;
+    bind_network_to_container?: string;
 };
 export interface ContainerOrchestrationInterface {
     teeRuntime?: string;

package/npm-shrinkwrap.json

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