@rendobar/sdk 3.0.0 → 3.1.0

package/dist/index.cjs

@@ -307,22 +307,53 @@ function toBlob(file) {
 	return file instanceof Blob ? file : new Blob([file]);
 }
 /**
+* Per-attempt upload time budget. fetch() exposes no upload progress, so a
+* stalled socket and a slow link are indistinguishable from the outside; a
+* hard per-attempt budget is the only portable stall cap. The ladder escalates
+* (healthy 500 KiB/s assumption first, then 100, then 50) so a genuinely slow
+* connection that times out on an early attempt still completes on a later,
+* more patient one — while a hung socket gets cut and retried on a fresh
+* connection instead of waiting on the OS TCP timeout.
+*
+* @internal exported for tests
+*/
+function attemptTimeoutMs(sizeBytes, attempt) {
+	const GRACE_MS = [
+		1e4,
+		3e4,
+		6e4
+	];
+	const RATE_BPS = [
+		500 * 1024,
+		100 * 1024,
+		50 * 1024
+	];
+	const i = Math.min(attempt, GRACE_MS.length - 1);
+	return GRACE_MS[i] + Math.ceil(sizeBytes / RATE_BPS[i] * 1e3);
+}
+/**
 * PUT a body to a presigned R2 url with bounded retry.
 *
 * Returns the ETag string when the bucket exposes it, or `null` when the
-* response header is absent (e.g. bucket CORS not exposing ETag). Only
-* network/HTTP failures trigger retries; a missing ETag is not retried because
-* it is a deterministic misconfiguration, not a transient error.
+* response header is absent (e.g. bucket CORS not exposing ETag). Network/HTTP
+* failures and per-attempt timeouts trigger retries; a caller abort and a
+* missing ETag do not (the latter is a deterministic misconfiguration, not a
+* transient error).
+*
+* @internal exported for tests
 */
