@qvac/registry-client 0.4.0 → 0.5.0

package/NOTICE

@@ -51,42 +51,6 @@ Third-Party Model Licenses
     https://huggingface.co/personalizedrefrigerator/whisper-base-fr
   fr-tiny-ggml-model-f16
     https://huggingface.co/JaepaX/whisper-tiny-fr
-  ggml-opus-ar-en
-    https://huggingface.co/Helsinki-NLP/opus-mt-ar-en
-  ggml-opus-de-en
-    https://huggingface.co/Helsinki-NLP/opus-mt-de-en
-  ggml-opus-de-fr
-    https://huggingface.co/Helsinki-NLP/opus-mt-de-fr
-  ggml-opus-en-ar
-    https://huggingface.co/Helsinki-NLP/opus-mt-en-ar
-  ggml-opus-en-es
-    https://huggingface.co/Helsinki-NLP/opus-mt-en-es
-  ggml-opus-en-fr
-    https://huggingface.co/Helsinki-NLP/opus-mt-en-fr
-  ggml-opus-en-it
-    https://huggingface.co/Helsinki-NLP/opus-mt-en-it
-  ggml-opus-en-ru
-    https://huggingface.co/Helsinki-NLP/opus-mt-en-ru
-  ggml-opus-en-zh
-    https://huggingface.co/Helsinki-NLP/opus-mt-en-zh
-  ggml-opus-es-en
-    https://huggingface.co/Helsinki-NLP/opus-mt-es-en
-  ggml-opus-es-fr
-    https://huggingface.co/Helsinki-NLP/opus-mt-es-fr
-  ggml-opus-fr-de
-    https://huggingface.co/Helsinki-NLP/opus-mt-fr-de
-  ggml-opus-fr-en
-    https://huggingface.co/Helsinki-NLP/opus-mt-fr-en
-  ggml-opus-fr-es
-    https://huggingface.co/Helsinki-NLP/opus-mt-fr-es
-  ggml-opus-it-en
-    https://huggingface.co/Helsinki-NLP/opus-mt-it-en
-  ggml-opus-ja-en
-    https://huggingface.co/Helsinki-NLP/opus-mt-ja-en
-  ggml-opus-mt-en-roa-f16
-    https://huggingface.co/Helsinki-NLP/opus-mt-en-roa
-  ggml-opus-mt-roa-en-f16
-    https://huggingface.co/Helsinki-NLP/opus-mt-roa-en
   gpt-oss-20b-GGUF
     https://huggingface.co/unsloth/gpt-oss-20b-GGUF
   it-base-ggml-model-f16
@@ -128,17 +92,6 @@ Third-Party Model Licenses
   SmolVLM2-500M-Video-Instruct-GGUF
     https://huggingface.co/ggml-org/SmolVLM2-500M-Video-Instruct-GGUF
 
---- cc-by-4.0 (Creative Commons Attribution 4.0 International) ---
-
-  ggml-opus-en-de
-    https://huggingface.co/Helsinki-NLP/opus-mt-en-de
-  ggml-opus-en-pt
-    https://huggingface.co/Helsinki-NLP/opus-mt-tc-big-en-pt
-  ggml-opus-ru-en
-    https://huggingface.co/Helsinki-NLP/opus-mt-ru-en
-  ggml-opus-zh-en
-    https://huggingface.co/Helsinki-NLP/opus-mt-zh-en
-
 --- gemma (Gemma Terms of Use) ---
 
   embeddinggemma-300m-GGUF
@@ -202,7 +155,7 @@ Third-Party Model Licenses
   lex.50.50.enfr.s2t
     https://github.com/mozilla/firefox-translations-models/tree/main/models/base-memory/enfr
   lex.50.50.enit.s2t
-    https://github.com/mozilla/firefox-translations-models/tree/main/models/tiny/enit
+    https://github.com/mozilla/firefox-translations-models/tree/main/models/base-memory/enit
   lex.50.50.enja.s2t
     https://github.com/mozilla/firefox-translations-models/tree/main/models/base-memory/enja
   lex.50.50.enpt.s2t
@@ -212,7 +165,7 @@ Third-Party Model Licenses
   lex.50.50.enzh.s2t
     https://github.com/mozilla/firefox-translations-models/tree/main/models/base-memory/enzh
   lex.50.50.esen.s2t
