Skip to content

getFile: return proper type #1267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexcos20 merged 3 commits into from
Mar 18, 2026
Merged

getFile: return proper type #1267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
113bac6
return proper type
alexcos20 Mar 17, 2026
42d8b2c
more refactor
alexcos20 Mar 17, 2026
5c5dc77
make sure that we always have checksum
alexcos20 Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 8 additions & 19 deletions src/components/core/compute/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
import { OceanNode } from '../../../OceanNode.js'
import { AlgoChecksums } from '../../../@types/C2D/C2D.js'
import { OceanNodeConfig } from '../../../@types/OceanNode.js'
import {
ArweaveFileObject,
IpfsFileObject,
UrlFileObject
} from '../../../@types/fileObject.js'
import { StorageObject } from '../../../@types/fileObject.js'
import { getFile } from '../../../utils/file.js'
import urlJoin from 'url-join'
import { fetchFileMetadata } from '../../../utils/asset.js'
import { Storage } from '../../storage/index.js'

import { CORE_LOGGER } from '../../../utils/logging/common.js'
import { createHash } from 'crypto'
Expand Down Expand Up @@ -44,18 +39,12 @@ export async function getAlgoChecksums(
}
const fileArray = await getFile(algoDDO, algoServiceId, oceanNode)
for (const file of fileArray) {
const url =
file.type === 'url'
? (file as UrlFileObject).url
: file.type === 'arweave'
? urlJoin(config.arweaveGateway, (file as ArweaveFileObject).transactionId)
: file.type === 'ipfs'
? urlJoin(config.ipfsGateway, (file as IpfsFileObject).hash)
: null
const headers = file.type === 'url' ? (file as UrlFileObject).headers : undefined

const { contentChecksum } = await fetchFileMetadata(url, 'get', false, headers)
checksums.files = checksums.files.concat(contentChecksum)
const storage = Storage.getStorageClass(file as StorageObject, config)
const fileInfo = await storage.fetchSpecificFileMetadata(
file as StorageObject,
true // force checksum
)
checksums.files = checksums.files.concat(fileInfo.checksum)
}

const ddoInstance = DDOManager.getDDOClass(algoDDO)
Expand Down
9 changes: 2 additions & 7 deletions src/utils/file.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import {
ArweaveFileObject,
EncryptMethod,
IpfsFileObject,
UrlFileObject
} from '../@types/fileObject.js'
import { StorageObject, EncryptMethod } from '../@types/fileObject.js'
import { OceanNode } from '../OceanNode.js'
import { FindDdoHandler } from '../components/core/handler/ddoHandler.js'
import { AssetUtils } from './asset.js'
Expand All @@ -16,7 +11,7 @@ export async function getFile(
didOrDdo: string | DDO,
serviceId: string,
node: OceanNode
): Promise<UrlFileObject[] | ArweaveFileObject[] | IpfsFileObject[]> {
): Promise<StorageObject[]> {
try {
// 1. Get the DDO
const ddo =
Expand Down
Loading