dsh-dl-server 0.1.0 → 0.2.0

package/lib/tools.js

@@ -111,14 +111,15 @@ export function registerTools({ ctx, queue, config }) {
           additionalProperties: false,
         },
         async execute(args) {
+          const health = queue.health()
           if (args?.id) {
             const job = queue.get(args.id)
             return job
-              ? { ok: true, count: 1, jobs: [job] }
+              ? { ok: true, count: 1, jobs: [job], ...health }
               : { ok: false, code: 'not-found', message: `${args.id} does not exist` }
           }
           const jobs = queue.list()
-          return { ok: true, count: jobs.length, jobs }
+          return { ok: true, count: jobs.length, jobs, ...health }
         },
       })
 

package/lib/transport.js

@@ -16,10 +16,13 @@ import { randomBytes } from 'node:crypto'
  * @typedef {object} TransferOptions
  * @property {string[]} urls            candidate sources, tried in order
  * @property {string} destPath          absolute final file path
- * @property {number} [connections]     aria2 split, default 16
+ * @property {number} [connections]     aria2 split for a large file, default 16
+ * @property {number} [connectionsCap]  upper bound when the size picks the count
+ * @property {boolean} [preferDirect]   skip aria2 for this job
  * @property {number} [speedLimitKbps]  0 or absent means unlimited
  * @property {string} [proxy]           e.g. http://127.0.0.1:65532
  * @property {number} [bytesDone]       resume hint for the direct channel
+ * @property {(url: string, ok: boolean) => void} [onUrlResult]
  * @property {(done: number, total: number) => void} [onProgress]
  * @property {AbortSignal} [signal]
  *
@@ -28,6 +31,28 @@ import { randomBytes } from 'node:crypto'
  * @property {number} total             -1 when the server never reported one
  */
 
+/** Below this, aria2's setup cost exceeds any segmentation gain. */
+export const SMALL_FILE_BYTES = 1 * 1024 * 1024
+/** From this size up, extra connections pay for themselves. */
+export const LARGE_FILE_BYTES = 8 * 1024 * 1024
+
+/**
+ * Decide the channel and the number of connections from the file size.
+ *
+ * Segmentation only helps once `min-split-size=1M` can produce several pieces,
+ * and too many connections on a per-IP-throttled host hurts rather than helps.
+ * @param {number} sizeBytes
+ * @param {number} [cap]
+ * @returns {{ connections: number, direct: boolean }}
+ */
+export function planTransfer(sizeBytes, cap = 16) {
+  if (!Number.isFinite(sizeBytes) || sizeBytes <= 0) return { connections: Math.min(cap, 8), direct: false }
+  if (sizeBytes < SMALL_FILE_BYTES) return { connections: 1, direct: true }
+  if (sizeBytes < LARGE_FILE_BYTES) return { connections: Math.min(4, cap), direct: false }
+  return { connections: cap, direct: false }
+}
+
+
 const IS_WIN = process.platform === 'win32'
 const ARIA2_BIN = IS_WIN ? 'aria2c.exe' : 'aria2c'
 
@@ -222,9 +247,17 @@ export class Transport {
 
   /** @param {TransferOptions} options @returns {Promise<TransferResult>} */
   async transfer(options) {
-    if (this.mode === 'aria2' && this.rpc) {
+    const urls = options.urls
+    const declared = await this.#probeSize(urls, options.signal)
+    const plan = planTransfer(declared, options.connectionsCap ?? options.connections ?? this.config.connectionsPerJob ?? 16)
+    const connections = options.connections ?? plan.connections
+    const useAria2 = this.mode === 'aria2' && this.rpc && !options.preferDirect && !plan.direct
+
+    if (useAria2) {
       try {
-        return await this.#transferAria2(options)
+        const result = await this.#transferAria2({ ...options, connections })
+        options.onUrlResult?.(urls[0], true)
+        return result
       } catch (error) {
         if (options.signal?.aborted) throw error
         this.log('warn', `aria2 transfer failed, retrying single-stream: ${error.message}`)
@@ -233,6 +266,35 @@ export class Transport {
     return this.#transferDirect(options)
   }
 
+  /**
+   * Best-effort Content-Length lookup. A failure is not an error: unknown size
+   * only means the planner falls back to its middle-of-the-road setting.
+   * @param {string[]} urls
+   * @param {AbortSignal} [signal]
+   * @returns {Promise<number>} the size, or -1 when it could not be determined
+   */
+  async #probeSize(urls, signal) {
+    const url = urls[0]
+    if (!url) return -1
+    const controller = new AbortController()
+    const timer = setTimeout(() => controller.abort(), 5000)
+    timer.unref?.()
+    const onAbort = () => controller.abort()
+    signal?.addEventListener('abort', onAbort, { once: true })
+
+    try {
+      const response = await fetch(url, { method: 'HEAD', signal: controller.signal })
+      if (!response.ok) return -1
+      const length = Number(response.headers.get('content-length') ?? 0)
+      return Number.isFinite(length) && length > 0 ? length : -1
+    } catch {
+      return -1
+    } finally {
+      clearTimeout(timer)
+      signal?.removeEventListener('abort', onAbort)
+    }
+  }
+
   /** @param {TransferOptions} options */
   async #transferAria2({ urls, destPath, connections, speedLimitKbps, onProgress, signal }) {
     const rpc = this.rpc
@@ -284,7 +346,7 @@ export class Transport {
   }
 
   /** @param {TransferOptions} options */
-  async #transferDirect({ urls, destPath, bytesDone = 0, onProgress, signal }) {
+  async #transferDirect({ urls, destPath, bytesDone = 0, onProgress, onUrlResult, signal }) {
     await fs.mkdir(path.dirname(destPath), { recursive: true })
     const partPath = `${destPath}.part`
     let lastError
@@ -326,10 +388,12 @@ export class Transport {
         await pipeline(source, sink)
         onProgress?.(written, total)
         await fs.rename(partPath, destPath)
+        onUrlResult?.(url, true)
         return { bytes: written, total }
       } catch (error) {
         if (error?.name === 'AbortError' || signal?.aborted) throw error
         lastError = error
+        onUrlResult?.(url, false)
       }
     }
     throw lastError ?? new Error('no source available')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-dl-server",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "DLS — DSH Download Server: a global, session-aware, persistent download queue for DeepSeek Harness.",
   "type": "module",
   "main": "lib/index.js",
@@ -14,7 +14,7 @@
     "cordis.patch.yml",
     "LICENSE",
     "README.md",
-    "README.en.md"
+    "README.zh.md"
   ],
   "keywords": [
     "deepseek-harness",
@@ -37,18 +37,27 @@
     "url": "https://github.com/Jestions-dev/dsh-download-server/issues"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=20",
+    "dsh": ">=0.2.1-rc.1 <0.3.0-0"
   },
   "scripts": {
     "test": "node --test",
     "check": "node --check lib/index.js && node --check lib/domain.js && node --check lib/types.js"
   },
   "dependencies": {
-    "@deepseek-ai/cordis": "~4.1.0",
-    "@deepseek-ai/dsh-storage": "^0.2.2-rc.1",
-    "@deepseek-ai/dsh-storage-domain": "^0.2.2-rc.1",
     "zod": "^4.4.3"
   },
+  "peerDependencies": {
+    "@deepseek-ai/dsh-storage-domain": ">=0.2.0-rc.1 <0.3.0-0"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-storage-domain": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@deepseek-ai/dsh-storage-domain": "^0.2.2-rc.1"
+  },
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"