@oceanprotocol/lib 7.0.0-next.9 → 8.0.1

package/dist/types/@types/Provider.d.ts

@@ -118,3 +118,19 @@ export declare const PROTOCOL_COMMANDS: {
     GET_LOGS: string;
     JOBS: string;
 };
+export interface NodeLogsParams {
+    logId?: string;
+    startTime?: string;
+    endTime?: string;
+    maxLogs?: number;
+    moduleName?: string;
+    level?: string;
+    page?: number;
+}
+export interface NodeLogEntry {
+    timestamp: string;
+    level: string;
+    moduleName: string;
+    message: string;
+    meta?: Record<string, any>;
+}

package/dist/types/services/providers/BaseProvider.d.ts

@@ -1,6 +1,6 @@
 import { type Multiaddr } from '@multiformats/multiaddr';
 import { Signer } from 'ethers';
-import { StorageObject, FileInfo, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ComputeEnvironment, ComputeResultStream, ProviderInitialize, ProviderComputeInitializeResults, ServiceEndpoint, UserCustomParameters, ComputeResourceRequest, ComputeJobMetadata, PolicyServerInitializeCommand, PolicyServerPassthroughCommand, dockerRegistryAuth, DownloadResponse, NodeStatus, NodeComputeJob } from '../../@types/index.js';
+import { StorageObject, FileInfo, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ComputeEnvironment, ComputeResultStream, ProviderInitialize, ProviderComputeInitializeResults, ServiceEndpoint, UserCustomParameters, ComputeResourceRequest, ComputeJobMetadata, PolicyServerInitializeCommand, PolicyServerPassthroughCommand, dockerRegistryAuth, DownloadResponse, NodeStatus, NodeComputeJob, NodeLogsParams, NodeLogEntry } from '../../@types/index.js';
 import { type DDO, type ValidateMetadata } from '@oceanprotocol/ddo-js';
 import { type P2PConfig } from './P2pProvider.js';
 export { OCEAN_P2P_PROTOCOL, type P2PConfig } from './P2pProvider.js';