-    https://github.com/mozilla/firefox-translations-models/tree/main/models/tiny/esen
+    https://github.com/mozilla/firefox-translations-models/tree/main/models/base-memory/esen
   lex.50.50.fren.s2t
     https://github.com/mozilla/firefox-translations-models/tree/main/models/base-memory/fren
   lex.50.50.iten.s2t

package/index.d.ts

@@ -46,6 +46,7 @@ export interface QVACDownloadResult {
 export interface QVACDownloadOptions {
   timeout?: number
   peerTimeout?: number
+  maxRetries?: number
   outputFile?: string
   onProgress?: (progress: { downloaded: number, total: number, cachedBlocks: number, totalBlocks: number }) => void
   signal?: AbortSignal
@@ -53,6 +54,7 @@ export interface QVACDownloadOptions {
 
 export interface QVACBlobDownloadOptions {
   timeout?: number
+  maxRetries?: number
   outputFile?: string
   onProgress?: (progress: { downloaded: number, total: number, cachedBlocks: number, totalBlocks: number }) => void
   signal?: AbortSignal
@@ -66,6 +68,7 @@ export interface QVACRegistryClientOptions {
   storage?: string
   registryCoreKey?: string
   logger?: any
+  corestoreOpts?: { wait?: boolean }
 }
 
 export interface QVACModelQuery {

package/lib/client.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const { QvacErrorRegistryClient, ERR_CODES } = require('../utils/error')
+const { withRetry } = require('../utils/retry')
 const RegistryConfig = require('./config')
 const { RegistryDatabase } = require('@qvac/registry-schema')
 const ReadyResource = require('ready-resource')
@@ -12,6 +13,9 @@ const IdEnc = require('hypercore-id-encoding')
 const path = require('#path')
 const fs = require('#fs')
 
+const DEFAULT_DOWNLOAD_MAX_RETRIES = 3
+const RETRIABLE_DOWNLOAD_CODES = ['REQUEST_TIMEOUT']
+
 class QVACRegistryClient extends ReadyResource {
   constructor (opts = {}) {
     super()
@@ -20,13 +24,13 @@ class QVACRegistryClient extends ReadyResource {
     this.registryConfig = new RegistryConfig({ logger: this.logger })
 
     this.db = null
-    this.corestore = null
     this.hyperswarm = null
     this._connectionHandler = null
     this._metadataReady = null
 
     this.storage = this.registryConfig.getRegistryStorage(opts.storage)
     this.registryCoreKey = this.registryConfig.getRegistryCoreKey(opts.registryCoreKey)
+    this.corestore = new Corestore(this.storage, opts.corestoreOpts || {})
 
     this.logger.debug('Initializing QVAC Registry Client', {
       mode: 'read',
@@ -39,8 +43,7 @@ class QVACRegistryClient extends ReadyResource {
   async _open () {
     this.logger.debug('_open called')
 
-    this.logger.debug('Creating corestore for open')
-    this.corestore = new Corestore(this.storage)
+    this.logger.debug('Opening corestore')
     await this.corestore.ready()
 
     this.logger.debug('Creating Hyperswarm for open')
@@ -53,6 +56,7 @@ class QVACRegistryClient extends ReadyResource {
     this.hyperswarm.on('connection', this._connectionHandler)
 
     this._metadataReady = this._connectMetadataCore()
+    await this._metadataReady
   }
 
   async _connectMetadataCore () {
@@ -257,7 +261,15 @@ class QVACRegistryClient extends ReadyResource {
 
       let artifact
       if (options.outputFile) {
-        await this._streamBlobToFile(blobs, core, model.blobBinding, options.outputFile, options)
+        await withRetry(
+          () => this._streamBlobToFile(blobs, core, model.blobBinding, options.outputFile, options),
+          {
+            maxRetries: options.maxRetries != null ? options.maxRetries : DEFAULT_DOWNLOAD_MAX_RETRIES,
+            retryCodes: RETRIABLE_DOWNLOAD_CODES,
+            onRetry: () => fs.promises.unlink(options.outputFile).catch(() => {}),
+            logger: this.logger
+          }
+        )
         artifact = { path: options.outputFile, totalSize }
 
         rangeDownload.destroy()
@@ -381,7 +393,15 @@ class QVACRegistryClient extends ReadyResource {
 
       let artifact
       if (options.outputFile) {
-        await this._streamBlobToFile(blobs, core, pointer, options.outputFile, options)
+        await withRetry(
+          () => this._streamBlobToFile(blobs, core, pointer, options.outputFile, options),
+          {
+            maxRetries: options.maxRetries != null ? options.maxRetries : DEFAULT_DOWNLOAD_MAX_RETRIES,
+            retryCodes: RETRIABLE_DOWNLOAD_CODES,
+            onRetry: () => fs.promises.unlink(options.outputFile).catch(() => {}),
+            logger: this.logger
+          }
+        )
         artifact = { path: options.outputFile, totalSize }
 
         rangeDownload.destroy()

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@qvac/registry-client",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "QVAC Registry client library for read-only queries via Hyperswarm",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tetherto/qvac.git",
-    "directory": "packages/qvac-lib-registry-server/client"
+    "directory": "packages/registry-server/client"
   },
   "bugs": "https://github.com/tetherto/qvac/issues",
-  "homepage": "https://github.com/tetherto/qvac/tree/main/packages/qvac-lib-registry-server/client#readme",
+  "homepage": "https://github.com/tetherto/qvac/tree/main/packages/registry-server/client#readme",
   "type": "commonjs",
   "main": "index.js",
   "bin": {
@@ -53,26 +53,32 @@
   },
   "dependencies": {
     "@qvac/error": "^0.1.0",
-    "@qvac/registry-schema": "^0.1.2",
+    "@qvac/registry-schema": "^0.2.0",
     "b4a": "^1.6.7",
     "bare-fs": "^4.5.2",
     "bare-os": "^3.6.2",
     "bare-path": "^3.0.0",
     "bare-process": "^4.2.2",
-    "corestore": "^7.4.5",
-    "hyperblobs": "^2.8.0",
     "hypercore-id-encoding": "^1.3.0",
     "hypercore-stats": "^2.4.0",
-    "hyperdb": "^4.16.1",
-    "hyperswarm": "^4.14.0",
     "hyperswarm-stats": "^1.3.0",
     "paparam": "^1.10.0",
     "ready-resource": "^1.0.1",
     "tiny-byte-size": "^1.1.0"
   },
+  "peerDependencies": {
+    "corestore": "^7.4.5",
+    "hyperblobs": "^2.8.0",
+    "hyperdb": "^4.16.1",
+    "hyperswarm": "^4.14.0"
+  },
   "devDependencies": {
     "brittle": "^3.4.0",
+    "corestore": "^7.4.5",
     "dotenv": "^17.2.3",
+    "hyperblobs": "^2.8.0",
+    "hyperdb": "^4.16.1",
+    "hyperswarm": "^4.14.0",
     "standard": "^17.1.0",
     "test-tmp": "^1.4.0",
     "typescript": "^5.9.3"

package/utils/retry.js

@@ -0,0 +1,29 @@
+'use strict'
+
+/**
+ * Executes an async function with automatic retry on specific error codes.
+ *
+ * @param {() => Promise<unknown>} fn - The async operation to attempt
+ * @param {object} opts
+ * @param {number} [opts.maxRetries=3] - Maximum number of attempts (including the first)
+ * @param {string[]} [opts.retryCodes=[]] - Error codes that trigger a retry
+ * @param {() => Promise<void>} [opts.onRetry] - Called before each retry attempt (e.g. cleanup)
+ * @param {{ warn: Function }} [opts.logger] - Logger instance for retry warnings
+ * @returns {Promise<unknown>}
+ */
+async function withRetry (fn, opts = {}) {
+  const { maxRetries = 3, retryCodes = [], onRetry, logger } = opts
+
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      return await fn()
+    } catch (err) {
+      const isRetriable = retryCodes.length > 0 && retryCodes.includes(err && err.code)
+      if (!isRetriable || attempt >= maxRetries) throw err
+      logger && logger.warn(`Retrying after ${err.code} (attempt ${attempt}/${maxRetries}): ${err.message}`)
+      if (onRetry) await onRetry()
+    }
+  }
+}
+
+module.exports = { withRetry }