teyyare 0.2.4 → 0.2.5

package/bin/teyyare.js

@@ -51,7 +51,7 @@ async function main() {
   }
 
   if (command === '--version' || command === '-v' || command === 'version') {
-    console.log('0.2.4');
+    console.log('0.2.5');
     process.exit(0);
   }
 
@@ -143,7 +143,7 @@ Peak RSS:         ${(snap.peakRSS / (1024 * 1024)).toFixed(2)} MB
 `);
     process.exit(0);
   } else if (command === 'status') {
-    console.log('\x1b[1m\x1b[36mTeyyare\x1b[0m v0.2.4 status: ready');
+    console.log('\x1b[1m\x1b[36mTeyyare\x1b[0m v0.2.5 status: ready');
   } else {
     console.error(`Unknown command: ${command}`);
     printUsage();

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "teyyare",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "High-performance resumable file transfer engine and CLI built on muttafa and raptiye",
   "main": "src/index.js",
   "type": "module",
   "bin": {
-    "teyyare": "./bin/teyyare.js"
+    "teyyare": "bin/teyyare.js"
   },
   "scripts": {
     "test": "node --test test/**/*.test.js",

package/src/core/protocol.js

@@ -165,14 +165,23 @@ export function unpackTransferEnd(buf) {
 }
 
 /**
- * Pack PULL_REQUEST metadata.
+ * Pack PULL_REQUEST metadata with optional verifiedChunks bitmap/list for resume.
  */
-export function packPullRequest({ remotePath }) {
+export function packPullRequest({ remotePath, verifiedChunks = [] }) {
   const pathBytes = encoder.encode(remotePath);
-  const buf = new Uint8Array(2 + pathBytes.byteLength);
+  const count = verifiedChunks.length;
+  const buf = new Uint8Array(2 + pathBytes.byteLength + 4 + count * 4);
   const view = new DataView(buf.buffer, buf.byteOffset, buf.byteLength);
   view.setUint16(0, pathBytes.byteLength, false);
   buf.set(pathBytes, 2);
+
+  let off = 2 + pathBytes.byteLength;
+  view.setUint32(off, count, false);
+  off += 4;
+  for (let i = 0; i < count; i++) {
+    view.setUint32(off, verifiedChunks[i], false);
+    off += 4;
+  }
   return buf;
 }
 
@@ -180,7 +189,19 @@ export function unpackPullRequest(buf) {
   const view = new DataView(buf.buffer, buf.byteOffset, buf.byteLength);
   const pathLen = view.getUint16(0, false);
   const remotePath = decoder.decode(buf.subarray(2, 2 + pathLen));
-  return { remotePath };
+
+  const verifiedChunks = [];
+  let off = 2 + pathLen;
+  if (buf.byteLength >= off + 4) {
+    const count = view.getUint32(off, false);
+    off += 4;
+    for (let i = 0; i < count && off + 4 <= buf.byteLength; i++) {
+      verifiedChunks.push(view.getUint32(off, false));
+      off += 4;
+    }
+  }
+
+  return { remotePath, verifiedChunks };
 }
 
 /**

package/src/index.js

@@ -302,12 +302,14 @@ export async function serve({
     autoHookBatch: false
   });
 
+  let activeSender = null;
+
   replication.onBatch(async (msg) => {
     if (!msg.buffers || msg.buffers.length < 2) return;
     const [metaBuf, payloadBuf] = msg.buffers;
     const entries = unpackGeneration(metaBuf, payloadBuf);
     if (entries.length > 0 && entries[0].type === Opcodes.PULL_REQUEST) {
-      const { remotePath } = unpackPullRequest(entries[0].key);
+      const { remotePath, verifiedChunks = [] } = unpackPullRequest(entries[0].key);
       let resolved = path.isAbsolute(remotePath) ? remotePath : path.resolve(destinationDir, remotePath);
       if (!existsSync(resolved)) {
         const alt = path.resolve(destinationDir, remotePath);
@@ -323,22 +325,47 @@ export async function serve({
         return;
       }
 
+      // Abort any existing running sender before starting new transfer
+      if (activeSender) {
+        activeSender.abort();
+        activeSender = null;
+      }
+
       const manifest = await TransferManifest.build(resolved);
       replication.reset();
+
+      // Seed sender with verified chunks sent by pull client for resume
+      const knownResumeState = new Map();
+      if (verifiedChunks && verifiedChunks.length > 0) {
+        knownResumeState.set(1, new FileResumeState({
+          fileId: 1,
+          verifiedChunks: new Set(verifiedChunks)
+        }));
+      }
+
       const sender = new SenderPipeline({
         replication,
         manifest,
+        knownResumeState,
         metrics
       });
+      activeSender = sender;
+
       setImmediate(async () => {
         try {
           await sender.transfer();
         } catch (err) {
-          await submitSingleMutation(
-            replication,
-            Opcodes.PULL_ERROR,
-            packPullError({ errorCode: 500, message: err.message })
-          );
+          if (!sender.aborted) {
+            await submitSingleMutation(
+              replication,
+              Opcodes.PULL_ERROR,
+              packPullError({ errorCode: 500, message: err.message })
+            );
+          }
+        } finally {
+          if (activeSender === sender) {
+            activeSender = null;
+          }
         }
       });
       return;
@@ -470,11 +497,23 @@ export async function pull({
   });
 
   try {
-    // Submit PULL_REQUEST batch
+    // Check if resume state exists for this file
+    const fileName = path.basename(sourceRemotePath);
+    const targetFile = path.resolve(destinationDir, fileName);
+    const statePath = `${targetFile}.teyyare-state`;
+    let verifiedChunks = [];
+    try {
+      const existingState = await FileResumeState.load(statePath);
+      if (existingState && existingState.verifiedChunks) {
+        verifiedChunks = Array.from(existingState.verifiedChunks);
+      }
+    } catch {}
+
+    // Submit PULL_REQUEST batch with verified chunks for resume
     await submitSingleMutation(
       replication,
       Opcodes.PULL_REQUEST,
-      packPullRequest({ remotePath: sourceRemotePath })
+      packPullRequest({ remotePath: sourceRemotePath, verifiedChunks })
     );
 
     // Wait for receiver pipeline to receive and write all files

package/src/receiver/pipeline.js

@@ -216,10 +216,14 @@ export class ReceiverPipeline {
     if (this.progress) {
       const fileSize = Number(info.fileSize);
       const estimatedChunks = Math.max(1, Math.ceil(fileSize / (1024 * 1024)));
+      const verifiedBytes = resumeState.verifiedCount * (resumeState.chunkSize || 1024 * 1024);
       this.progress.update({
         fileName: info.path,
         totalBytes: fileSize,
-        totalChunks: estimatedChunks
+        totalChunks: estimatedChunks,
+        bytesDone: verifiedBytes,
+        chunksDone: resumeState.verifiedCount,
+        resumeHits: resumeState.verifiedCount
       });
     }
   }
@@ -228,7 +232,8 @@ export class ReceiverPipeline {
     const meta = unpackChunkMeta(key);
     const file = this.activeFiles.get(meta.fileId);
     if (!file) {
-      throw new Error(`Unknown fileId ${meta.fileId} in CHUNK mutation`);
+      // Stale or out-of-order chunk from an interrupted previous session - ignore safely
+      return;
     }
 
     // Idempotency / resume hit check

package/src/sender/pipeline.js

@@ -141,13 +141,26 @@ export class SenderPipeline {
         }
       }
     });
+    this.aborted = false;
+  }
+
+  abort() {
+    this.aborted = true;
+    if (this.engine) {
+      try {
+        this.engine.halt();
+      } catch {}
+    }
   }
 
   async _append(opcode, key, value = undefined, keyBytes = 0, valueBytes = 0) {
+    if (this.aborted) return;
     while (this.engine.isBackpressured()) {
+      if (this.aborted) return;
       await this.engine.ready();
       await new Promise((r) => setImmediate(r));
     }
+    if (this.aborted) return;
     const kLen = keyBytes || (key ? key.byteLength : 0);
     const vLen = valueBytes || (value ? value.byteLength : 0);
     return this.engine.custom(opcode, key, value, kLen, vLen);
@@ -205,6 +218,7 @@ export class SenderPipeline {
         const handle = await fs.open(filePath, 'r');
         try {
           for (let i = 0; i < totalFileChunks; i++) {
+            if (this.aborted) break;
             const offset = BigInt(i * this.chunkSize);
             const remaining = file.size - (i * this.chunkSize);
             const chunkLen = Math.min(this.chunkSize, remaining);
@@ -272,11 +286,15 @@ export class SenderPipeline {
         }
       }
 
+      if (this.aborted) return;
+
       // OP_FILE_END
       const fend = packFileEnd({ fileId: file.fileId, sha256: file.sha256 || '' });
       await this._append(Opcodes.FILE_END, fend);
     }
 
+    if (this.aborted) return;
+
     // 3. OP_TRANSFER_END
     const tend = packTransferEnd({ transferId: this.transferId, status: 0 });
     await this._append(Opcodes.TRANSFER_END, tend);