@platforma-sdk/block-tools 2.4.6 → 2.4.8

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../src/v2/registry/registry_reader.ts","../src/io/folder_reader.ts"],"sourcesContent":["import {\n  BlockPackId,\n  BlockPackIdNoVersion,\n  blockPackIdNoVersionEquals,\n  BlockPackManifest,\n  BlockPackMetaEmbeddedBytes,\n  BlockPackMetaManifest,\n  BlockPackOverview,\n  SingleBlockPackOverview\n} from '@milaboratories/pl-model-middle-layer';\nimport { FolderReader } from '../../io';\nimport canonicalize from 'canonicalize';\nimport {\n  GlobalOverviewFileName,\n  GlobalOverviewReg,\n  MainPrefix,\n  ManifestFileName,\n  packageContentPrefixInsideV2,\n  packageOverviewPathInsideV2\n} from './schema_public';\nimport { BlockComponentsAbsoluteUrl, BlockPackMetaEmbedBytes } from '../model';\nimport { LRUCache } from 'lru-cache';\nimport { calculateSha256 } from '../../util';\n\nexport type BlockPackOverviewNoRegLabel = Omit<BlockPackOverview, 'registryId'>;\nexport type SingleBlockPackOverviewNoRegLabel = Omit<SingleBlockPackOverview, 'registryId'>;\n\nexport type RegistryV2ReaderOps = {\n  /** Number of milliseconds to cache retrieved block list for */\n  cacheBlockListFor: number;\n  /** Number of milliseconds to keep cached retrieved block list for, if new requests returns error */\n  keepStaleBlockListFor: number;\n};\n\nconst DefaultRegistryV2ReaderOps: RegistryV2ReaderOps = {\n  cacheBlockListFor: 45e3, // 45 seconds\n  keepStaleBlockListFor: 300e3 // 5 minutes\n};\n\nexport class RegistryV2Reader {\n  private readonly v2RootFolderReader: FolderReader;\n  private readonly ops: RegistryV2ReaderOps;\n\n  constructor(\n    private readonly registryReader: FolderReader,\n    ops?: Partial<RegistryV2ReaderOps>\n  ) {\n    this.v2RootFolderReader = registryReader.relativeReader(MainPrefix);\n    this.ops = { ...DefaultRegistryV2ReaderOps, ...(ops ?? {}) };\n  }\n\n  /**\n   * Embeds meta infromation relative to registry root.\n   * Meta information that looks like:\n   *\n   * */\n  private readonly embeddedGlobalMetaCache = new LRUCache<\n    string,\n    BlockPackMetaEmbeddedBytes,\n    { meta: BlockPackMetaManifest; relativeTo?: BlockPackId }\n  >({\n    max: 500,\n    fetchMethod: async (_key, _staleValue, options) => {\n      const contentReader =\n        options.context.relativeTo !== undefined\n          ? this.v2RootFolderReader\n              .relativeReader(packageContentPrefixInsideV2(options.context.relativeTo))\n              .getContentReader()\n          : this.v2RootFolderReader.getContentReader();\n      return await BlockPackMetaEmbedBytes(contentReader).parseAsync(options.context.meta);\n    }\n  });\n\n  private async embedMetaContent(\n    id: BlockPackId,\n    sha256: string,\n    absolutePath: boolean,\n    meta: BlockPackMetaManifest\n  ): Promise<BlockPackMetaEmbeddedBytes> {\n    return await this.embeddedGlobalMetaCache.forceFetch(\n      canonicalize({ id, sha256, absolutePath })!,\n      { context: { meta, relativeTo: absolutePath ? undefined : id } }\n    );\n  }\n\n  private listCacheTimestamp: number = 0;\n  private listCache: BlockPackOverviewNoRegLabel[] | undefined = undefined;\n\n  public async listBlockPacks(): Promise<BlockPackOverviewNoRegLabel[]> {\n    if (\n      this.listCache !== undefined &&\n      Date.now() - this.listCacheTimestamp <= this.ops.cacheBlockListFor\n    )\n      return this.listCache;\n    try {\n      // const rootContentReader = this.v2RootFolderReader.getContentReader();\n      const globalOverview = GlobalOverviewReg.parse(\n        JSON.parse(\n          Buffer.from(await this.v2RootFolderReader.readFile(GlobalOverviewFileName)).toString()\n        )\n      );\n\n      const result = await Promise.all(\n        globalOverview.packages.map(async (p) => {\n          const byChannelEntries = await Promise.all(\n            Object.entries(p.latestByChannel).map(async ([channel, data]) => [\n              channel,\n              {\n                id: data.description.id,\n                meta: await this.embedMetaContent(\n                  p.latest.id,\n                  p.latestManifestSha256,\n                  true,\n                  p.latest.meta\n                ),\n                spec: {\n                  type: 'from-registry-v2',\n                  id: p.latest.id,\n                  registryUrl: this.registryReader.rootUrl.toString(),\n                  channel\n                }\n              }\n            ])\n          );\n          return {\n            id: p.id,\n            latestByChannel: Object.fromEntries(byChannelEntries),\n            allVersions: p.allVersionsWithChannels\n          } satisfies BlockPackOverviewNoRegLabel;\n        })\n      );\n\n      this.listCache = result;\n      this.listCacheTimestamp = Date.now();\n\n      return result;\n    } catch (e: unknown) {\n      if (\n        this.listCache !== undefined &&\n        Date.now() - this.listCacheTimestamp <= this.ops.keepStaleBlockListFor\n      )\n        return this.listCache;\n      throw e;\n    }\n  }\n\n  public async getLatestOverview(\n    id: BlockPackIdNoVersion,\n    channel: string\n  ): Promise<SingleBlockPackOverviewNoRegLabel | undefined> {\n    const overview = (await this.listBlockPacks()).find((e) =>\n      blockPackIdNoVersionEquals(id, e.id)\n    );\n    if (overview === undefined) return undefined;\n    return overview.latestByChannel[channel];\n  }\n\n  public async getSpecificOverview(id: BlockPackId): Promise<SingleBlockPackOverviewNoRegLabel> {\n    const overviewContent = await this.v2RootFolderReader.readFile(packageOverviewPathInsideV2(id));\n    const overview = BlockPackManifest.parse(JSON.parse(Buffer.from(overviewContent).toString()));\n    return {\n      id: id,\n      meta: await this.embedMetaContent(\n        id,\n        await calculateSha256(overviewContent),\n        false,\n        overview.description.meta\n      ),\n      spec: {\n        type: 'from-registry-v2',\n        id,\n        registryUrl: this.registryReader.rootUrl.toString()\n      }\n    };\n  }\n\n  private readonly componentsCache = new LRUCache<string, BlockComponentsAbsoluteUrl, BlockPackId>({\n    max: 500,\n    fetchMethod: async (key, staleValue, { context: id }) => {\n      const packageFolderReader = this.v2RootFolderReader.relativeReader(\n        packageContentPrefixInsideV2(id)\n      );\n      const manifest = BlockPackManifest.parse(\n        JSON.parse(Buffer.from(await packageFolderReader.readFile(ManifestFileName)).toString())\n      );\n      return BlockComponentsAbsoluteUrl(packageFolderReader.rootUrl.toString()).parse(\n        manifest.description.components\n      );\n    }\n  });\n\n  public async getComponents(id: BlockPackId): Promise<BlockComponentsAbsoluteUrl> {\n    return await this.componentsCache.forceFetch(canonicalize(id)!, { context: id });\n  }\n}\n","import { Agent, Dispatcher, request } from 'undici';\nimport { RelativeContentReader } from '../v2';\nimport path from 'node:path';\nimport pathPosix from 'node:path/posix';\nimport fsp from 'node:fs/promises';\n\nexport interface FolderReader {\n  readonly rootUrl: URL;\n  relativeReader(relativePath: string): FolderReader;\n  readFile(file: string): Promise<Buffer>;\n  getContentReader(relativePath?: string): RelativeContentReader;\n}\n\nclass HttpFolderReader implements FolderReader {\n  constructor(\n    public readonly rootUrl: URL,\n    private readonly httpDispatcher: Dispatcher\n  ) {}\n\n  public async readFile(file: string): Promise<Buffer> {\n    const targetUrl = new URL(file, this.rootUrl);\n    const response = await request(targetUrl, {\n      dispatcher: this.httpDispatcher\n    });\n    return Buffer.from(await response.body.arrayBuffer());\n  }\n\n  public relativeReader(relativePath: string): HttpFolderReader {\n    if (!relativePath.endsWith('/')) relativePath = relativePath + '/';\n    return new HttpFolderReader(new URL(relativePath, this.rootUrl), this.httpDispatcher);\n  }\n\n  public getContentReader(relativePath?: string): RelativeContentReader {\n    let reader: HttpFolderReader = this;\n    if (relativePath !== undefined) reader = reader.relativeReader(relativePath);\n    return (path) => reader.readFile(path);\n  }\n}\n\nclass FSFolderReader implements FolderReader {\n  constructor(\n    public readonly rootUrl: URL,\n    private readonly root: string\n  ) {}\n\n  public async readFile(file: string): Promise<Buffer> {\n    const targetPath = path.join(this.root, ...file.split(pathPosix.sep));\n    return await fsp.readFile(targetPath);\n  }\n\n  public relativeReader(relativePath: string): FSFolderReader {\n    if (!relativePath.endsWith('/')) relativePath = relativePath + '/';\n    return new FSFolderReader(\n      new URL(relativePath, this.rootUrl),\n      path.join(this.root, ...relativePath.split(pathPosix.sep))\n    );\n  }\n\n  public getContentReader(relativePath?: string): RelativeContentReader {\n    let reader: FSFolderReader = this;\n    if (relativePath !== undefined) reader = reader.relativeReader(relativePath);\n    return (path) => reader.readFile(path);\n  }\n}\n\nfunction posixToLocalPath(p: string): string {\n  return p.split(pathPosix.sep).join(path.sep);\n}\n\nfunction localToPosix(p: string): string {\n  return p.split(path.sep).join(pathPosix.sep);\n}\n\nexport function folderReaderByUrl(address: string, httpDispatcher?: Dispatcher): FolderReader {\n  if (!address.endsWith('/')) address = address + '/';\n  const url = new URL(address, `file:${localToPosix(path.resolve('.'))}/`);\n  switch (url.protocol) {\n    case 'file:':\n      const rootPath = posixToLocalPath(url.pathname);\n      return new FSFolderReader(url, rootPath);\n    case 'https:':\n    case 'http:':\n      return new HttpFolderReader(url, httpDispatcher ?? new Agent());\n    default:\n      throw new Error(`Unknown protocol: ${url.protocol}`);\n  }\n}\n"],"names":["DefaultRegistryV2ReaderOps","RegistryV2Reader","registryReader","ops","__publicField","LRUCache","_key","_staleValue","options","contentReader","packageContentPrefixInsideV2","BlockPackMetaEmbedBytes","key","staleValue","id","packageFolderReader","manifest","BlockPackManifest","ManifestFileName","BlockComponentsAbsoluteUrl","MainPrefix","sha256","absolutePath","meta","canonicalize","globalOverview","GlobalOverviewReg","GlobalOverviewFileName","result","p","byChannelEntries","channel","data","overview","e","blockPackIdNoVersionEquals","overviewContent","packageOverviewPathInsideV2","calculateSha256","HttpFolderReader","rootUrl","httpDispatcher","file","targetUrl","response","request","relativePath","reader","path","FSFolderReader","root","targetPath","pathPosix","fsp","posixToLocalPath","localToPosix","folderReaderByUrl","address","url","rootPath","Agent"],"mappings":"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"}
+{"version":3,"file":"index.mjs","sources":["../src/v2/registry/registry_reader.ts","../src/io/folder_reader.ts"],"sourcesContent":["import {\n  BlockPackId,\n  BlockPackIdNoVersion,\n  blockPackIdNoVersionEquals,\n  BlockPackManifest,\n  BlockPackMetaEmbeddedBytes,\n  BlockPackMetaManifest,\n  BlockPackOverview,\n  SingleBlockPackOverview\n} from '@milaboratories/pl-model-middle-layer';\nimport { FolderReader } from '../../io';\nimport canonicalize from 'canonicalize';\nimport {\n  GlobalOverviewFileName,\n  GlobalOverviewReg,\n  MainPrefix,\n  ManifestFileName,\n  ManifestSuffix,\n  packageContentPrefixInsideV2\n} from './schema_public';\nimport { BlockComponentsAbsoluteUrl, BlockPackMetaEmbedBytes } from '../model';\nimport { LRUCache } from 'lru-cache';\nimport { calculateSha256 } from '../../util';\nimport { retry, Retry2TimesWithDelay } from '@milaboratories/ts-helpers';\n\nexport type BlockPackOverviewNoRegLabel = Omit<BlockPackOverview, 'registryId'>;\n\nexport type RegistryV2ReaderOps = {\n  /** Number of milliseconds to cache retrieved block list for */\n  cacheBlockListFor: number;\n  /** Number of milliseconds to keep cached retrieved block list for, if new requests returns error */\n  keepStaleBlockListFor: number;\n};\n\nconst DefaultRegistryV2ReaderOps: RegistryV2ReaderOps = {\n  cacheBlockListFor: 45e3, // 45 seconds\n  keepStaleBlockListFor: 300e3 // 5 minutes\n};\n\nexport class RegistryV2Reader {\n  private readonly v2RootFolderReader: FolderReader;\n  private readonly ops: RegistryV2ReaderOps;\n\n  constructor(\n    private readonly registryReader: FolderReader,\n    ops?: Partial<RegistryV2ReaderOps>\n  ) {\n    this.v2RootFolderReader = registryReader.relativeReader(MainPrefix);\n    this.ops = { ...DefaultRegistryV2ReaderOps, ...(ops ?? {}) };\n  }\n\n  /**\n   * Embeds meta infromation relative to registry root.\n   * Meta information that looks like:\n   *\n   * */\n  private readonly embeddedGlobalMetaCache = new LRUCache<\n    string,\n    BlockPackMetaEmbeddedBytes,\n    { meta: BlockPackMetaManifest; relativeTo?: BlockPackId }\n  >({\n    max: 500,\n    fetchMethod: async (_key, _staleValue, options) =>\n      await retry(async () => {\n        const contentReader =\n          options.context.relativeTo !== undefined\n            ? this.v2RootFolderReader\n                .relativeReader(packageContentPrefixInsideV2(options.context.relativeTo))\n                .getContentReader()\n            : this.v2RootFolderReader.getContentReader();\n        return await BlockPackMetaEmbedBytes(contentReader).parseAsync(options.context.meta);\n      }, Retry2TimesWithDelay)\n  });\n\n  private async embedMetaContent(\n    id: BlockPackId,\n    sha256: string,\n    absolutePath: boolean,\n    meta: BlockPackMetaManifest\n  ): Promise<BlockPackMetaEmbeddedBytes> {\n    return await this.embeddedGlobalMetaCache.forceFetch(\n      canonicalize({ id, sha256, absolutePath })!,\n      { context: { meta, relativeTo: absolutePath ? undefined : id } }\n    );\n  }\n\n  private listCacheTimestamp: number = 0;\n  private listCache: BlockPackOverviewNoRegLabel[] | undefined = undefined;\n\n  public async listBlockPacks(): Promise<BlockPackOverviewNoRegLabel[]> {\n    if (\n      this.listCache !== undefined &&\n      Date.now() - this.listCacheTimestamp <= this.ops.cacheBlockListFor\n    )\n      return this.listCache;\n    try {\n      return await retry(async () => {\n        // const rootContentReader = this.v2RootFolderReader.getContentReader();\n        const globalOverview = GlobalOverviewReg.parse(\n          JSON.parse(\n            Buffer.from(await this.v2RootFolderReader.readFile(GlobalOverviewFileName)).toString()\n          )\n        );\n\n        const result = await Promise.all(\n          globalOverview.packages.map(async (p) => {\n            const byChannelEntries = await Promise.all(\n              Object.entries(p.latestByChannel).map(async ([channel, data]) => [\n                channel,\n                {\n                  id: data.description.id,\n                  meta: await this.embedMetaContent(\n                    p.latest.id,\n                    p.latestManifestSha256,\n                    true,\n                    p.latest.meta\n                  ),\n                  spec: {\n                    type: 'from-registry-v2',\n                    id: p.latest.id,\n                    registryUrl: this.registryReader.rootUrl.toString(),\n                    channel\n                  }\n                }\n              ])\n            );\n            return {\n              id: p.id,\n              latestByChannel: Object.fromEntries(byChannelEntries),\n              allVersions: p.allVersionsWithChannels\n            } satisfies BlockPackOverviewNoRegLabel;\n          })\n        );\n\n        this.listCache = result;\n        this.listCacheTimestamp = Date.now();\n\n        return result;\n      }, Retry2TimesWithDelay);\n    } catch (e: unknown) {\n      if (\n        this.listCache !== undefined &&\n        Date.now() - this.listCacheTimestamp <= this.ops.keepStaleBlockListFor\n      )\n        return this.listCache;\n      throw e;\n    }\n  }\n\n  public async getLatestOverview(\n    id: BlockPackIdNoVersion,\n    channel: string\n  ): Promise<SingleBlockPackOverview | undefined> {\n    return await retry(async () => {\n      const overview = (await this.listBlockPacks()).find((e) =>\n        blockPackIdNoVersionEquals(id, e.id)\n      );\n      if (overview === undefined) return undefined;\n      return overview.latestByChannel[channel];\n    }, Retry2TimesWithDelay);\n  }\n\n  public async getSpecificOverview(\n    id: BlockPackId,\n    channel: string\n  ): Promise<SingleBlockPackOverview> {\n    return await retry(async () => {\n      const manifestContent = await this.v2RootFolderReader.readFile(\n        packageContentPrefixInsideV2(id) + ManifestSuffix\n      );\n      const overview = BlockPackManifest.parse(JSON.parse(Buffer.from(manifestContent).toString()));\n      return {\n        id: id,\n        meta: await this.embedMetaContent(\n          id,\n          await calculateSha256(manifestContent),\n          false,\n          overview.description.meta\n        ),\n        spec: {\n          type: 'from-registry-v2',\n          id,\n          registryUrl: this.registryReader.rootUrl.toString(),\n          channel\n        }\n      };\n    }, Retry2TimesWithDelay);\n  }\n\n  private readonly componentsCache = new LRUCache<string, BlockComponentsAbsoluteUrl, BlockPackId>({\n    max: 500,\n    fetchMethod: async (key, staleValue, { context: id }) =>\n      await retry(async () => {\n        const packageFolderReader = this.v2RootFolderReader.relativeReader(\n          packageContentPrefixInsideV2(id)\n        );\n        const manifest = BlockPackManifest.parse(\n          JSON.parse(Buffer.from(await packageFolderReader.readFile(ManifestFileName)).toString())\n        );\n        return BlockComponentsAbsoluteUrl(packageFolderReader.rootUrl.toString()).parse(\n          manifest.description.components\n        );\n      }, Retry2TimesWithDelay)\n  });\n\n  public async getComponents(id: BlockPackId): Promise<BlockComponentsAbsoluteUrl> {\n    return await this.componentsCache.forceFetch(canonicalize(id)!, { context: id });\n  }\n}\n","import { Dispatcher, request } from 'undici';\nimport { RelativeContentReader } from '../v2';\nimport path from 'node:path';\nimport pathPosix from 'node:path/posix';\nimport fsp from 'node:fs/promises';\nimport { defaultHttpDispatcher } from '@milaboratories/pl-http';\n\nexport interface FolderReader {\n  readonly rootUrl: URL;\n  relativeReader(relativePath: string): FolderReader;\n  readFile(file: string): Promise<Buffer>;\n  getContentReader(relativePath?: string): RelativeContentReader;\n}\n\nclass HttpFolderReader implements FolderReader {\n  constructor(\n    public readonly rootUrl: URL,\n    private readonly httpDispatcher: Dispatcher\n  ) {}\n\n  public async readFile(file: string): Promise<Buffer> {\n    const targetUrl = new URL(file, this.rootUrl);\n    const response = await request(targetUrl, {\n      dispatcher: this.httpDispatcher\n    });\n    return Buffer.from(await response.body.arrayBuffer());\n  }\n\n  public relativeReader(relativePath: string): HttpFolderReader {\n    if (!relativePath.endsWith('/')) relativePath = relativePath + '/';\n    return new HttpFolderReader(new URL(relativePath, this.rootUrl), this.httpDispatcher);\n  }\n\n  public getContentReader(relativePath?: string): RelativeContentReader {\n    let reader: HttpFolderReader = this;\n    if (relativePath !== undefined) reader = reader.relativeReader(relativePath);\n    return (path) => reader.readFile(path);\n  }\n}\n\nclass FSFolderReader implements FolderReader {\n  constructor(\n    public readonly rootUrl: URL,\n    private readonly root: string\n  ) {}\n\n  public async readFile(file: string): Promise<Buffer> {\n    const targetPath = path.join(this.root, ...file.split(pathPosix.sep));\n    return await fsp.readFile(targetPath);\n  }\n\n  public relativeReader(relativePath: string): FSFolderReader {\n    if (!relativePath.endsWith('/')) relativePath = relativePath + '/';\n    return new FSFolderReader(\n      new URL(relativePath, this.rootUrl),\n      path.join(this.root, ...relativePath.split(pathPosix.sep))\n    );\n  }\n\n  public getContentReader(relativePath?: string): RelativeContentReader {\n    let reader: FSFolderReader = this;\n    if (relativePath !== undefined) reader = reader.relativeReader(relativePath);\n    return (path) => reader.readFile(path);\n  }\n}\n\nfunction posixToLocalPath(p: string): string {\n  return p.split(pathPosix.sep).join(path.sep);\n}\n\nfunction localToPosix(p: string): string {\n  return p.split(path.sep).join(pathPosix.sep);\n}\n\nexport function folderReaderByUrl(address: string, httpDispatcher?: Dispatcher): FolderReader {\n  if (!address.endsWith('/')) address = address + '/';\n  const url = new URL(address, `file:${localToPosix(path.resolve('.'))}/`);\n  switch (url.protocol) {\n    case 'file:':\n      const rootPath = posixToLocalPath(url.pathname);\n      return new FSFolderReader(url, rootPath);\n    case 'https:':\n    case 'http:':\n      return new HttpFolderReader(url, httpDispatcher ?? defaultHttpDispatcher());\n    default:\n      throw new Error(`Unknown protocol: ${url.protocol}`);\n  }\n}\n"],"names":["DefaultRegistryV2ReaderOps","RegistryV2Reader","registryReader","ops","__publicField","LRUCache","_key","_staleValue","options","retry","contentReader","packageContentPrefixInsideV2","BlockPackMetaEmbedBytes","Retry2TimesWithDelay","key","staleValue","id","packageFolderReader","manifest","BlockPackManifest","ManifestFileName","BlockComponentsAbsoluteUrl","MainPrefix","sha256","absolutePath","meta","canonicalize","globalOverview","GlobalOverviewReg","GlobalOverviewFileName","result","p","byChannelEntries","channel","data","overview","e","blockPackIdNoVersionEquals","manifestContent","ManifestSuffix","calculateSha256","HttpFolderReader","rootUrl","httpDispatcher","file","targetUrl","response","request","relativePath","reader","path","FSFolderReader","root","targetPath","pathPosix","fsp","posixToLocalPath","localToPosix","folderReaderByUrl","address","url","rootPath","defaultHttpDispatcher"],"mappings":";;;;;;;;;;;;;;;;;;AAkCA,MAAMA,IAAkD;AAAA,EACtD,mBAAmB;AAAA;AAAA,EACnB,uBAAuB;AAAA;AACzB;AAEO,MAAMC,GAAiB;AAAA,EAI5B,YACmBC,GACjBC,GACA;AANe,IAAAC,EAAA;AACA,IAAAA,EAAA;AAeA;AAAA;AAAA;AAAA;AAAA;AAAA,IAAAA,EAAA,iCAA0B,IAAIC,EAI7C;AAAA,MACA,KAAK;AAAA,MACL,aAAa,OAAOC,GAAMC,GAAaC,MACrC,MAAMC,EAAM,YAAY;AACtB,cAAMC,IACJF,EAAQ,QAAQ,eAAe,SAC3B,KAAK,mBACF,eAAeG,EAA6BH,EAAQ,QAAQ,UAAU,CAAC,EACvE,qBACH,KAAK,mBAAmB,iBAAiB;AAC/C,eAAO,MAAMI,EAAwBF,CAAa,EAAE,WAAWF,EAAQ,QAAQ,IAAI;AAAA,MAAA,GAClFK,CAAoB;AAAA,IAAA,CAC1B;AAcO,IAAAT,EAAA,4BAA6B;AAC7B,IAAAA,EAAA;AAsGS,IAAAA,EAAA,yBAAkB,IAAIC,EAA0D;AAAA,MAC/F,KAAK;AAAA,MACL,aAAa,OAAOS,GAAKC,GAAY,EAAE,SAASC,EAAG,MACjD,MAAMP,EAAM,YAAY;AAChB,cAAAQ,IAAsB,KAAK,mBAAmB;AAAA,UAClDN,EAA6BK,CAAE;AAAA,QACjC,GACME,IAAWC,EAAkB;AAAA,UACjC,KAAK,MAAM,OAAO,KAAK,MAAMF,EAAoB,SAASG,CAAgB,CAAC,EAAE,SAAU,CAAA;AAAA,QACzF;AACA,eAAOC,EAA2BJ,EAAoB,QAAQ,SAAA,CAAU,EAAE;AAAA,UACxEC,EAAS,YAAY;AAAA,QACvB;AAAA,MAAA,GACCL,CAAoB;AAAA,IAAA,CAC1B;AA/JkB,SAAA,iBAAAX,GAGZ,KAAA,qBAAqBA,EAAe,eAAeoB,CAAU,GAClE,KAAK,MAAM,EAAE,GAAGtB,GAA4B,GAAIG,KAAO,CAAA,EAAI;AAAA,EAAA;AAAA,EA0B7D,MAAc,iBACZa,GACAO,GACAC,GACAC,GACqC;AAC9B,WAAA,MAAM,KAAK,wBAAwB;AAAA,MACxCC,EAAa,EAAE,IAAAV,GAAI,QAAAO,GAAQ,cAAAC,GAAc;AAAA,MACzC,EAAE,SAAS,EAAE,MAAAC,GAAM,YAAYD,IAAe,SAAYR,EAAK,EAAA;AAAA,IACjE;AAAA,EAAA;AAAA,EAMF,MAAa,iBAAyD;AAElE,QAAA,KAAK,cAAc,UACnB,KAAK,IAAQ,IAAA,KAAK,sBAAsB,KAAK,IAAI;AAEjD,aAAO,KAAK;AACV,QAAA;AACK,aAAA,MAAMP,EAAM,YAAY;AAE7B,cAAMkB,IAAiBC,EAAkB;AAAA,UACvC,KAAK;AAAA,YACH,OAAO,KAAK,MAAM,KAAK,mBAAmB,SAASC,CAAsB,CAAC,EAAE,SAAS;AAAA,UAAA;AAAA,QAEzF,GAEMC,IAAS,MAAM,QAAQ;AAAA,UAC3BH,EAAe,SAAS,IAAI,OAAOI,MAAM;AACjC,kBAAAC,IAAmB,MAAM,QAAQ;AAAA,cACrC,OAAO,QAAQD,EAAE,eAAe,EAAE,IAAI,OAAO,CAACE,GAASC,CAAI,MAAM;AAAA,gBAC/DD;AAAA,gBACA;AAAA,kBACE,IAAIC,EAAK,YAAY;AAAA,kBACrB,MAAM,MAAM,KAAK;AAAA,oBACfH,EAAE,OAAO;AAAA,oBACTA,EAAE;AAAA,oBACF;AAAA,oBACAA,EAAE,OAAO;AAAA,kBACX;AAAA,kBACA,MAAM;AAAA,oBACJ,MAAM;AAAA,oBACN,IAAIA,EAAE,OAAO;AAAA,oBACb,aAAa,KAAK,eAAe,QAAQ,SAAS;AAAA,oBAClD,SAAAE;AAAA,kBAAA;AAAA,gBACF;AAAA,cAEH,CAAA;AAAA,YACH;AACO,mBAAA;AAAA,cACL,IAAIF,EAAE;AAAA,cACN,iBAAiB,OAAO,YAAYC,CAAgB;AAAA,cACpD,aAAaD,EAAE;AAAA,YACjB;AAAA,UACD,CAAA;AAAA,QACH;AAEA,oBAAK,YAAYD,GACZ,KAAA,qBAAqB,KAAK,IAAI,GAE5BA;AAAA,SACNjB,CAAoB;AAAA,aAChB,GAAY;AAEjB,UAAA,KAAK,cAAc,UACnB,KAAK,IAAQ,IAAA,KAAK,sBAAsB,KAAK,IAAI;AAEjD,eAAO,KAAK;AACR,YAAA;AAAA,IAAA;AAAA,EACR;AAAA,EAGF,MAAa,kBACXG,GACAiB,GAC8C;AACvC,WAAA,MAAMxB,EAAM,YAAY;AAC7B,YAAM0B,KAAY,MAAM,KAAK,eAAkB,GAAA;AAAA,QAAK,CAACC,MACnDC,EAA2BrB,GAAIoB,EAAE,EAAE;AAAA,MACrC;AACI,UAAAD,MAAa;AACV,eAAAA,EAAS,gBAAgBF,CAAO;AAAA,OACtCpB,CAAoB;AAAA,EAAA;AAAA,EAGzB,MAAa,oBACXG,GACAiB,GACkC;AAC3B,WAAA,MAAMxB,EAAM,YAAY;AACvB,YAAA6B,IAAkB,MAAM,KAAK,mBAAmB;AAAA,QACpD3B,EAA6BK,CAAE,IAAIuB;AAAA,MACrC,GACMJ,IAAWhB,EAAkB,MAAM,KAAK,MAAM,OAAO,KAAKmB,CAAe,EAAE,SAAU,CAAA,CAAC;AACrF,aAAA;AAAA,QACL,IAAAtB;AAAA,QACA,MAAM,MAAM,KAAK;AAAA,UACfA;AAAA,UACA,MAAMwB,EAAgBF,CAAe;AAAA,UACrC;AAAA,UACAH,EAAS,YAAY;AAAA,QACvB;AAAA,QACA,MAAM;AAAA,UACJ,MAAM;AAAA,UACN,IAAAnB;AAAA,UACA,aAAa,KAAK,eAAe,QAAQ,SAAS;AAAA,UAClD,SAAAiB;AAAA,QAAA;AAAA,MAEJ;AAAA,OACCpB,CAAoB;AAAA,EAAA;AAAA,EAmBzB,MAAa,cAAcG,GAAsD;AACxE,WAAA,MAAM,KAAK,gBAAgB,WAAWU,EAAaV,CAAE,GAAI,EAAE,SAASA,GAAI;AAAA,EAAA;AAEnF;AClMA,MAAMyB,EAAyC;AAAA,EAC7C,YACkBC,GACCC,GACjB;AAFgB,SAAA,UAAAD,GACC,KAAA,iBAAAC;AAAA,EAAA;AAAA,EAGnB,MAAa,SAASC,GAA+B;AACnD,UAAMC,IAAY,IAAI,IAAID,GAAM,KAAK,OAAO,GACtCE,IAAW,MAAMC,EAAQF,GAAW;AAAA,MACxC,YAAY,KAAK;AAAA,IAAA,CAClB;AACD,WAAO,OAAO,KAAK,MAAMC,EAAS,KAAK,aAAa;AAAA,EAAA;AAAA,EAG/C,eAAeE,GAAwC;AAC5D,WAAKA,EAAa,SAAS,GAAG,UAAkBA,IAAe,MACxD,IAAIP,EAAiB,IAAI,IAAIO,GAAc,KAAK,OAAO,GAAG,KAAK,cAAc;AAAA,EAAA;AAAA,EAG/E,iBAAiBA,GAA8C;AACpE,QAAIC,IAA2B;AAC/B,WAAID,MAAiB,WAAoBC,IAAAA,EAAO,eAAeD,CAAY,IACpE,CAACE,MAASD,EAAO,SAASC,CAAI;AAAA,EAAA;AAEzC;AAEA,MAAMC,EAAuC;AAAA,EAC3C,YACkBT,GACCU,GACjB;AAFgB,SAAA,UAAAV,GACC,KAAA,OAAAU;AAAA,EAAA;AAAA,EAGnB,MAAa,SAASR,GAA+B;AAC7C,UAAAS,IAAaH,EAAK,KAAK,KAAK,MAAM,GAAGN,EAAK,MAAMU,EAAU,GAAG,CAAC;AAC7D,WAAA,MAAMC,EAAI,SAASF,CAAU;AAAA,EAAA;AAAA,EAG/B,eAAeL,GAAsC;AAC1D,WAAKA,EAAa,SAAS,GAAG,UAAkBA,IAAe,MACxD,IAAIG;AAAA,MACT,IAAI,IAAIH,GAAc,KAAK,OAAO;AAAA,MAClCE,EAAK,KAAK,KAAK,MAAM,GAAGF,EAAa,MAAMM,EAAU,GAAG,CAAC;AAAA,IAC3D;AAAA,EAAA;AAAA,EAGK,iBAAiBN,GAA8C;AACpE,QAAIC,IAAyB;AAC7B,WAAID,MAAiB,WAAoBC,IAAAA,EAAO,eAAeD,CAAY,IACpE,CAACE,MAASD,EAAO,SAASC,CAAI;AAAA,EAAA;AAEzC;AAEA,SAASM,EAAiBzB,GAAmB;AAC3C,SAAOA,EAAE,MAAMuB,EAAU,GAAG,EAAE,KAAKJ,EAAK,GAAG;AAC7C;AAEA,SAASO,EAAa1B,GAAmB;AACvC,SAAOA,EAAE,MAAMmB,EAAK,GAAG,EAAE,KAAKI,EAAU,GAAG;AAC7C;AAEgB,SAAAI,GAAkBC,GAAiBhB,GAA2C;AAC5F,EAAKgB,EAAQ,SAAS,GAAG,UAAaA,IAAU;AAC1C,QAAAC,IAAM,IAAI,IAAID,GAAS,QAAQF,EAAaP,EAAK,QAAQ,GAAG,CAAC,CAAC,GAAG;AACvE,UAAQU,EAAI,UAAU;AAAA,IACpB,KAAK;AACG,YAAAC,IAAWL,EAAiBI,EAAI,QAAQ;AACvC,aAAA,IAAIT,EAAeS,GAAKC,CAAQ;AAAA,IACzC,KAAK;AAAA,IACL,KAAK;AACH,aAAO,IAAIpB,EAAiBmB,GAAKjB,KAAkBmB,GAAuB;AAAA,IAC5E;AACE,YAAM,IAAI,MAAM,qBAAqBF,EAAI,QAAQ,EAAE;AAAA,EAAA;AAEzD;;;;;;;;;;;;;;;;"}

package/dist/io/folder_reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"folder_reader.d.ts","sourceRoot":"","sources":["../../src/io/folder_reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAW,MAAM,QAAQ,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,OAAO,CAAC;AAK9C,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC;IACtB,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,YAAY,CAAC;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACxC,gBAAgB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAC;CAChE;AA8DD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,UAAU,GAAG,YAAY,CAa5F"}
+{"version":3,"file":"folder_reader.d.ts","sourceRoot":"","sources":["../../src/io/folder_reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,OAAO,CAAC;AAM9C,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC;IACtB,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,YAAY,CAAC;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACxC,gBAAgB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAC;CAChE;AA8DD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,UAAU,GAAG,YAAY,CAa5F"}

package/dist/v2/registry/registry_reader.d.ts

@@ -2,7 +2,6 @@ import { BlockPackId, BlockPackIdNoVersion, BlockPackOverview, SingleBlockPackOv
 import { FolderReader } from '../../io';
 import { BlockComponentsAbsoluteUrl } from '../model';
 export type BlockPackOverviewNoRegLabel = Omit<BlockPackOverview, 'registryId'>;
-export type SingleBlockPackOverviewNoRegLabel = Omit<SingleBlockPackOverview, 'registryId'>;
 export type RegistryV2ReaderOps = {
     /** Number of milliseconds to cache retrieved block list for */
     cacheBlockListFor: number;
@@ -24,8 +23,8 @@ export declare class RegistryV2Reader {
     private listCacheTimestamp;
     private listCache;
     listBlockPacks(): Promise<BlockPackOverviewNoRegLabel[]>;
-    getLatestOverview(id: BlockPackIdNoVersion, channel: string): Promise<SingleBlockPackOverviewNoRegLabel | undefined>;
-    getSpecificOverview(id: BlockPackId): Promise<SingleBlockPackOverviewNoRegLabel>;
+    getLatestOverview(id: BlockPackIdNoVersion, channel: string): Promise<SingleBlockPackOverview | undefined>;
+    getSpecificOverview(id: BlockPackId, channel: string): Promise<SingleBlockPackOverview>;
     private readonly componentsCache;
     getComponents(id: BlockPackId): Promise<BlockComponentsAbsoluteUrl>;
 }

package/dist/v2/registry/registry_reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry_reader.d.ts","sourceRoot":"","sources":["../../../src/v2/registry/registry_reader.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,oBAAoB,EAKpB,iBAAiB,EACjB,uBAAuB,EACxB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAUxC,OAAO,EAAE,0BAA0B,EAA2B,MAAM,UAAU,CAAC;AAI/E,MAAM,MAAM,2BAA2B,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;AAChF,MAAM,MAAM,iCAAiC,GAAG,IAAI,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC;AAE5F,MAAM,MAAM,mBAAmB,GAAG;IAChC,+DAA+D;IAC/D,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oGAAoG;IACpG,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAC;AAOF,qBAAa,gBAAgB;IAKzB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAJjC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAe;IAClD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAsB;gBAGvB,cAAc,EAAE,YAAY,EAC7C,GAAG,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAMpC;;;;SAIK;IACL,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAerC;YAEW,gBAAgB;IAY9B,OAAO,CAAC,kBAAkB,CAAa;IACvC,OAAO,CAAC,SAAS,CAAwD;IAE5D,cAAc,IAAI,OAAO,CAAC,2BAA2B,EAAE,CAAC;IA0DxD,iBAAiB,CAC5B,EAAE,EAAE,oBAAoB,EACxB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iCAAiC,GAAG,SAAS,CAAC;IAQ5C,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,iCAAiC,CAAC;IAmB7F,OAAO,CAAC,QAAQ,CAAC,eAAe,CAa7B;IAEU,aAAa,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,0BAA0B,CAAC;CAGjF"}
+{"version":3,"file":"registry_reader.d.ts","sourceRoot":"","sources":["../../../src/v2/registry/registry_reader.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,oBAAoB,EAKpB,iBAAiB,EACjB,uBAAuB,EACxB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAUxC,OAAO,EAAE,0BAA0B,EAA2B,MAAM,UAAU,CAAC;AAK/E,MAAM,MAAM,2BAA2B,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;AAEhF,MAAM,MAAM,mBAAmB,GAAG;IAChC,+DAA+D;IAC/D,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oGAAoG;IACpG,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAC;AAOF,qBAAa,gBAAgB;IAKzB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAJjC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAe;IAClD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAsB;gBAGvB,cAAc,EAAE,YAAY,EAC7C,GAAG,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAMpC;;;;SAIK;IACL,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAgBrC;YAEW,gBAAgB;IAY9B,OAAO,CAAC,kBAAkB,CAAa;IACvC,OAAO,CAAC,SAAS,CAAwD;IAE5D,cAAc,IAAI,OAAO,CAAC,2BAA2B,EAAE,CAAC;IA4DxD,iBAAiB,CAC5B,EAAE,EAAE,oBAAoB,EACxB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAUlC,mBAAmB,CAC9B,EAAE,EAAE,WAAW,EACf,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,uBAAuB,CAAC;IAwBnC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAc7B;IAEU,aAAa,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,0BAA0B,CAAC;CAGjF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/block-tools",
-  "version": "2.4.6",
+  "version": "2.4.8",
   "description": "Utility to manipulate Platforma Blocks and Block Registry",
   "types": "./dist/lib.d.ts",
   "main": "./dist/index.js",
@@ -23,20 +23,21 @@
   ],
   "license": "UNLICENSED",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.701.0",
+    "@aws-sdk/client-s3": "^3.705.0",
     "remeda": "^2.17.4",
-    "@oclif/core": "^4.0.33",
+    "@oclif/core": "^4.0.34",
     "canonicalize": "^2.0.0",
     "lru-cache": "^11.0.2",
-    "undici": "^6.21.0",
+    "undici": "^7.1.0",
     "mime-types": "^2.1.35",
     "tar": "^7.4.3",
     "yaml": "^2.6.1",
     "zod": "^3.23.8",
-    "@milaboratories/resolve-helper": "^1.0.2",
-    "@milaboratories/ts-helpers": "^1.1.2",
+    "@milaboratories/pl-http": "^1.0.1",
     "@milaboratories/pl-model-middle-layer": "^1.6.4",
-    "@milaboratories/ts-helpers-oclif": "^1.1.11"
+    "@milaboratories/ts-helpers-oclif": "^1.1.12",
+    "@milaboratories/resolve-helper": "^1.0.2",
+    "@milaboratories/ts-helpers": "^1.1.3"
   },
   "devDependencies": {
     "typescript": "~5.5.4",
@@ -51,10 +52,10 @@
     "@types/semver": "^7.5.8",
     "jest": "^29.7.0",
     "@jest/globals": "^29.7.0",
-    "oclif": "^4.15.29",
+    "oclif": "^4.16.0",
     "ts-jest": "^29.2.5",
-    "@milaboratories/platforma-build-configs": "1.0.2",
-    "@milaboratories/oclif-index": "1.1.0"
+    "@milaboratories/oclif-index": "1.1.0",
+    "@milaboratories/platforma-build-configs": "1.0.2"
   },
   "oclif": {
     "bin": "block-tools",

package/src/io/folder_reader.ts

@@ -1,8 +1,9 @@
-import { Agent, Dispatcher, request } from 'undici';
+import { Dispatcher, request } from 'undici';
 import { RelativeContentReader } from '../v2';
 import path from 'node:path';
 import pathPosix from 'node:path/posix';
 import fsp from 'node:fs/promises';
+import { defaultHttpDispatcher } from '@milaboratories/pl-http';
 
 export interface FolderReader {
   readonly rootUrl: URL;
@@ -80,7 +81,7 @@ export function folderReaderByUrl(address: string, httpDispatcher?: Dispatcher):
       return new FSFolderReader(url, rootPath);
     case 'https:':
     case 'http:':
-      return new HttpFolderReader(url, httpDispatcher ?? new Agent());
+      return new HttpFolderReader(url, httpDispatcher ?? defaultHttpDispatcher());
     default:
       throw new Error(`Unknown protocol: ${url.protocol}`);
   }

package/src/v2/registry/registry_reader.test.ts

@@ -11,7 +11,7 @@ test('test listing packets from global registry', async () => {
   // console.dir(listing, { depth: 5 });
   expect(listing[0].allVersions.length).toBeGreaterThanOrEqual(1);
   expect(listing[0].latestByChannel[AnyChannel]).toBeDefined();
-});
+}, 20000);
 
 test('test getting components from global registry', async () => {
   const registryReader = new RegistryV2Reader(folderReaderByUrl('https://blocks.pl-open.science'));
@@ -30,4 +30,4 @@ test('test getting components from global registry', async () => {
   expect(
     (await (await request(components.workflow.main.url)).body.arrayBuffer()).byteLength
   ).toBeGreaterThan(100);
-});
+}, 20000);

package/src/v2/registry/registry_reader.ts

@@ -15,15 +15,15 @@ import {
   GlobalOverviewReg,
   MainPrefix,
   ManifestFileName,
-  packageContentPrefixInsideV2,
-  packageOverviewPathInsideV2
+  ManifestSuffix,
+  packageContentPrefixInsideV2
 } from './schema_public';
 import { BlockComponentsAbsoluteUrl, BlockPackMetaEmbedBytes } from '../model';
 import { LRUCache } from 'lru-cache';
 import { calculateSha256 } from '../../util';
+import { retry, Retry2TimesWithDelay } from '@milaboratories/ts-helpers';
 
 export type BlockPackOverviewNoRegLabel = Omit<BlockPackOverview, 'registryId'>;
-export type SingleBlockPackOverviewNoRegLabel = Omit<SingleBlockPackOverview, 'registryId'>;
 
 export type RegistryV2ReaderOps = {
   /** Number of milliseconds to cache retrieved block list for */
@@ -60,15 +60,16 @@ export class RegistryV2Reader {
     { meta: BlockPackMetaManifest; relativeTo?: BlockPackId }
   >({
     max: 500,
-    fetchMethod: async (_key, _staleValue, options) => {
-      const contentReader =
-        options.context.relativeTo !== undefined
-          ? this.v2RootFolderReader
-              .relativeReader(packageContentPrefixInsideV2(options.context.relativeTo))
-              .getContentReader()
-          : this.v2RootFolderReader.getContentReader();
-      return await BlockPackMetaEmbedBytes(contentReader).parseAsync(options.context.meta);
-    }
+    fetchMethod: async (_key, _staleValue, options) =>
+      await retry(async () => {
+        const contentReader =
+          options.context.relativeTo !== undefined
+            ? this.v2RootFolderReader
+                .relativeReader(packageContentPrefixInsideV2(options.context.relativeTo))
+                .getContentReader()
+            : this.v2RootFolderReader.getContentReader();
+        return await BlockPackMetaEmbedBytes(contentReader).parseAsync(options.context.meta);
+      }, Retry2TimesWithDelay)
   });
 
   private async embedMetaContent(
@@ -93,47 +94,49 @@ export class RegistryV2Reader {
     )
       return this.listCache;
     try {
-      // const rootContentReader = this.v2RootFolderReader.getContentReader();
-      const globalOverview = GlobalOverviewReg.parse(
-        JSON.parse(
-          Buffer.from(await this.v2RootFolderReader.readFile(GlobalOverviewFileName)).toString()
-        )
-      );
-
-      const result = await Promise.all(
-        globalOverview.packages.map(async (p) => {
-          const byChannelEntries = await Promise.all(
-            Object.entries(p.latestByChannel).map(async ([channel, data]) => [
-              channel,
-              {
-                id: data.description.id,
-                meta: await this.embedMetaContent(
-                  p.latest.id,
-                  p.latestManifestSha256,
-                  true,
-                  p.latest.meta
-                ),
-                spec: {
-                  type: 'from-registry-v2',
-                  id: p.latest.id,
-                  registryUrl: this.registryReader.rootUrl.toString(),
-                  channel
+      return await retry(async () => {
+        // const rootContentReader = this.v2RootFolderReader.getContentReader();
+        const globalOverview = GlobalOverviewReg.parse(
+          JSON.parse(
+            Buffer.from(await this.v2RootFolderReader.readFile(GlobalOverviewFileName)).toString()
+          )
+        );
+
+        const result = await Promise.all(
+          globalOverview.packages.map(async (p) => {
+            const byChannelEntries = await Promise.all(
+              Object.entries(p.latestByChannel).map(async ([channel, data]) => [
+                channel,
+                {
+                  id: data.description.id,
+                  meta: await this.embedMetaContent(
+                    p.latest.id,
+                    p.latestManifestSha256,
+                    true,
+                    p.latest.meta
+                  ),
+                  spec: {
+                    type: 'from-registry-v2',
+                    id: p.latest.id,
+                    registryUrl: this.registryReader.rootUrl.toString(),
+                    channel
+                  }
                 }
-              }
-            ])
-          );
-          return {
-            id: p.id,
-            latestByChannel: Object.fromEntries(byChannelEntries),
-            allVersions: p.allVersionsWithChannels
-          } satisfies BlockPackOverviewNoRegLabel;
-        })
-      );
-
-      this.listCache = result;
-      this.listCacheTimestamp = Date.now();
-
-      return result;
+              ])
+            );
+            return {
+              id: p.id,
+              latestByChannel: Object.fromEntries(byChannelEntries),
+              allVersions: p.allVersionsWithChannels
+            } satisfies BlockPackOverviewNoRegLabel;
+          })
+        );
+
+        this.listCache = result;
+        this.listCacheTimestamp = Date.now();
+
+        return result;
+      }, Retry2TimesWithDelay);
     } catch (e: unknown) {
       if (
         this.listCache !== undefined &&
@@ -147,46 +150,57 @@ export class RegistryV2Reader {
   public async getLatestOverview(
     id: BlockPackIdNoVersion,
     channel: string
-  ): Promise<SingleBlockPackOverviewNoRegLabel | undefined> {
-    const overview = (await this.listBlockPacks()).find((e) =>
-      blockPackIdNoVersionEquals(id, e.id)
-    );
-    if (overview === undefined) return undefined;
-    return overview.latestByChannel[channel];
+  ): Promise<SingleBlockPackOverview | undefined> {
+    return await retry(async () => {
+      const overview = (await this.listBlockPacks()).find((e) =>
+        blockPackIdNoVersionEquals(id, e.id)
+      );
+      if (overview === undefined) return undefined;
+      return overview.latestByChannel[channel];
+    }, Retry2TimesWithDelay);
   }
 
-  public async getSpecificOverview(id: BlockPackId): Promise<SingleBlockPackOverviewNoRegLabel> {
-    const overviewContent = await this.v2RootFolderReader.readFile(packageOverviewPathInsideV2(id));
-    const overview = BlockPackManifest.parse(JSON.parse(Buffer.from(overviewContent).toString()));
-    return {
-      id: id,
-      meta: await this.embedMetaContent(
-        id,
-        await calculateSha256(overviewContent),
-        false,
-        overview.description.meta
-      ),
-      spec: {
-        type: 'from-registry-v2',
-        id,
-        registryUrl: this.registryReader.rootUrl.toString()
-      }
-    };
+  public async getSpecificOverview(
+    id: BlockPackId,
+    channel: string
+  ): Promise<SingleBlockPackOverview> {
+    return await retry(async () => {
+      const manifestContent = await this.v2RootFolderReader.readFile(
+        packageContentPrefixInsideV2(id) + ManifestSuffix
+      );
+      const overview = BlockPackManifest.parse(JSON.parse(Buffer.from(manifestContent).toString()));
+      return {
+        id: id,
+        meta: await this.embedMetaContent(
+          id,
+          await calculateSha256(manifestContent),
+          false,
+          overview.description.meta
+        ),
+        spec: {
+          type: 'from-registry-v2',
+          id,
+          registryUrl: this.registryReader.rootUrl.toString(),
+          channel
+        }
+      };
+    }, Retry2TimesWithDelay);
   }
 
   private readonly componentsCache = new LRUCache<string, BlockComponentsAbsoluteUrl, BlockPackId>({
     max: 500,
-    fetchMethod: async (key, staleValue, { context: id }) => {
-      const packageFolderReader = this.v2RootFolderReader.relativeReader(
-        packageContentPrefixInsideV2(id)
-      );
-      const manifest = BlockPackManifest.parse(
-        JSON.parse(Buffer.from(await packageFolderReader.readFile(ManifestFileName)).toString())
-      );
-      return BlockComponentsAbsoluteUrl(packageFolderReader.rootUrl.toString()).parse(
-        manifest.description.components
-      );
-    }
+    fetchMethod: async (key, staleValue, { context: id }) =>
+      await retry(async () => {
+        const packageFolderReader = this.v2RootFolderReader.relativeReader(
+          packageContentPrefixInsideV2(id)
+        );
+        const manifest = BlockPackManifest.parse(
+          JSON.parse(Buffer.from(await packageFolderReader.readFile(ManifestFileName)).toString())
+        );
+        return BlockComponentsAbsoluteUrl(packageFolderReader.rootUrl.toString()).parse(
+          manifest.description.components
+        );
+      }, Retry2TimesWithDelay)
   });
 
   public async getComponents(id: BlockPackId): Promise<BlockComponentsAbsoluteUrl> {