bytifi 0.1.0 → 0.1.2

package/README.md

@@ -4,13 +4,15 @@ Official command-line tool for encrypting and uploading files to [Bytifi](https:
 
 ## Install
 
+### npm (all platforms)
+
 ```bash
 npm install -g bytifi
 ```
 
 Requires **Node.js 18+**.
 
-Or install from source:
+Or from source:
 
 ```bash
 git clone https://github.com/jpwcguy/Bytifi.git
@@ -18,22 +20,51 @@ cd Bytifi
 npm link
 ```
 
-## Setup
+### Windows (WinGet)
+
+```powershell
+winget install Bytifi.Bytifi
+```
+
+Or download [bytifi.exe from GitHub Releases](https://github.com/jpwcguy/Bytifi/releases/latest).
+
+### Environment variable (all platforms)
 
 ```bash
 export BYTIFI_API_KEY=usk_your_api_key_here
 ```
 
+PowerShell:
+
+```powershell
+$env:BYTIFI_API_KEY = "usk_your_api_key_here"
+```
+
 Create an API key in **Account → API** on bytifi.com.
 
+## Setup
+
+Set your API key via environment variable (see Install above) or pass `--api-key` per command.
+Prefer the environment variable — keys on the command line can appear in shell history and process lists.
+
 ## Usage
 
 ```bash
 bytifi upload ./photo.png
+bytifi upload ./photo.png --api-key usk_your_api_key_here
 bytifi upload ./photo.png --expires 60 --json
 bytifi upload ./large.iso -q
 ```
 
+Without a global install:
+
+```bash
+npx bytifi upload ./photo.png --api-key usk_your_api_key_here
+npm exec bytifi -- upload ./photo.png --api-key usk_your_api_key_here
+```
+
+Note: with `npm exec`, put `--` before the file path so npm does not swallow `--api-key`.
+
 ### Options
 
 | Flag | Description |
@@ -43,22 +74,24 @@ bytifi upload ./large.iso -q
 | `--delete-on-download` | Delete after first download |
 | `--json` | Machine-readable JSON output |
 | `-q, --quiet` | Print only the share URL |
-| `--mime-type` | Override MIME type detection |
+| `--verbose` | Print API error details to stderr |
+| `--mime-type` | Override detected MIME type |
+| `--base-url` | API base URL (default: `https://bytifi.com`) |
+
+Exit codes: `0` success, `1` usage error, `2` API error, `3` network error.
+
+JSON output (`--json`) includes `shareUrl`, `downloadUrl`, `encryptionToken`, `expiresAt`, and `token`.
+
+Files over ~100 MB encrypted use multipart upload automatically. Progress prints to stderr unless `--json` or `--quiet` is set.
 
 ## How it works
 
 1. Encrypts the file locally with AES-GCM (same format as the website)
-2. Uploads encrypted bytes via the public API
+2. Uploads encrypted bytes via the public API (parallel part uploads for large files)
 3. Prints a share URL including `#token=...`
 
-The server never receives plaintext or the decryption token.
-
 ## Development
 
 ```bash
 node bin/bytifi.js upload ./file.png --json
 ```
-
-## Status
-
-WIP — v0.1.0 direct + multipart upload supported.

package/bin/bytifi.js

@@ -3,33 +3,50 @@
 import fs from 'node:fs/promises'
 import path from 'node:path'
 import process from 'node:process'
-import { fileURLToPath } from 'node:url'
+import { createRequire } from 'node:module'
 import { BytifiApiError, BytifiNetworkError, uploadFile } from '../lib/upload.js'
 
-const __filename = fileURLToPath(import.meta.url)
+const require = createRequire(import.meta.url)
+const { version } = require('../package.json')
 
 function printHelp() {
-  process.stdout.write(`Bytifi CLI — encrypt and upload files
+  process.stdout.write(`Bytifi CLI v${version} — encrypt and upload files
 
 Usage:
   bytifi upload <file> [options]
 
 Options:
-  -k, --api-key <key>     API key (default: BYTIFI_API_KEY env var)
-  -e, --expires <minutes> Link lifetime: 5|15|30|60|120 (default: 30)
+  -k, --api-key <key>       API key (default: BYTIFI_API_KEY env var)
+  -e, --expires <minutes>   Link lifetime: 5|15|30|60|120 (default: 30)
       --delete-on-download  Remove file after first download
       --json                Print machine-readable JSON to stdout
   -q, --quiet               Print only the share URL
+      --verbose             Show API error details on stderr
       --mime-type <type>    Override detected MIME type
       --base-url <url>      API base URL (default: https://bytifi.com)
+  -V, --version             Show version
   -h, --help                Show this help
 
+Exit codes:
+  0  success
+  1  usage or validation error
+  2  API error (4xx/5xx response)
+  3  network error
+
 Examples:
   bytifi upload ./photo.png
   BYTIFI_API_KEY=usk_... bytifi upload report.pdf --expires 60 --json
 `)
 }
 
+function readFlagValue(argv, index, flagName) {
+  const value = argv[index + 1]
+  if (!value || value.startsWith('-')) {
+    throw new Error(`Option ${flagName} requires a value.`)
+  }
+  return value
+}
+
 function parseArgs(argv) {
   const positional = []
   const options = {
@@ -38,9 +55,11 @@ function parseArgs(argv) {
     deleteOnDownload: false,
     json: false,
     quiet: false,
+    verbose: false,
     mimeType: '',
     baseUrl: 'https://bytifi.com',
     help: false,
+    version: false,
   }
 
   for (let index = 0; index < argv.length; index += 1) {
@@ -51,6 +70,11 @@ function parseArgs(argv) {
       continue
     }
 
+    if (arg === '--version' || arg === '-V') {
+      options.version = true
+      continue
+    }
+
     if (arg === '--json') {
       options.json = true
       continue
@@ -61,31 +85,41 @@ function parseArgs(argv) {
       continue
     }
 
+    if (arg === '--verbose') {
+      options.verbose = true
+      continue
+    }
+
     if (arg === '--delete-on-download') {
       options.deleteOnDownload = true
       continue
     }
 
     if (arg === '--api-key' || arg === '-k') {
-      options.apiKey = argv[index + 1] || ''
+      options.apiKey = readFlagValue(argv, index, arg)
       index += 1
       continue
     }
 
     if (arg === '--expires' || arg === '-e') {
-      options.expiresInMinutes = Number(argv[index + 1])
+      const raw = readFlagValue(argv, index, arg)
+      const minutes = Number(raw)
+      if (!Number.isFinite(minutes)) {
+        throw new Error(`Invalid expires value: ${raw}`)
+      }
+      options.expiresInMinutes = minutes
       index += 1
       continue
     }
 
     if (arg === '--mime-type') {
-      options.mimeType = argv[index + 1] || ''
+      options.mimeType = readFlagValue(argv, index, arg)
       index += 1
       continue
     }
 
     if (arg === '--base-url') {
-      options.baseUrl = argv[index + 1] || options.baseUrl
+      options.baseUrl = readFlagValue(argv, index, arg)
       index += 1
       continue
     }
@@ -107,6 +141,14 @@ function validateExpires(minutes) {
   }
 }
 
+function writeProgress(percent) {
+  process.stderr.write(`\rEncrypting and uploading: ${percent}%`)
+}
+
+function clearProgressLine() {
+  process.stderr.write('\r\x1b[K')
+}
+
 async function runUpload(filePath, options) {
   validateExpires(options.expiresInMinutes)
 
@@ -115,34 +157,64 @@ async function runUpload(filePath, options) {
   }
 
   const resolvedPath = path.resolve(filePath)
-  await fs.access(resolvedPath)
-
-  const result = await uploadFile(resolvedPath, {
-    apiKey: options.apiKey,
-    baseUrl: options.baseUrl,
-    expiresInMinutes: options.expiresInMinutes,
-    deleteOnDownload: options.deleteOnDownload,
-    mimeType: options.mimeType || undefined,
-    onProgress: options.quiet || options.json
-      ? undefined
-      : (percent) => {
-          process.stderr.write(`Uploading encrypted parts: ${percent}%\n`)
-        },
-  })
-
-  if (options.json) {
-    process.stdout.write(`${JSON.stringify(result, null, 2)}\n`)
-    return
-  }
-
-  if (options.quiet) {
-    process.stdout.write(`${result.shareUrl}\n`)
-    return
-  }
-
-  process.stdout.write(`Share URL:\n${result.shareUrl}\n`)
-  process.stdout.write(`Download URL:\n${result.downloadUrl}\n`)
-  process.stdout.write(`Expires: ${result.expiresAt}\n`)
+
+  try {
+    await fs.access(resolvedPath)
+  } catch {
+    throw new Error(`File not found or not readable: ${resolvedPath}`)
+  }
+
+  const abortController = new AbortController()
+
+  const handleSignal = () => {
+    abortController.abort()
+  }
+
+  process.on('SIGINT', handleSignal)
+  process.on('SIGTERM', handleSignal)
+
+  const showProgress = !options.quiet && !options.json
+  let lastPercent = -1
+
+  try {
+    const result = await uploadFile(resolvedPath, {
+      apiKey: options.apiKey,
+      baseUrl: options.baseUrl,
+      expiresInMinutes: options.expiresInMinutes,
+      deleteOnDownload: options.deleteOnDownload,
+      mimeType: options.mimeType || undefined,
+      signal: abortController.signal,
+      onProgress: showProgress
+        ? (percent) => {
+            if (percent !== lastPercent) {
+              lastPercent = percent
+              writeProgress(percent)
+            }
+          }
+        : undefined,
+    })
+
+    if (showProgress) {
+      clearProgressLine()
+    }
+
+    if (options.json) {
+      process.stdout.write(`${JSON.stringify(result, null, 2)}\n`)
+      return
+    }
+
+    if (options.quiet) {
+      process.stdout.write(`${result.shareUrl}\n`)
+      return
+    }
+
+    process.stdout.write(`Share URL:\n${result.shareUrl}\n`)
+    process.stdout.write(`Download URL:\n${result.downloadUrl}\n`)
+    process.stdout.write(`Expires: ${result.expiresAt}\n`)
+  } finally {
+    process.off('SIGINT', handleSignal)
+    process.off('SIGTERM', handleSignal)
+  }
 }
 
 function exitCodeForError(error) {
@@ -151,6 +223,25 @@ function exitCodeForError(error) {
   return 1
 }
 
+function printError(error, verbose) {
+  process.stderr.write(`${error.message || 'Upload failed.'}\n`)
+
+  if (!verbose) return
+
+  if (error instanceof BytifiApiError) {
+    if (error.status) {
+      process.stderr.write(`HTTP ${error.status}\n`)
+    }
+    if (error.body) {
+      process.stderr.write(`${JSON.stringify(error.body, null, 2)}\n`)
+    }
+  }
+
+  if (error instanceof BytifiNetworkError && error.cause) {
+    process.stderr.write(`${error.cause}\n`)
+  }
+}
+
 async function main() {
   const [command, ...rest] = process.argv.slice(2)
 
@@ -159,6 +250,11 @@ async function main() {
     process.exit(0)
   }
 
+  if (command === '--version' || command === '-V') {
+    process.stdout.write(`${version}\n`)
+    process.exit(0)
+  }
+
   if (command !== 'upload') {
     if (command === 'help') {
       printHelp()
@@ -175,15 +271,30 @@ async function main() {
     process.exit(0)
   }
 
+  if (options.version) {
+    process.stdout.write(`${version}\n`)
+    process.exit(0)
+  }
+
+  if (options.json && options.quiet) {
+    throw new Error('Use either --json or --quiet, not both.')
+  }
+
   const filePath = positional[0]
   if (!filePath) {
     throw new Error('Missing file path. Usage: bytifi upload <file>')
   }
 
+  if (positional.length > 1) {
+    process.stderr.write(`Warning: ignoring extra files: ${positional.slice(1).join(', ')}\n`)
+  }
+
   await runUpload(filePath, options)
 }
 
 main().catch((error) => {
-  process.stderr.write(`${error.message || 'Upload failed.'}\n`)
+  clearProgressLine()
+  const verbose = process.argv.includes('--verbose')
+  printError(error, verbose)
   process.exit(exitCodeForError(error))
 })

package/lib/crypto.js

@@ -22,17 +22,6 @@ export function encryptChunk(plainChunk, key, noncePrefix, chunkIndex) {
   return Buffer.concat([encrypted, tag])
 }
 
-export function createEncryptionToken(tokenBytes = crypto.randomBytes(32)) {
-  if (tokenBytes.length !== 32) {
-    throw new Error('Encryption token must be 32 bytes.')
-  }
-
-  return {
-    tokenBytes,
-    token: toBase64Url(tokenBytes),
-  }
-}
-
 export function buildClientEncryptionMeta({
   plainChunkSize,
   chunkCount,
@@ -51,62 +40,143 @@ export function buildClientEncryptionMeta({
   }
 }
 
-export async function encryptFileBuffer(fileBuffer, {
+export function calculateEncryptedSize(originalSize, plainChunkSize = PLAIN_CHUNK_SIZE) {
+  const chunkCount = Math.ceil(originalSize / plainChunkSize) || 1
+  let encryptedSize = 0
+
+  for (let chunkIndex = 0; chunkIndex < chunkCount; chunkIndex += 1) {
+    const start = chunkIndex * plainChunkSize
+    const plainSize = Math.min(originalSize - start, plainChunkSize)
+    encryptedSize += plainSize + 16
+  }
+
+  return { chunkCount, encryptedSize }
+}
+
+export function createEncryptionContext({
+  originalSize,
   originalName = 'upload',
   mimeType = 'application/octet-stream',
   tokenBytes = crypto.randomBytes(32),
   noncePrefix = crypto.randomBytes(8),
   plainChunkSize = PLAIN_CHUNK_SIZE,
-} = {}) {
+}) {
   if (tokenBytes.length !== 32) throw new Error('Encryption token must be 32 bytes.')
   if (noncePrefix.length !== 8) throw new Error('Nonce prefix must be 8 bytes.')
 
-  const key = tokenBytes
-  const chunkCount = Math.ceil(fileBuffer.length / plainChunkSize) || 1
-  const encryptedParts = []
-  let encryptedSize = 0
-
-  for (let chunkIndex = 0; chunkIndex < chunkCount; chunkIndex += 1) {
-    const start = chunkIndex * plainChunkSize
-    const end = Math.min(fileBuffer.length, start + plainChunkSize)
-    const plainChunk = fileBuffer.subarray(start, end)
-    const encryptedChunk = encryptChunk(plainChunk, key, noncePrefix, chunkIndex)
-    encryptedParts.push(encryptedChunk)
-    encryptedSize += encryptedChunk.length
-  }
-
+  const { chunkCount, encryptedSize } = calculateEncryptedSize(originalSize, plainChunkSize)
   const meta = buildClientEncryptionMeta({
     plainChunkSize,
     chunkCount,
     noncePrefix,
-    originalSize: fileBuffer.length,
+    originalSize,
     mimeType,
   })
 
   return {
     token: toBase64Url(tokenBytes),
     tokenBytes,
+    noncePrefix,
     meta,
-    encryptedParts,
-    encryptedBuffer: Buffer.concat(encryptedParts),
+    chunkCount,
     encryptedSize,
     originalName,
     mimeType,
-    originalSize: fileBuffer.length,
+    originalSize,
+    plainChunkSize,
   }
 }
 
-export async function encryptFile(filePath, options = {}) {
+export async function resolveUploadFile(filePath, options = {}) {
   const absolutePath = path.resolve(filePath)
-  const fileBuffer = await fs.readFile(absolutePath)
+  const stat = await fs.stat(absolutePath)
+
+  if (!stat.isFile()) {
+    throw new Error('Upload path must be a file.')
+  }
+
   const originalName = options.originalName || path.basename(absolutePath)
   const mimeType = options.mimeType || guessMimeType(originalName)
 
-  return encryptFileBuffer(fileBuffer, {
-    ...options,
+  return {
+    absolutePath,
+    context: createEncryptionContext({
+      originalSize: stat.size,
+      originalName,
+      mimeType,
+    }),
+  }
+}
+
+async function readPlainChunk(fileHandle, chunkIndex, originalSize, plainChunkSize = PLAIN_CHUNK_SIZE) {
+  const start = chunkIndex * plainChunkSize
+  const length = Math.min(plainChunkSize, originalSize - start)
+  const buffer = Buffer.alloc(length)
+  const { bytesRead } = await fileHandle.read(buffer, 0, length, start)
+
+  if (bytesRead !== length) {
+    throw new Error('File ended before the upload was complete.')
+  }
+
+  return buffer
+}
+
+export async function encryptChunkFromFile(fileHandle, chunkIndex, context) {
+  const plainChunk = await readPlainChunk(
+    fileHandle,
+    chunkIndex,
+    context.originalSize,
+    context.plainChunkSize,
+  )
+
+  return encryptChunk(plainChunk, context.tokenBytes, context.noncePrefix, chunkIndex)
+}
+
+export async function collectEncryptedParts(filePath, context) {
+  const fileHandle = await fs.open(filePath, 'r')
+  const encryptedParts = []
+
+  try {
+    for (let chunkIndex = 0; chunkIndex < context.chunkCount; chunkIndex += 1) {
+      encryptedParts.push(await encryptChunkFromFile(fileHandle, chunkIndex, context))
+    }
+  } finally {
+    await fileHandle.close()
+  }
+
+  return encryptedParts
+}
+
+export async function encryptFileBuffer(fileBuffer, {
+  originalName = 'upload',
+  mimeType = 'application/octet-stream',
+  tokenBytes = crypto.randomBytes(32),
+  noncePrefix = crypto.randomBytes(8),
+  plainChunkSize = PLAIN_CHUNK_SIZE,
+} = {}) {
+  const context = createEncryptionContext({
+    originalSize: fileBuffer.length,
     originalName,
     mimeType,
+    tokenBytes,
+    noncePrefix,
+    plainChunkSize,
   })
+
+  const encryptedParts = []
+
+  for (let chunkIndex = 0; chunkIndex < context.chunkCount; chunkIndex += 1) {
+    const start = chunkIndex * plainChunkSize
+    const end = Math.min(fileBuffer.length, start + plainChunkSize)
+    const plainChunk = fileBuffer.subarray(start, end)
+    encryptedParts.push(encryptChunk(plainChunk, context.tokenBytes, context.noncePrefix, chunkIndex))
+  }
+
+  return {
+    ...context,
+    encryptedParts,
+    encryptedBuffer: Buffer.concat(encryptedParts),
+  }
 }
 
 export function decryptChunk(encryptedChunk, tokenBytes, noncePrefix, chunkIndex) {

package/lib/upload.js

@@ -1,6 +1,15 @@
-import { DIRECT_UPLOAD_LIMIT_BYTES } from './crypto.js'
+import {
+  DIRECT_UPLOAD_LIMIT_BYTES,
+  encryptChunkFromFile,
+  resolveUploadFile,
+} from './crypto.js'
+import fs from 'node:fs/promises'
 
 const DEFAULT_BASE_URL = 'https://bytifi.com'
+const DEFAULT_CONCURRENCY = 4
+const POLL_INTERVAL_MS = 1500
+const POLL_TIMEOUT_MS = 30 * 60 * 1000
+const MAX_RETRIES = 3
 
 export class BytifiApiError extends Error {
   constructor(message, { status = 0, body = null } = {}) {
@@ -19,10 +28,22 @@ export class BytifiNetworkError extends Error {
   }
 }
 
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
 function normalizeBaseUrl(baseUrl) {
   return String(baseUrl || DEFAULT_BASE_URL).replace(/\/+$/, '')
 }
 
+function isRetryableError(error) {
+  if (error instanceof BytifiNetworkError) return true
+  if (error instanceof BytifiApiError) {
+    return error.status === 429 || error.status >= 500
+  }
+  return false
+}
+
 async function readResponseBody(response) {
   const text = await response.text()
   if (!text) return null
@@ -34,7 +55,7 @@ async function readResponseBody(response) {
   }
 }
 
-async function apiFetch(baseUrl, path, { apiKey, method = 'GET', headers = {}, body = null } = {}) {
+async function apiFetch(baseUrl, path, { apiKey, method = 'GET', headers = {}, body = null, signal } = {}) {
   const url = `${normalizeBaseUrl(baseUrl)}${path}`
   const requestHeaders = {
     Authorization: `Bearer ${apiKey}`,
@@ -48,8 +69,12 @@ async function apiFetch(baseUrl, path, { apiKey, method = 'GET', headers = {}, b
       method,
       headers: requestHeaders,
       body,
+      signal,
     })
   } catch (error) {
+    if (signal?.aborted) {
+      throw new Error('Upload aborted.')
+    }
     throw new BytifiNetworkError(error.message || 'Network request failed.', { cause: error })
   }
 
@@ -67,18 +92,41 @@ async function apiFetch(baseUrl, path, { apiKey, method = 'GET', headers = {}, b
   return payload
 }
 
+async function apiFetchWithRetry(baseUrl, path, options = {}) {
+  const { retries = MAX_RETRIES, signal } = options
+
+  for (let attempt = 0; attempt <= retries; attempt += 1) {
+    try {
+      return await apiFetch(baseUrl, path, options)
+    } catch (error) {
+      if (signal?.aborted || error.message === 'Upload aborted.') {
+        throw error
+      }
+
+      if (!isRetryableError(error) || attempt === retries) {
+        throw error
+      }
+
+      const delayMs = Math.min(1000 * (2 ** attempt), 8000)
+      await sleep(delayMs)
+    }
+  }
+
+  throw new Error('Request failed after retries.')
+}
+
 function buildShareUrl(payload, encryptionToken) {
   return `${payload.url}#token=${encodeURIComponent(encryptionToken)}`
 }
 
-function buildResult(payload, encryption, shareUrl) {
+function buildResult(payload, context, shareUrl) {
   return {
     shareUrl,
     url: payload.url,
     downloadUrl: payload.downloadUrl,
     token: payload.token,
-    encryptionToken: encryption.token,
-    originalName: payload.originalName || encryption.originalName,
+    encryptionToken: context.token,
+    originalName: payload.originalName || context.originalName,
     size: payload.size,
     expiresAt: payload.expiresAt,
     deleteOnDownload: payload.deleteOnDownload,
@@ -86,157 +134,202 @@ function buildResult(payload, encryption, shareUrl) {
   }
 }
 
-async function uploadDirect(encryption, {
+async function collectEncryptedBuffer(filePath, context, { onProgress, signal } = {}) {
+  const fileHandle = await fs.open(filePath, 'r')
+  const encryptedParts = []
+
+  try {
+    for (let chunkIndex = 0; chunkIndex < context.chunkCount; chunkIndex += 1) {
+      if (signal?.aborted) {
+        throw new Error('Upload aborted.')
+      }
+
+      encryptedParts.push(await encryptChunkFromFile(fileHandle, chunkIndex, context))
+      onProgress?.(Math.round(((chunkIndex + 1) / context.chunkCount) * 90))
+    }
+  } finally {
+    await fileHandle.close()
+  }
+
+  onProgress?.(95)
+  return Buffer.concat(encryptedParts)
+}
+
+async function uploadDirect(context, encryptedBuffer, {
   apiKey,
   baseUrl,
   expiresInMinutes,
   deleteOnDownload,
+  onProgress,
+  signal,
 }) {
   const formData = new FormData()
-  const blob = new Blob([encryption.encryptedBuffer], { type: 'application/octet-stream' })
+  const blob = new Blob([encryptedBuffer], { type: 'application/octet-stream' })
 
-  formData.append('file', blob, encryption.originalName)
+  formData.append('file', blob, context.originalName)
   formData.append('clientEncrypted', 'true')
-  formData.append('clientEncryptionMeta', JSON.stringify(encryption.meta))
+  formData.append('clientEncryptionMeta', JSON.stringify(context.meta))
   formData.append('deleteOnDownload', deleteOnDownload ? 'true' : 'false')
   formData.append('expiresInMinutes', String(expiresInMinutes))
 
-  const payload = await apiFetch(baseUrl, '/api/public/upload', {
+  const payload = await apiFetchWithRetry(baseUrl, '/api/public/upload', {
     apiKey,
     method: 'POST',
     body: formData,
+    signal,
   })
 
-  const shareUrl = buildShareUrl(payload, encryption.token)
-  return buildResult(payload, encryption, shareUrl)
+  onProgress?.(100)
+
+  const shareUrl = buildShareUrl(payload, context.token)
+  return buildResult(payload, context, shareUrl)
 }
 
 async function pollUploadStatus(sessionToken, { apiKey, baseUrl, signal }) {
+  const startedAt = Date.now()
+
   while (true) {
     if (signal?.aborted) {
       throw new Error('Upload aborted.')
     }
 
-    const payload = await apiFetch(
+    if (Date.now() - startedAt > POLL_TIMEOUT_MS) {
+      throw new Error('Upload finalization timed out. Try again later.')
+    }
+
+    const payload = await apiFetchWithRetry(
       baseUrl,
       `/api/public/upload/status?sessionToken=${encodeURIComponent(sessionToken)}`,
-      { apiKey },
+      { apiKey, signal },
     )
 
-    if (payload.status !== 'processing') {
+    if (payload.status !== 'processing' && payload.status !== 'pending') {
       return payload
     }
 
-    await new Promise((resolve) => setTimeout(resolve, 1500))
+    await sleep(POLL_INTERVAL_MS)
   }
 }
 
-async function uploadMultipart(encryption, {
+async function uploadMultipartStreaming(filePath, context, {
   apiKey,
   baseUrl,
   expiresInMinutes,
   deleteOnDownload,
   onProgress,
   signal,
-  concurrency = 3,
+  concurrency = DEFAULT_CONCURRENCY,
 }) {
-  const partSize = encryption.meta.chunkSize + 16
-  const initPayload = await apiFetch(baseUrl, '/api/public/upload/init', {
+  const partSize = context.meta.chunkSize + 16
+  const initPayload = await apiFetchWithRetry(baseUrl, '/api/public/upload/init', {
     apiKey,
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({
-      originalName: encryption.originalName,
-      mimeType: encryption.mimeType,
-      size: encryption.encryptedSize,
-      originalSize: encryption.originalSize,
+      originalName: context.originalName,
+      mimeType: context.mimeType,
+      size: context.encryptedSize,
+      originalSize: context.originalSize,
       clientEncrypted: true,
-      clientEncryptionMeta: encryption.meta,
+      clientEncryptionMeta: context.meta,
       partSize,
       expiresInMinutes,
       deleteOnDownload,
     }),
+    signal,
   })
 
   const sessionToken = initPayload.sessionToken
-  const totalParts = encryption.encryptedParts.length
+  const workerCount = Math.min(
+    Number(initPayload.concurrency) || concurrency,
+    context.chunkCount,
+  )
+  const fileHandle = await fs.open(filePath, 'r')
+  let nextChunkIndex = 0
   let completedParts = 0
 
-  const uploadPart = async (partNumber) => {
-    const partBuffer = encryption.encryptedParts[partNumber - 1]
-    await apiFetch(
-      baseUrl,
-      `/api/public/upload/part?sessionToken=${encodeURIComponent(sessionToken)}&partNumber=${partNumber}`,
-      {
-        apiKey,
-        method: 'PUT',
-        headers: { 'Content-Type': 'application/octet-stream' },
-        body: partBuffer,
-      },
-    )
-
-    completedParts += 1
-    onProgress?.(Math.round((completedParts / totalParts) * 100))
-  }
-
-  const queue = Array.from({ length: totalParts }, (_, index) => index + 1)
-  const workers = Array.from({ length: Math.min(concurrency, totalParts) }, async () => {
-    while (queue.length > 0) {
+  async function uploadWorker() {
+    while (true) {
       if (signal?.aborted) {
         throw new Error('Upload aborted.')
       }
 
-      const partNumber = queue.shift()
-      if (!partNumber) return
-      await uploadPart(partNumber)
+      const chunkIndex = nextChunkIndex
+      nextChunkIndex += 1
+
+      if (chunkIndex >= context.chunkCount) {
+        return
+      }
+
+      const partNumber = chunkIndex + 1
+      const encryptedPart = await encryptChunkFromFile(fileHandle, chunkIndex, context)
+
+      await apiFetchWithRetry(
+        baseUrl,
+        `/api/public/upload/part?sessionToken=${encodeURIComponent(sessionToken)}&partNumber=${partNumber}`,
+        {
+          apiKey,
+          method: 'PUT',
+          headers: { 'Content-Type': 'application/octet-stream' },
+          body: encryptedPart,
+          signal,
+        },
+      )
+
+      completedParts += 1
+      onProgress?.(Math.round((completedParts / context.chunkCount) * 100))
     }
-  })
+  }
 
   try {
-    await Promise.all(workers)
+    await Promise.all(Array.from({ length: workerCount }, () => uploadWorker()))
   } catch (error) {
-    await apiFetch(baseUrl, '/api/public/upload/abort', {
+    await apiFetchWithRetry(baseUrl, '/api/public/upload/abort', {
       apiKey,
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ sessionToken }),
+      signal,
     }).catch(() => {})
 
     throw error
+  } finally {
+    await fileHandle.close()
   }
 
-  let completePayload = await apiFetch(baseUrl, '/api/public/upload/complete', {
+  let completePayload = await apiFetchWithRetry(baseUrl, '/api/public/upload/complete', {
     apiKey,
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({ sessionToken }),
+    signal,
   })
 
-  if (completePayload.status === 'processing') {
+  if (completePayload.status === 'processing' || completePayload.status === 'pending') {
     completePayload = await pollUploadStatus(sessionToken, { apiKey, baseUrl, signal })
   }
 
-  const shareUrl = buildShareUrl(completePayload, encryption.token)
-  return buildResult(completePayload, encryption, shareUrl)
+  const shareUrl = buildShareUrl(completePayload, context.token)
+  return buildResult(completePayload, context, shareUrl)
 }
 
-export async function uploadEncrypted(encryption, options) {
+export async function uploadFile(filePath, options) {
   if (!options?.apiKey) {
     throw new Error('API key is required.')
   }
 
-  if (encryption.encryptedSize <= DIRECT_UPLOAD_LIMIT_BYTES) {
-    return uploadDirect(encryption, options)
-  }
+  const { absolutePath, context } = await resolveUploadFile(filePath, {
+    mimeType: options.mimeType,
+  })
 
-  return uploadMultipart(encryption, options)
-}
+  if (context.encryptedSize <= DIRECT_UPLOAD_LIMIT_BYTES) {
+    const encryptedBuffer = await collectEncryptedBuffer(absolutePath, context, {
+      onProgress: options.onProgress,
+      signal: options.signal,
+    })
 
-export async function uploadFile(filePath, options) {
-  const { encryptFile } = await import('./crypto.js')
-  const encryption = await encryptFile(filePath, {
-    mimeType: options?.mimeType,
-  })
+    return uploadDirect(context, encryptedBuffer, options)
+  }
 
-  return uploadEncrypted(encryption, options)
+  return uploadMultipartStreaming(absolutePath, context, options)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bytifi",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Official Bytifi CLI — encrypt and upload files from the terminal",
   "type": "module",
   "bin": {
@@ -14,7 +14,9 @@
     "node": ">=18"
   },
   "scripts": {
-    "upload": "node bin/bytifi.js upload"
+    "upload": "node bin/bytifi.js upload",
+    "build:bundle": "esbuild bin/bytifi.js --bundle --platform=node --format=cjs --outfile=dist/bytifi-bundle.cjs",
+    "build:win": "npm run build:bundle && pkg dist/bytifi-bundle.cjs --targets node22-win-x64 --output dist/bytifi.exe --compress GZip"
   },
   "repository": {
     "type": "git",
@@ -34,5 +36,9 @@
     "upload",
     "file-sharing"
   ],
-  "license": "MIT"
+  "license": "MIT",
+  "devDependencies": {
+    "@yao-pkg/pkg": "^6.21.0",
+    "esbuild": "^0.25.0"
+  }
 }