@@ -18,7 +18,7 @@ export declare class BaseProvider {
     getFileInfo(file: StorageObject, nodeUri: string | Multiaddr[], withChecksum?: boolean, signal?: AbortSignal): Promise<FileInfo[]>;
     getComputeEnvironments(nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<ComputeEnvironment[]>;
     initialize(did: string, serviceId: string, fileIndex: number, consumerAddress: string, nodeUri: string | Multiaddr[], signal?: AbortSignal, userCustomParameters?: UserCustomParameters, computeEnv?: string, validUntil?: number): Promise<ProviderInitialize>;
-    initializeCompute(assets: ComputeAsset[], algorithm: ComputeAlgorithm, computeEnv: string, token: string, validUntil: number, nodeUri: string | Multiaddr[], consumerAddress: string, resources: ComputeResourceRequest[], chainId: number, policyServer?: any, signal?: AbortSignal): Promise<ProviderComputeInitializeResults>;
+    initializeCompute(assets: ComputeAsset[], algorithm: ComputeAlgorithm, computeEnv: string, token: string, validUntil: number, nodeUri: string | Multiaddr[], consumerAddress: string, resources: ComputeResourceRequest[], chainId: number, policyServer?: any, signal?: AbortSignal, queueMaxWaitTime?: number, dockerRegistryAuthData?: dockerRegistryAuth, output?: ComputeOutput): Promise<ProviderComputeInitializeResults>;
     getDownloadUrl(did: string, serviceId: string, fileIndex: number, transferTxId: string, nodeUri: string | Multiaddr[], signerOrAuthToken: Signer | string, policyServer?: any, userCustomParameters?: UserCustomParameters): Promise<string | DownloadResponse>;
     computeStart(nodeUri: string | Multiaddr[], signerOrAuthToken: Signer | string, computeEnv: string, datasets: ComputeAsset[], algorithm: ComputeAlgorithm, maxJobDuration: number, token: string, resources: ComputeResourceRequest[], chainId: number, metadata?: ComputeJobMetadata, additionalViewers?: string[], output?: ComputeOutput, policyServer?: any, signal?: AbortSignal, queueMaxWaitTime?: number, dockerRegistryAuth?: dockerRegistryAuth): Promise<ComputeJob | ComputeJob[]>;
     freeComputeStart(nodeUri: string | Multiaddr[], signerOrAuthToken: Signer | string, computeEnv: string, datasets: ComputeAsset[], algorithm: ComputeAlgorithm, resources?: ComputeResourceRequest[], metadata?: ComputeJobMetadata, additionalViewers?: string[], output?: ComputeOutput, policyServer?: any, signal?: AbortSignal, queueMaxWaitTime?: number, dockerRegistryAuth?: dockerRegistryAuth): Promise<ComputeJob | ComputeJob[]>;
@@ -28,6 +28,7 @@ export declare class BaseProvider {
     getComputeResultUrl(nodeUri: string | Multiaddr[], signerOrAuthToken: Signer | string, jobId: string, index: number): Promise<string>;
     getComputeResult(nodeUri: string | Multiaddr[], signerOrAuthToken: Signer | string, jobId: string, index: number, offset?: number): Promise<ComputeResultStream>;
     generateAuthToken(consumer: Signer, nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<string>;
+    generateSignedAuthToken(address: string, signature: string, nonce: string, nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<string>;
     invalidateAuthToken(consumer: Signer, token: string, nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<{
         success: boolean;
     }>;
@@ -36,15 +37,21 @@ export declare class BaseProvider {
     isValidProvider(url: string | Multiaddr[], signal?: AbortSignal): Promise<boolean>;
     PolicyServerPassthrough(nodeUri: string | Multiaddr[], request: PolicyServerPassthroughCommand, signal?: AbortSignal): Promise<any>;
     initializePSVerification(nodeUri: string | Multiaddr[], request: PolicyServerInitializeCommand, signal?: AbortSignal): Promise<any>;
-    downloadNodeLogs(nodeUri: string | Multiaddr[], signer: Signer, startTime: string, endTime: string, maxLogs?: number, moduleName?: string, level?: string, page?: number, signal?: AbortSignal): Promise<any>;
+    downloadNodeLogs(nodeUri: string | Multiaddr[], signer: Signer, startTime: string, endTime: string, maxLogs?: number, moduleName?: string, level?: string, page?: number, signal?: AbortSignal): Promise<NodeLogEntry[]>;
     getNodeStatus(nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<NodeStatus>;
     getNodeJobs(nodeUri: string | Multiaddr[], fromTimestamp?: number, signal?: AbortSignal): Promise<NodeComputeJob[]>;
     setupP2P(config: P2PConfig): Promise<void>;
-    getDiscoveredNodes(): Array<{
+    getLibp2pNode(): import("libp2p").Libp2p<import("@libp2p/interface").ServiceMap>;
+    getDiscoveredNodes(): Promise<Array<{
         peerId: string;
         multiaddrs: string[];
-    }>;
+    }>>;
     getMultiaddrFromPeerId(peerId: string): Promise<string>;
+    /**
+     * Fetch node logs via P2P with a pre-signed payload.
+     * For auto-signed log fetching (HTTP or P2P), use downloadNodeLogs().
+     */
+    fetchNodeLogs(nodeUri: string | Multiaddr[], address: string, signature: string, nonce: string, logParams?: NodeLogsParams): Promise<NodeLogEntry[]>;
     fetchConfig(nodeUri: string | Multiaddr[], payload: Record<string, any>): Promise<any>;
     pushConfig(nodeUri: string | Multiaddr[], payload: Record<string, any>): Promise<any>;
 }

package/dist/types/services/providers/HttpProvider.d.ts

@@ -1,5 +1,5 @@
 import { Signer } from 'ethers';
-import { StorageObject, FileInfo, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ComputeEnvironment, ProviderInitialize, ProviderComputeInitializeResults, ServiceEndpoint, UserCustomParameters, ComputeResourceRequest, ComputeJobMetadata, PolicyServerInitializeCommand, PolicyServerPassthroughCommand, dockerRegistryAuth, ComputeResultStream, NodeStatus, NodeComputeJob } from '../../@types/index.js';
+import { StorageObject, FileInfo, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ComputeEnvironment, ProviderInitialize, ProviderComputeInitializeResults, ServiceEndpoint, UserCustomParameters, ComputeResourceRequest, ComputeJobMetadata, PolicyServerInitializeCommand, PolicyServerPassthroughCommand, dockerRegistryAuth, ComputeResultStream, NodeStatus, NodeComputeJob, NodeLogEntry } from '../../@types/index.js';
 import { type DDO, type ValidateMetadata } from '@oceanprotocol/ddo-js';
 export declare class HttpProvider {
     protected getConsumerAddress(s: Signer | string): Promise<string>;
@@ -106,7 +106,7 @@ export declare class HttpProvider {
      * @param {dockerRegistryAuth} dockerRegistryAuth Docker registry authentication data.
      * @return {Promise<ProviderComputeInitialize>} ProviderComputeInitialize data
      */
-    initializeCompute(assets: ComputeAsset[], algorithm: ComputeAlgorithm, computeEnv: string, token: string, validUntil: number, nodeUri: string, consumerAddress: string, resources: ComputeResourceRequest[], chainId: number, policyServer?: any, signal?: AbortSignal): Promise<ProviderComputeInitializeResults>;
+    initializeCompute(assets: ComputeAsset[], algorithm: ComputeAlgorithm, computeEnv: string, token: string, validUntil: number, nodeUri: string, consumerAddress: string, resources: ComputeResourceRequest[], chainId: number, policyServer?: any, signal?: AbortSignal, queueMaxWaitTime?: number, dockerRegistryAuthData?: dockerRegistryAuth, output?: ComputeOutput): Promise<ProviderComputeInitializeResults>;
     /**
      * Gets the download URL.
      * @param {string} did - The DID.
@@ -238,7 +238,7 @@ export declare class HttpProvider {
      * @param {AbortSignal} [signal] - An optional abort signal.
      * @returns {Promise<any>} The logs response body stream.
      */
-    downloadNodeLogs(nodeUri: string, signer: Signer, startTime: string, endTime: string, maxLogs?: number, moduleName?: string, level?: string, page?: number, signal?: AbortSignal): Promise<any>;
+    downloadNodeLogs(nodeUri: string, signer: Signer, startTime: string, endTime: string, maxLogs?: number, moduleName?: string, level?: string, page?: number, signal?: AbortSignal): Promise<NodeLogEntry[]>;
     private noZeroX;
     private zeroXTransformer;
     private inputMatch;

package/dist/types/services/providers/P2pProvider.d.ts

@@ -1,9 +1,15 @@
-import { type Libp2pOptions } from 'libp2p';
+import { type Libp2p, type Libp2pOptions } from 'libp2p';
 import { type Multiaddr } from '@multiformats/multiaddr';
 import { Signer } from 'ethers';
 import { StorageObject, FileInfo, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ComputeEnvironment, ProviderInitialize, ProviderComputeInitializeResults, UserCustomParameters, ComputeResourceRequest, ComputeJobMetadata, PolicyServerInitializeCommand, PolicyServerPassthroughCommand, dockerRegistryAuth, DownloadResponse, ComputeResultStream, NodeStatus, NodeComputeJob } from '../../@types/index.js';
+import { NodeLogsParams, NodeLogEntry } from '../../@types/Provider.js';
 import { type DDO, type ValidateMetadata } from '@oceanprotocol/ddo-js';
 export declare const OCEAN_P2P_PROTOCOL = "/ocean/nodes/1.0.0";
+/**
+ * Optional request payload sent as LP frames after the command JSON; ends with an empty LP frame.
+ * This mirrors ocean-node's `p2pStreamBody` mechanism introduced for true streaming uploads.
+ */
+export type P2PRequestBodyStream = AsyncIterable<Uint8Array | ArrayBufferView | string>;
 export interface P2PConfig {
     /**
      * Bootstrap peer multiaddrs for DHT peer discovery.
@@ -35,11 +41,12 @@ export interface P2PConfig {
      * Unset fields keep ocean.js defaults.
      */
     libp2p?: Partial<Libp2pOptions>;
+    /** Additional roles to be marked. Will be used in the future */
+    additionalRoles?: string[];
 }
 export declare class P2pProvider {
     private p2pConfig;
     private libp2pNode;
-    private discoveredNodes;
     /**
      * Configure the internal libp2p node used for P2P transport.
      * Call this once before making P2P requests, e.g.:
@@ -50,12 +57,15 @@ export declare class P2pProvider {
      */
     setupP2P(config: P2PConfig): Promise<void>;
     getMultiaddrFromPeerId(peerId: string): Promise<string>;
-    /** Returns all peers discovered via mDNS or DHT bootstrap. */
-    getDiscoveredNodes(): Array<{
+    /** Returns the underlying libp2p node instance, or null if P2P is not initialized. */
+    getLibp2pNode(): Libp2p | null;
+    /** Returns all peers known to the peerStore (discovered via bootstrap, DHT, or connections). */
+    getDiscoveredNodes(): Promise<Array<{
         peerId: string;
         multiaddrs: string[];
-    }>;
+    }>>;
     private bufToHex;
+    private handleProtocolCommands;
     private getOrCreateLibp2pNode;
     private toUint8Array;
     private isDialable;
@@ -103,7 +113,7 @@ export declare class P2pProvider {
      * Initializes compute request via P2P. No auth required -- the node only
      * validates parameters and applies rate limits.
      */
-    initializeCompute(assets: ComputeAsset[], algorithm: ComputeAlgorithm, computeEnv: string, token: string, validUntil: number, nodeUri: string | Multiaddr[], consumerAddress: string, resources: ComputeResourceRequest[], chainId: number, policyServer?: any, signal?: AbortSignal): Promise<ProviderComputeInitializeResults>;
+    initializeCompute(assets: ComputeAsset[], algorithm: ComputeAlgorithm, computeEnv: string, token: string, validUntil: number, nodeUri: string | Multiaddr[], consumerAddress: string, resources: ComputeResourceRequest[], chainId: number, policyServer?: any, signal?: AbortSignal, queueMaxWaitTime?: number, dockerRegistryAuthData?: dockerRegistryAuth, output?: ComputeOutput): Promise<ProviderComputeInitializeResults>;
     /**
      * Sends a DOWNLOAD command to the peer via P2P, reads the binary stream
      * directly from the lpStream, and returns a DownloadResponse.
@@ -137,9 +147,13 @@ export declare class P2pProvider {
     getComputeResult(nodeUri: string | Multiaddr[], signerOrAuthToken: Signer | string, jobId: string, index: number, offset?: number): Promise<ComputeResultStream>;
     getComputeResultUrl(nodeUri: string | Multiaddr[], signerOrAuthToken: Signer | string, jobId: string, index: number): Promise<string>;
     /**
-     * Generate an auth token via P2P.
+     * Generate an auth token via P2P (auto-signs with Signer).
      */
     generateAuthToken(consumer: Signer, nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<string>;
+    /**
+     * Generate an auth token from a pre-signed request (no Signer needed).
+     */
+    generateSignedAuthToken(address: string, signature: string, nonce: string, nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<string>;
     /**
      * Resolve a DDO by DID via P2P GET_DDO command.
      */
@@ -169,7 +183,12 @@ export declare class P2pProvider {
     /**
      * Download node logs via P2P.
      */
-    downloadNodeLogs(nodeUri: string | Multiaddr[], signer: Signer, startTime: string, endTime: string, maxLogs?: number, moduleName?: string, level?: string, page?: number, signal?: AbortSignal): Promise<any>;
+    downloadNodeLogs(nodeUri: string | Multiaddr[], signer: Signer, startTime: string, endTime: string, maxLogs?: number, moduleName?: string, level?: string, page?: number, signal?: AbortSignal): Promise<NodeLogEntry[]>;
+    /**
+     * Fetch node logs via P2P with a pre-signed payload.
+     * P2P only — use downloadNodeLogs() for the auto-signed variant.
+     */
+    fetchNodeLogs(nodeUri: string | Multiaddr[], address: string, signature: string, nonce: string, logParams?: NodeLogsParams): Promise<NodeLogEntry[]>;
     /**
      * Fetch node configuration via P2P. Accepts a pre-signed payload —
      * the caller is responsible for nonce retrieval and signing.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "7.0.0-next.9",
+  "version": "8.0.1",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.cjs",
   "umd:main": "dist/lib.umd.js",
@@ -65,7 +65,7 @@
     "web3": "^1.8.0"
   },
   "dependencies": {
-    "@oceanprotocol/ddo-js": "^0.1.4",
+    "@oceanprotocol/ddo-js": "^0.3.0",
     "@oasisprotocol/sapphire-paratime": "^1.3.2",
     "bignumber.js": "^9.3.1",
     "cross-fetch": "^4.0.0",
@@ -103,7 +103,7 @@
     "c8": "^10.1.3",
     "chai": "^6.2.2",
     "chai-spies": "^1.0.0",
-    "cross-env": "^7.0.3",
+    "cross-env": "^10.1.0",
     "eslint": "^8.23.1",
     "eslint-config-oceanprotocol": "^2.0.3",
     "eslint-config-prettier": "^10.1.5",