bytifi 0.1.0 → 0.1.1

package/README.md

@@ -30,10 +30,20 @@ Create an API key in **Account → API** on bytifi.com.
 
 ```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 |

package/bin/bytifi.js

@@ -126,7 +126,7 @@ async function runUpload(filePath, options) {
     onProgress: options.quiet || options.json
       ? undefined
       : (percent) => {
-          process.stderr.write(`Uploading encrypted parts: ${percent}%\n`)
+          process.stderr.write(`Encrypting and uploading: ${percent}%\n`)
         },
   })
 

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,4 +1,10 @@
-import { DIRECT_UPLOAD_LIMIT_BYTES } from './crypto.js'
+import {
+  DIRECT_UPLOAD_LIMIT_BYTES,
+  collectEncryptedParts,
+  encryptChunkFromFile,
+  resolveUploadFile,
+} from './crypto.js'
+import fs from 'node:fs/promises'
 
 const DEFAULT_BASE_URL = 'https://bytifi.com'
 
@@ -71,14 +77,14 @@ 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,18 +92,18 @@ function buildResult(payload, encryption, shareUrl) {
   }
 }
 
-async function uploadDirect(encryption, {
+async function uploadDirect(context, encryptedBuffer, {
   apiKey,
   baseUrl,
   expiresInMinutes,
   deleteOnDownload,
 }) {
   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))
 
@@ -107,8 +113,8 @@ async function uploadDirect(encryption, {
     body: formData,
   })
 
-  const shareUrl = buildShareUrl(payload, encryption.token)
-  return buildResult(payload, encryption, shareUrl)
+  const shareUrl = buildShareUrl(payload, context.token)
+  return buildResult(payload, context, shareUrl)
 }
 
 async function pollUploadStatus(sessionToken, { apiKey, baseUrl, signal }) {
@@ -131,27 +137,26 @@ async function pollUploadStatus(sessionToken, { apiKey, baseUrl, signal }) {
   }
 }
 
-async function uploadMultipart(encryption, {
+async function uploadMultipartStreaming(filePath, context, {
   apiKey,
   baseUrl,
   expiresInMinutes,
   deleteOnDownload,
   onProgress,
   signal,
-  concurrency = 3,
 }) {
-  const partSize = encryption.meta.chunkSize + 16
+  const partSize = context.meta.chunkSize + 16
   const initPayload = await apiFetch(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,
@@ -159,41 +164,30 @@ async function uploadMultipart(encryption, {
   })
 
   const sessionToken = initPayload.sessionToken
-  const totalParts = encryption.encryptedParts.length
-  let completedParts = 0
+  const fileHandle = await fs.open(filePath, 'r')
 
-  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) {
+  try {
+    for (let chunkIndex = 0; chunkIndex < context.chunkCount; chunkIndex += 1) {
       if (signal?.aborted) {
         throw new Error('Upload aborted.')
       }
 
-      const partNumber = queue.shift()
-      if (!partNumber) return
-      await uploadPart(partNumber)
+      const partNumber = chunkIndex + 1
+      const encryptedPart = await encryptChunkFromFile(fileHandle, chunkIndex, context)
+
+      await apiFetch(
+        baseUrl,
+        `/api/public/upload/part?sessionToken=${encodeURIComponent(sessionToken)}&partNumber=${partNumber}`,
+        {
+          apiKey,
+          method: 'PUT',
+          headers: { 'Content-Type': 'application/octet-stream' },
+          body: encryptedPart,
+        },
+      )
+
+      onProgress?.(Math.round((partNumber / context.chunkCount) * 100))
     }
-  })
-
-  try {
-    await Promise.all(workers)
   } catch (error) {
     await apiFetch(baseUrl, '/api/public/upload/abort', {
       apiKey,
@@ -203,6 +197,8 @@ async function uploadMultipart(encryption, {
     }).catch(() => {})
 
     throw error
+  } finally {
+    await fileHandle.close()
   }
 
   let completePayload = await apiFetch(baseUrl, '/api/public/upload/complete', {
@@ -216,27 +212,25 @@ async function uploadMultipart(encryption, {
     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 encryptedParts = await collectEncryptedParts(absolutePath, context)
+    const encryptedBuffer = Buffer.concat(encryptedParts)
 
-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.1",
   "description": "Official Bytifi CLI — encrypt and upload files from the terminal",
   "type": "module",
   "bin": {
@@ -34,5 +34,8 @@
     "upload",
     "file-sharing"
   ],
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": {
+    "bytifi": "^0.1.0"
+  }
 }