-async function putWithRetry(url, body, signal, attempts = 3) {
+async function putWithRetry(url, body, signal, sizeBytes, attempts = 3, attemptTimeouts) {
 	let lastErr;
 	for (let i = 0; i < attempts; i++) {
 		if (signal?.aborted) throw new Error("Upload aborted");
+		const timeoutMs = attemptTimeouts?.[i] ?? attemptTimeoutMs(sizeBytes, i);
+		const timeout = AbortSignal.timeout(timeoutMs);
+		const attemptSignal = signal ? AbortSignal.any([signal, timeout]) : timeout;
 		try {
 			const res = await fetch(url, {
 				method: "PUT",
 				body,
-				signal
+				signal: attemptSignal
 			});
 			if (!res.ok) throw new Error(`Upload PUT failed: ${res.status}`);
 			return res.headers.get("etag");
@@ -378,7 +409,7 @@ function createUploadsResource(request) {
 			return init.data;
 		}
 		if (init.status === "presigned") {
-			await putWithRetry(init.upload.url, blob, options.signal);
+			await putWithRetry(init.upload.url, blob, options.signal, size);
 			options.onProgress?.({
 				loaded: size,
 				total: size
@@ -399,7 +430,7 @@ function createUploadsResource(request) {
 			const chunk = blob.slice(start, Math.min(start + partSize, size));
 			let etag;
 			try {
-				etag = await putWithRetry(p.url, chunk, combinedSignal);
+				etag = await putWithRetry(p.url, chunk, combinedSignal, chunk.size);
 			} catch (e) {
 				internal.abort();
 				partError = e instanceof Error ? e : new Error(String(e));
@@ -668,6 +699,8 @@ const KNOWN_EVENT_TYPES = new Set([
 	"job.progress",
 	"job.step",
 	"job.log",
+	"job.metrics",
+	"job.context",
 	"balance.updated",
 	"subscription.updated",
 	"notification",
@@ -756,6 +789,12 @@ function dispatchJobEvent(event, options) {
 		case "job.result":
 			options.onResult?.(event);
 			break;
+		case "job.metrics":
+			options.onMetrics?.(event);
+			break;
+		case "job.context":
+			options.onContext?.(event);
+			break;
 	}
 }
 //#endregion

package/dist/index.d.cts

@@ -2269,6 +2269,7 @@ declare const jobResponseSchema: ZodDiscriminatedUnion<[ZodObject<{
     error: ZodOptional<ZodString>;
   }, $strip>>;
   logsAvailable: ZodBoolean;
+  metricsAvailable: ZodBoolean;
   createdAt: ZodNumber;
   dispatchedAt: ZodNullable<ZodNumber>;
   startedAt: ZodNullable<ZodNumber>;
@@ -2305,6 +2306,7 @@ declare const jobResponseSchema: ZodDiscriminatedUnion<[ZodObject<{
     error: ZodOptional<ZodString>;
   }, $strip>>;
   logsAvailable: ZodBoolean;
+  metricsAvailable: ZodBoolean;
   createdAt: ZodNumber;
   dispatchedAt: ZodNullable<ZodNumber>;
   startedAt: ZodNullable<ZodNumber>;
@@ -2343,6 +2345,7 @@ declare const jobResponseSchema: ZodDiscriminatedUnion<[ZodObject<{
     error: ZodOptional<ZodString>;
   }, $strip>>;
   logsAvailable: ZodBoolean;
+  metricsAvailable: ZodBoolean;
   createdAt: ZodNumber;
   dispatchedAt: ZodNullable<ZodNumber>;
   startedAt: ZodNullable<ZodNumber>;
@@ -2381,6 +2384,7 @@ declare const jobResponseSchema: ZodDiscriminatedUnion<[ZodObject<{
     error: ZodOptional<ZodString>;
   }, $strip>>;
   logsAvailable: ZodBoolean;
+  metricsAvailable: ZodBoolean;
   createdAt: ZodNumber;
   dispatchedAt: ZodNullable<ZodNumber>;
   startedAt: ZodNullable<ZodNumber>;
@@ -2461,6 +2465,7 @@ declare const jobResponseSchema: ZodDiscriminatedUnion<[ZodObject<{
     error: ZodOptional<ZodString>;
   }, $strip>>;
   logsAvailable: ZodBoolean;
+  metricsAvailable: ZodBoolean;
   createdAt: ZodNumber;
   dispatchedAt: ZodNullable<ZodNumber>;
   startedAt: ZodNullable<ZodNumber>;
@@ -2503,6 +2508,7 @@ declare const jobResponseSchema: ZodDiscriminatedUnion<[ZodObject<{
     error: ZodOptional<ZodString>;
   }, $strip>>;
   logsAvailable: ZodBoolean;
+  metricsAvailable: ZodBoolean;
   createdAt: ZodNumber;
   dispatchedAt: ZodNullable<ZodNumber>;
   startedAt: ZodNullable<ZodNumber>;
@@ -2520,7 +2526,7 @@ declare const jobTypeSchema: ZodObject<{
   summary: ZodString;
   needs: ZodArray<ZodString>;
   pattern: ZodNullable<ZodString>;
-  provider: ZodOptional<ZodObject<{
+  runner: ZodOptional<ZodObject<{
     id: ZodString;
     resource: ZodString;
   }, $strip>>;
@@ -2866,6 +2872,19 @@ declare const orgEventSchema: ZodDiscriminatedUnion<[ZodObject<{
   stepProgress: ZodOptional<ZodNumber>;
   eta: ZodOptional<ZodNumber>;
   metrics: ZodOptional<ZodRecord<ZodString, ZodUnion<readonly [ZodNumber, ZodString]>>>;
+}, $strip>, ZodObject<{
+  type: ZodLiteral<"job.metrics">;
+  jobId: ZodString;
+  timestamp: ZodNumber;
+  cpuPct: ZodNumber;
+  cpuCores: ZodNumber;
+  allocatedCores: ZodOptional<ZodNumber>;
+  memUsedMB: ZodNumber;
+  memLimitMB: ZodNumber;
+  diskRMBps: ZodOptional<ZodNumber>;
+  diskWMBps: ZodOptional<ZodNumber>;
+  netRxMBps: ZodOptional<ZodNumber>;
+  netTxMBps: ZodOptional<ZodNumber>;
 }, $strip>, ZodObject<{
   type: ZodLiteral<"job.step">;
   jobId: ZodString;
@@ -2902,10 +2921,10 @@ declare const orgEventSchema: ZodDiscriminatedUnion<[ZodObject<{
 }, $strip>], "type">;
 type OrgEvent = output<typeof orgEventSchema>;
 /**
- * Log entry data structure used by dashboard hooks and executor.
+ * Log entry data structure used by dashboard hooks and runner.
  * Import from `@rendobar/shared/events/org-events`.
  *
- * Matches executor's log event format.
+ * Matches runner's log event format.
  */
 interface LogEntryData {
   timestamp: number;
@@ -2949,7 +2968,7 @@ declare function jobData<T>(job: JobResponse): T | null;
  * Per-job execution timing breakdown. Returned by `client.jobs.getTimings(id)`.
  *
  * All values are milliseconds, or `null` if the corresponding stage did not
- * execute (e.g. a sync-completed job has no executor or queue timings).
+ * execute (e.g. a sync-completed job has no runner or queue timings).
  */
 interface JobTimings {
   jobId: string;
@@ -3278,6 +3297,12 @@ interface JobSubscribeOptions {
   onComplete?: (event: Extract<OrgEvent, {
     type: "job.status";
   }>) => void;
+  onMetrics?: (event: Extract<OrgEvent, {
+    type: "job.metrics";
+  }>) => void;
+  onContext?: (event: Extract<OrgEvent, {
+    type: "job.context";
+  }>) => void;
   onError?: (error: Error) => void;
 }
 interface JobSubscription {

package/dist/index.d.mts

@@ -2269,6 +2269,7 @@ declare const jobResponseSchema: ZodDiscriminatedUnion<[ZodObject<{
     error: ZodOptional<ZodString>;
   }, $strip>>;
   logsAvailable: ZodBoolean;
+  metricsAvailable: ZodBoolean;
   createdAt: ZodNumber;
   dispatchedAt: ZodNullable<ZodNumber>;
   startedAt: ZodNullable<ZodNumber>;
@@ -2305,6 +2306,7 @@ declare const jobResponseSchema: ZodDiscriminatedUnion<[ZodObject<{
     error: ZodOptional<ZodString>;
   }, $strip>>;
   logsAvailable: ZodBoolean;
+  metricsAvailable: ZodBoolean;
   createdAt: ZodNumber;
   dispatchedAt: ZodNullable<ZodNumber>;
   startedAt: ZodNullable<ZodNumber>;
@@ -2343,6 +2345,7 @@ declare const jobResponseSchema: ZodDiscriminatedUnion<[ZodObject<{
     error: ZodOptional<ZodString>;
   }, $strip>>;
   logsAvailable: ZodBoolean;
+  metricsAvailable: ZodBoolean;
   createdAt: ZodNumber;
   dispatchedAt: ZodNullable<ZodNumber>;
   startedAt: ZodNullable<ZodNumber>;
@@ -2381,6 +2384,7 @@ declare const jobResponseSchema: ZodDiscriminatedUnion<[ZodObject<{
     error: ZodOptional<ZodString>;
   }, $strip>>;
   logsAvailable: ZodBoolean;
+  metricsAvailable: ZodBoolean;
   createdAt: ZodNumber;
   dispatchedAt: ZodNullable<ZodNumber>;
   startedAt: ZodNullable<ZodNumber>;
@@ -2461,6 +2465,7 @@ declare const jobResponseSchema: ZodDiscriminatedUnion<[ZodObject<{
     error: ZodOptional<ZodString>;
   }, $strip>>;
   logsAvailable: ZodBoolean;
+  metricsAvailable: ZodBoolean;
   createdAt: ZodNumber;
   dispatchedAt: ZodNullable<ZodNumber>;
   startedAt: ZodNullable<ZodNumber>;
@@ -2503,6 +2508,7 @@ declare const jobResponseSchema: ZodDiscriminatedUnion<[ZodObject<{
     error: ZodOptional<ZodString>;
   }, $strip>>;
   logsAvailable: ZodBoolean;
+  metricsAvailable: ZodBoolean;
   createdAt: ZodNumber;
   dispatchedAt: ZodNullable<ZodNumber>;
   startedAt: ZodNullable<ZodNumber>;
@@ -2520,7 +2526,7 @@ declare const jobTypeSchema: ZodObject<{
   summary: ZodString;
   needs: ZodArray<ZodString>;
   pattern: ZodNullable<ZodString>;
-  provider: ZodOptional<ZodObject<{
+  runner: ZodOptional<ZodObject<{
     id: ZodString;
     resource: ZodString;
   }, $strip>>;
@@ -2866,6 +2872,19 @@ declare const orgEventSchema: ZodDiscriminatedUnion<[ZodObject<{
   stepProgress: ZodOptional<ZodNumber>;
   eta: ZodOptional<ZodNumber>;
   metrics: ZodOptional<ZodRecord<ZodString, ZodUnion<readonly [ZodNumber, ZodString]>>>;
+}, $strip>, ZodObject<{
+  type: ZodLiteral<"job.metrics">;
+  jobId: ZodString;
+  timestamp: ZodNumber;
+  cpuPct: ZodNumber;
+  cpuCores: ZodNumber;
+  allocatedCores: ZodOptional<ZodNumber>;
+  memUsedMB: ZodNumber;
+  memLimitMB: ZodNumber;
+  diskRMBps: ZodOptional<ZodNumber>;
+  diskWMBps: ZodOptional<ZodNumber>;
+  netRxMBps: ZodOptional<ZodNumber>;
+  netTxMBps: ZodOptional<ZodNumber>;
 }, $strip>, ZodObject<{
   type: ZodLiteral<"job.step">;
   jobId: ZodString;
@@ -2902,10 +2921,10 @@ declare const orgEventSchema: ZodDiscriminatedUnion<[ZodObject<{
 }, $strip>], "type">;
 type OrgEvent = output<typeof orgEventSchema>;
 /**
- * Log entry data structure used by dashboard hooks and executor.
+ * Log entry data structure used by dashboard hooks and runner.
  * Import from `@rendobar/shared/events/org-events`.
  *
- * Matches executor's log event format.
+ * Matches runner's log event format.
  */
 interface LogEntryData {
   timestamp: number;
@@ -2949,7 +2968,7 @@ declare function jobData<T>(job: JobResponse): T | null;
  * Per-job execution timing breakdown. Returned by `client.jobs.getTimings(id)`.
  *
  * All values are milliseconds, or `null` if the corresponding stage did not
- * execute (e.g. a sync-completed job has no executor or queue timings).
+ * execute (e.g. a sync-completed job has no runner or queue timings).
  */
 interface JobTimings {
   jobId: string;
@@ -3278,6 +3297,12 @@ interface JobSubscribeOptions {
   onComplete?: (event: Extract<OrgEvent, {
     type: "job.status";
   }>) => void;
+  onMetrics?: (event: Extract<OrgEvent, {
+    type: "job.metrics";
+  }>) => void;
+  onContext?: (event: Extract<OrgEvent, {
+    type: "job.context";
+  }>) => void;
   onError?: (error: Error) => void;
 }
 interface JobSubscription {

package/dist/index.mjs

@@ -306,22 +306,53 @@ function toBlob(file) {
 	return file instanceof Blob ? file : new Blob([file]);
 }
 /**
+* Per-attempt upload time budget. fetch() exposes no upload progress, so a
+* stalled socket and a slow link are indistinguishable from the outside; a
+* hard per-attempt budget is the only portable stall cap. The ladder escalates
+* (healthy 500 KiB/s assumption first, then 100, then 50) so a genuinely slow
+* connection that times out on an early attempt still completes on a later,
+* more patient one — while a hung socket gets cut and retried on a fresh
+* connection instead of waiting on the OS TCP timeout.
+*
+* @internal exported for tests
+*/
+function attemptTimeoutMs(sizeBytes, attempt) {
+	const GRACE_MS = [
+		1e4,
+		3e4,
+		6e4
+	];
+	const RATE_BPS = [
+		500 * 1024,
+		100 * 1024,
+		50 * 1024
+	];
+	const i = Math.min(attempt, GRACE_MS.length - 1);
+	return GRACE_MS[i] + Math.ceil(sizeBytes / RATE_BPS[i] * 1e3);
+}
+/**
 * PUT a body to a presigned R2 url with bounded retry.
 *
 * Returns the ETag string when the bucket exposes it, or `null` when the
-* response header is absent (e.g. bucket CORS not exposing ETag). Only
-* network/HTTP failures trigger retries; a missing ETag is not retried because
-* it is a deterministic misconfiguration, not a transient error.
+* response header is absent (e.g. bucket CORS not exposing ETag). Network/HTTP
+* failures and per-attempt timeouts trigger retries; a caller abort and a
+* missing ETag do not (the latter is a deterministic misconfiguration, not a
+* transient error).
+*
+* @internal exported for tests
 */
-async function putWithRetry(url, body, signal, attempts = 3) {
+async function putWithRetry(url, body, signal, sizeBytes, attempts = 3, attemptTimeouts) {
 	let lastErr;
 	for (let i = 0; i < attempts; i++) {
 		if (signal?.aborted) throw new Error("Upload aborted");
+		const timeoutMs = attemptTimeouts?.[i] ?? attemptTimeoutMs(sizeBytes, i);
+		const timeout = AbortSignal.timeout(timeoutMs);
+		const attemptSignal = signal ? AbortSignal.any([signal, timeout]) : timeout;
 		try {
 			const res = await fetch(url, {
 				method: "PUT",
 				body,
-				signal
+				signal: attemptSignal
 			});
 			if (!res.ok) throw new Error(`Upload PUT failed: ${res.status}`);
 			return res.headers.get("etag");
@@ -377,7 +408,7 @@ function createUploadsResource(request) {
 			return init.data;
 		}
 		if (init.status === "presigned") {
-			await putWithRetry(init.upload.url, blob, options.signal);
+			await putWithRetry(init.upload.url, blob, options.signal, size);
 			options.onProgress?.({
 				loaded: size,
 				total: size
@@ -398,7 +429,7 @@ function createUploadsResource(request) {
 			const chunk = blob.slice(start, Math.min(start + partSize, size));
 			let etag;
 			try {
-				etag = await putWithRetry(p.url, chunk, combinedSignal);
+				etag = await putWithRetry(p.url, chunk, combinedSignal, chunk.size);
 			} catch (e) {
 				internal.abort();
 				partError = e instanceof Error ? e : new Error(String(e));
@@ -667,6 +698,8 @@ const KNOWN_EVENT_TYPES = new Set([
 	"job.progress",
 	"job.step",
 	"job.log",
+	"job.metrics",
+	"job.context",
 	"balance.updated",
 	"subscription.updated",
 	"notification",
@@ -755,6 +788,12 @@ function dispatchJobEvent(event, options) {
 		case "job.result":
 			options.onResult?.(event);
 			break;
+		case "job.metrics":
+			options.onMetrics?.(event);
+			break;
+		case "job.context":
+			options.onContext?.(event);
+			break;
 	}
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rendobar/sdk",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "type": "module",
   "description": "TypeScript client for the Rendobar media processing API",
   "main": "./dist/index.cjs",