@oceanprotocol/lib 7.0.0-next.11 → 7.0.0-next.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib.cjs +1 -1
- package/dist/lib.module.mjs +3 -3
- package/dist/lib.umd.js +1 -1
- package/dist/types/@types/Provider.d.ts +16 -0
- package/dist/types/services/providers/BaseProvider.d.ts +8 -2
- package/dist/types/services/providers/HttpProvider.d.ts +2 -2
- package/dist/types/services/providers/P2pProvider.d.ts +12 -2
- package/package.json +1 -1
|
@@ -118,3 +118,19 @@ export declare const PROTOCOL_COMMANDS: {
|
|
|
118
118
|
GET_LOGS: string;
|
|
119
119
|
JOBS: string;
|
|
120
120
|
};
|
|
121
|
+
export interface NodeLogsParams {
|
|
122
|
+
logId?: string;
|
|
123
|
+
startTime?: string;
|
|
124
|
+
endTime?: string;
|
|
125
|
+
maxLogs?: number;
|
|
126
|
+
moduleName?: string;
|
|
127
|
+
level?: string;
|
|
128
|
+
page?: number;
|
|
129
|
+
}
|
|
130
|
+
export interface NodeLogEntry {
|
|
131
|
+
timestamp: string;
|
|
132
|
+
level: string;
|
|
133
|
+
moduleName: string;
|
|
134
|
+
message: string;
|
|
135
|
+
meta?: Record<string, any>;
|
|
136
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type Multiaddr } from '@multiformats/multiaddr';
|
|
2
2
|
import { Signer } from 'ethers';
|
|
3
|
-
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';
|
|
3
|
+
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';
|
|
4
4
|
import { type DDO, type ValidateMetadata } from '@oceanprotocol/ddo-js';
|
|
5
5
|
import { type P2PConfig } from './P2pProvider.js';
|
|
6
6
|
export { OCEAN_P2P_PROTOCOL, type P2PConfig } from './P2pProvider.js';
|
|
@@ -28,6 +28,7 @@ export declare class BaseProvider {
|
|
|
28
28
|
getComputeResultUrl(nodeUri: string | Multiaddr[], signerOrAuthToken: Signer | string, jobId: string, index: number): Promise<string>;
|
|
29
29
|
getComputeResult(nodeUri: string | Multiaddr[], signerOrAuthToken: Signer | string, jobId: string, index: number, offset?: number): Promise<ComputeResultStream>;
|
|
30
30
|
generateAuthToken(consumer: Signer, nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<string>;
|
|
31
|
+
generateSignedAuthToken(address: string, signature: string, nonce: string, nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<string>;
|
|
31
32
|
invalidateAuthToken(consumer: Signer, token: string, nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<{
|
|
32
33
|
success: boolean;
|
|
33
34
|
}>;
|
|
@@ -36,7 +37,7 @@ export declare class BaseProvider {
|
|
|
36
37
|
isValidProvider(url: string | Multiaddr[], signal?: AbortSignal): Promise<boolean>;
|
|
37
38
|
PolicyServerPassthrough(nodeUri: string | Multiaddr[], request: PolicyServerPassthroughCommand, signal?: AbortSignal): Promise<any>;
|
|
38
39
|
initializePSVerification(nodeUri: string | Multiaddr[], request: PolicyServerInitializeCommand, signal?: AbortSignal): Promise<any>;
|
|
39
|
-
downloadNodeLogs(nodeUri: string | Multiaddr[], signer: Signer, startTime: string, endTime: string, maxLogs?: number, moduleName?: string, level?: string, page?: number, signal?: AbortSignal): Promise<
|
|
40
|
+
downloadNodeLogs(nodeUri: string | Multiaddr[], signer: Signer, startTime: string, endTime: string, maxLogs?: number, moduleName?: string, level?: string, page?: number, signal?: AbortSignal): Promise<NodeLogEntry[]>;
|
|
40
41
|
getNodeStatus(nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<NodeStatus>;
|
|
41
42
|
getNodeJobs(nodeUri: string | Multiaddr[], fromTimestamp?: number, signal?: AbortSignal): Promise<NodeComputeJob[]>;
|
|
42
43
|
setupP2P(config: P2PConfig): Promise<void>;
|
|
@@ -46,6 +47,11 @@ export declare class BaseProvider {
|
|
|
46
47
|
multiaddrs: string[];
|
|
47
48
|
}>>;
|
|
48
49
|
getMultiaddrFromPeerId(peerId: string): Promise<string>;
|
|
50
|
+
/**
|
|
51
|
+
* Fetch node logs via P2P with a pre-signed payload.
|
|
52
|
+
* For auto-signed log fetching (HTTP or P2P), use downloadNodeLogs().
|
|
53
|
+
*/
|
|
54
|
+
fetchNodeLogs(nodeUri: string | Multiaddr[], address: string, signature: string, nonce: string, logParams?: NodeLogsParams): Promise<NodeLogEntry[]>;
|
|
49
55
|
fetchConfig(nodeUri: string | Multiaddr[], payload: Record<string, any>): Promise<any>;
|
|
50
56
|
pushConfig(nodeUri: string | Multiaddr[], payload: Record<string, any>): Promise<any>;
|
|
51
57
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Signer } from 'ethers';
|
|
2
|
-
import { StorageObject, FileInfo, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ComputeEnvironment, ProviderInitialize, ProviderComputeInitializeResults, ServiceEndpoint, UserCustomParameters, ComputeResourceRequest, ComputeJobMetadata, PolicyServerInitializeCommand, PolicyServerPassthroughCommand, dockerRegistryAuth, ComputeResultStream, NodeStatus, NodeComputeJob } from '../../@types/index.js';
|
|
2
|
+
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';
|
|
3
3
|
import { type DDO, type ValidateMetadata } from '@oceanprotocol/ddo-js';
|
|
4
4
|
export declare class HttpProvider {
|
|
5
5
|
protected getConsumerAddress(s: Signer | string): Promise<string>;
|
|
@@ -238,7 +238,7 @@ export declare class HttpProvider {
|
|
|
238
238
|
* @param {AbortSignal} [signal] - An optional abort signal.
|
|
239
239
|
* @returns {Promise<any>} The logs response body stream.
|
|
240
240
|
*/
|
|
241
|
-
downloadNodeLogs(nodeUri: string, signer: Signer, startTime: string, endTime: string, maxLogs?: number, moduleName?: string, level?: string, page?: number, signal?: AbortSignal): Promise<
|
|
241
|
+
downloadNodeLogs(nodeUri: string, signer: Signer, startTime: string, endTime: string, maxLogs?: number, moduleName?: string, level?: string, page?: number, signal?: AbortSignal): Promise<NodeLogEntry[]>;
|
|
242
242
|
private noZeroX;
|
|
243
243
|
private zeroXTransformer;
|
|
244
244
|
private inputMatch;
|
|
@@ -2,6 +2,7 @@ import { type Libp2p, type Libp2pOptions } from 'libp2p';
|
|
|
2
2
|
import { type Multiaddr } from '@multiformats/multiaddr';
|
|
3
3
|
import { Signer } from 'ethers';
|
|
4
4
|
import { StorageObject, FileInfo, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ComputeEnvironment, ProviderInitialize, ProviderComputeInitializeResults, UserCustomParameters, ComputeResourceRequest, ComputeJobMetadata, PolicyServerInitializeCommand, PolicyServerPassthroughCommand, dockerRegistryAuth, DownloadResponse, ComputeResultStream, NodeStatus, NodeComputeJob } from '../../@types/index.js';
|
|
5
|
+
import { NodeLogsParams, NodeLogEntry } from '../../@types/Provider.js';
|
|
5
6
|
import { type DDO, type ValidateMetadata } from '@oceanprotocol/ddo-js';
|
|
6
7
|
export declare const OCEAN_P2P_PROTOCOL = "/ocean/nodes/1.0.0";
|
|
7
8
|
export interface P2PConfig {
|
|
@@ -138,9 +139,13 @@ export declare class P2pProvider {
|
|
|
138
139
|
getComputeResult(nodeUri: string | Multiaddr[], signerOrAuthToken: Signer | string, jobId: string, index: number, offset?: number): Promise<ComputeResultStream>;
|
|
139
140
|
getComputeResultUrl(nodeUri: string | Multiaddr[], signerOrAuthToken: Signer | string, jobId: string, index: number): Promise<string>;
|
|
140
141
|
/**
|
|
141
|
-
* Generate an auth token via P2P.
|
|
142
|
+
* Generate an auth token via P2P (auto-signs with Signer).
|
|
142
143
|
*/
|
|
143
144
|
generateAuthToken(consumer: Signer, nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<string>;
|
|
145
|
+
/**
|
|
146
|
+
* Generate an auth token from a pre-signed request (no Signer needed).
|
|
147
|
+
*/
|
|
148
|
+
generateSignedAuthToken(address: string, signature: string, nonce: string, nodeUri: string | Multiaddr[], signal?: AbortSignal): Promise<string>;
|
|
144
149
|
/**
|
|
145
150
|
* Resolve a DDO by DID via P2P GET_DDO command.
|
|
146
151
|
*/
|
|
@@ -170,7 +175,12 @@ export declare class P2pProvider {
|
|
|
170
175
|
/**
|
|
171
176
|
* Download node logs via P2P.
|
|
172
177
|
*/
|
|
173
|
-
downloadNodeLogs(nodeUri: string | Multiaddr[], signer: Signer, startTime: string, endTime: string, maxLogs?: number, moduleName?: string, level?: string, page?: number, signal?: AbortSignal): Promise<
|
|
178
|
+
downloadNodeLogs(nodeUri: string | Multiaddr[], signer: Signer, startTime: string, endTime: string, maxLogs?: number, moduleName?: string, level?: string, page?: number, signal?: AbortSignal): Promise<NodeLogEntry[]>;
|
|
179
|
+
/**
|
|
180
|
+
* Fetch node logs via P2P with a pre-signed payload.
|
|
181
|
+
* P2P only — use downloadNodeLogs() for the auto-signed variant.
|
|
182
|
+
*/
|
|
183
|
+
fetchNodeLogs(nodeUri: string | Multiaddr[], address: string, signature: string, nonce: string, logParams?: NodeLogsParams): Promise<NodeLogEntry[]>;
|
|
174
184
|
/**
|
|
175
185
|
* Fetch node configuration via P2P. Accepts a pre-signed payload —
|
|
176
186
|
* the caller is responsible for nonce retrieval and signing.
|
package/package.json
CHANGED