@sogni-ai/sogni-client 5.63.2 → 5.63.4

package/src/Projects/index.ts

@@ -88,6 +88,7 @@ import {
   type ResultMediaKind,
   usesReferenceMask
 } from './utils/index.js';
+import { getFileContentType } from './utils/fileContentType.js';
 import { TokenType } from '../types/token.js';
 import type { JobProvenance } from './types/JobProvenance.js';
 import { getMaxContextImages, validateSampler, isGptImageModel } from '../lib/validation.js';
@@ -249,41 +250,6 @@ function deriveLoraCapableModelIds(loras: LoraCatalogEntry[]): string[] {
   return Array.from(modelIds).sort();
 }
 
-/**
- * Detect content type from a file object.
- * For File objects in browser, uses the type property.
- * Returns undefined if content type cannot be detected.
- */
-function getFileContentType(file: File | Buffer | Blob): string | undefined {
-  if (file instanceof Blob && 'type' in file && file.type) {
-    return file.type;
-  }
-  if (typeof Buffer !== 'undefined' && Buffer.isBuffer(file)) {
-    if (file.length >= 12) {
-      if (file[0] === 0xff && file[1] === 0xd8 && file[2] === 0xff) return 'image/jpeg';
-      if (file[0] === 0x89 && file[1] === 0x50 && file[2] === 0x4e && file[3] === 0x47) {
-        return 'image/png';
-      }
-      if (file.toString('ascii', 0, 4) === 'RIFF' && file.toString('ascii', 8, 12) === 'WEBP') {
-        return 'image/webp';
-      }
-      if (file.toString('ascii', 0, 3) === 'GIF') return 'image/gif';
-      if (file.toString('ascii', 4, 8) === 'ftyp') {
-        const brand = file.toString('ascii', 8, 12).toLowerCase();
-        if (brand.includes('m4a') || brand.includes('m4b')) return 'audio/mp4';
-        if (brand.includes('qt')) return 'video/quicktime';
-        return 'video/mp4';
-      }
-      if (file.toString('ascii', 0, 4) === 'RIFF' && file.toString('ascii', 8, 12) === 'WAVE') {
-        return 'audio/wav';
-      }
-    }
-    if (file.length >= 3 && file.toString('ascii', 0, 3) === 'ID3') return 'audio/mpeg';
-    if (file.length >= 2 && file[0] === 0xff && (file[1] & 0xe0) === 0xe0) return 'audio/mpeg';
-  }
-  return undefined;
-}
-
 /**
  * Convert file to a format compatible with fetch body.
  * Converts Node.js Buffer to Blob for cross-platform compatibility.
@@ -577,6 +543,8 @@ class ProjectsApi extends ApiGroup<ProjectApiEvents> {
   /** Projects waiting for a reconnect to be resubmitted on. */
   private _awaitingResubmit = new Set<string>();
   private _resubmitWaiters = new Set<() => void>();
+  /** Initial sends finish after model lookups and uploads, independently of creation time. */
+  private _submittedAt = new Map<string, number>();
   /** When each resubmitted project was last sent, for the recently-created grace. */
   private _resubmittedAt = new Map<string, number>();
   /** Bumped on every transport loss; tells a frame sent before a drop from one sent after. */
@@ -804,6 +772,7 @@ class ProjectsApi extends ApiGroup<ProjectApiEvents> {
       this._unadmittedRequests.clear();
       for (const stopWaiting of this._resubmitWaiters) stopWaiting();
       this._awaitingResubmit.clear();
+      this._submittedAt.clear();
       this._resubmittedAt.clear();
       this._sentOnGeneration.clear();
       this._recoveredCompletedIds.clear();
@@ -1299,6 +1268,7 @@ class ProjectsApi extends ApiGroup<ProjectApiEvents> {
     }
     if (project.finished) {
       this._unadmittedRequests.delete(project.id);
+      this._submittedAt.delete(project.id);
       this._resubmittedAt.delete(project.id);
       this._sentOnGeneration.delete(project.id);
       // Sync project data with the server and remove it from the list after some time
@@ -1614,7 +1584,10 @@ class ProjectsApi extends ApiGroup<ProjectApiEvents> {
   }
 
   private _lastSubmittedAt(project: Project): number {
-    return Math.max(project.startedAt.getTime(), this._resubmittedAt.get(project.id) ?? 0);
+    return Math.max(
+      this._submittedAt.get(project.id) ?? project.startedAt.getTime(),
+      this._resubmittedAt.get(project.id) ?? 0
+    );
   }
 
   private handleServerConnected() {
@@ -2409,6 +2382,7 @@ class ProjectsApi extends ApiGroup<ProjectApiEvents> {
   private _trackSubmitted(project: Project): Project {
     const tracked = this.projects.find((candidate) => candidate.id === project.id);
     if (!tracked) {
+      this._submittedAt.set(project.id, Date.now());
       this.projects.push(project);
       return project;
     }
@@ -2473,7 +2447,7 @@ class ProjectsApi extends ApiGroup<ProjectApiEvents> {
     const keyFrame = request.keyFrames?.[0];
     if (!keyFrame) return;
     if (data.referenceAudio && data.referenceAudio !== true) {
-      keyFrame.referenceAudioContentType = getFileContentType(data.referenceAudio);
+      keyFrame.referenceAudioContentType = getFileContentType(data.referenceAudio, 'audio');
     }
   }
 
@@ -2548,25 +2522,25 @@ class ProjectsApi extends ApiGroup<ProjectApiEvents> {
     }
     const isMinimaxH3R2v = isMinimaxH3ReferenceModel(data.modelId);
     if (!isMinimaxH3R2v && data.referenceAudio && data.referenceAudio !== true) {
-      keyFrame.referenceAudioContentType = getFileContentType(data.referenceAudio);
+      keyFrame.referenceAudioContentType = getFileContentType(data.referenceAudio, 'audio');
     }
     if (data.referenceAudioIdentity && data.referenceAudioIdentity !== true) {
-      const contentType = getFileContentType(data.referenceAudioIdentity);
+      const contentType = getFileContentType(data.referenceAudioIdentity, 'audio');
       keyFrame.referenceAudioIdentityContentType = contentType;
       keyFrame.referenceAudioContentType ??= contentType;
     }
     if (!isMinimaxH3R2v && data.referenceVideo && data.referenceVideo !== true) {
-      keyFrame.referenceVideoContentType = getFileContentType(data.referenceVideo);
+      keyFrame.referenceVideoContentType = getFileContentType(data.referenceVideo, 'video');
     }
     if (isMinimaxH3R2v) {
       for (const { slot, media } of getMinimaxH3ReferenceAudioSlots(data)) {
         if (typeof media !== 'boolean') {
-          keyFrame[`referenceAudio${slot}ContentType`] = getFileContentType(media);
+          keyFrame[`referenceAudio${slot}ContentType`] = getFileContentType(media, 'audio');
         }
       }
       for (const { slot, media } of getMinimaxH3ReferenceVideoSlots(data)) {
         if (typeof media !== 'boolean') {
-          keyFrame[`referenceVideo${slot}ContentType`] = getFileContentType(media);
+          keyFrame[`referenceVideo${slot}ContentType`] = getFileContentType(media, 'video');
         }
       }
     }
@@ -3233,7 +3207,7 @@ class ProjectsApi extends ApiGroup<ProjectApiEvents> {
     const assertSession =
       this._preparingSessions.get(projectId) ?? captureRequestSession(this.client.auth);
     assertSession();
-    const contentType = getFileContentType(file);
+    const contentType = getFileContentType(file, 'audio');
     if (await this.assets.tryBindFile(file, contentType, { projectId, type: 'referenceAudio', id }))
       return;
     assertSession();
@@ -3272,7 +3246,7 @@ class ProjectsApi extends ApiGroup<ProjectApiEvents> {
     const assertSession =
       this._preparingSessions.get(projectId) ?? captureRequestSession(this.client.auth);
     assertSession();
-    const contentType = getFileContentType(file);
+    const contentType = getFileContentType(file, 'video');
     if (await this.assets.tryBindFile(file, contentType, { projectId, type: 'referenceVideo', id }))
       return;
     assertSession();

package/src/Projects/utils/fileContentType.ts

@@ -0,0 +1,55 @@
+/**
+ * Detect the content type of a reference file from its bytes.
+ *
+ * A browser `File`/`Blob` carries its own `type`. A Node `Buffer` is sniffed
+ * by magic bytes. `slot` says which reference the buffer fills: a
+ * Matroska/WebM container (EBML header) and an Ogg container carry either
+ * audio or video, and the magic bytes do not say which, so the slot decides
+ * between `audio/webm` and `video/webm` (`audio/ogg` and `video/ogg`).
+ *
+ * The declared type matters past the upload: the socket keeps audio guides the
+ * Mac app's AVFoundation decoder cannot read (OGG, WebM) off Mac app workers
+ * only when the type is declared; an undeclared guide is routed blind and the
+ * render fails there (sogni-socket constants/appMlxWorker.js
+ * APP_MLX_AUDIO_GUIDE_CONTENT_TYPES, 2026-10).
+ *
+ * Returns undefined when the bytes match nothing known.
+ */
+export function getFileContentType(
+  file: File | Buffer | Blob,
+  slot?: 'audio' | 'video'
+): string | undefined {
+  if (file instanceof Blob && 'type' in file && file.type) {
+    return file.type;
+  }
+  if (typeof Buffer !== 'undefined' && Buffer.isBuffer(file)) {
+    if (file.length >= 12) {
+      if (file[0] === 0xff && file[1] === 0xd8 && file[2] === 0xff) return 'image/jpeg';
+      if (file[0] === 0x89 && file[1] === 0x50 && file[2] === 0x4e && file[3] === 0x47) {
+        return 'image/png';
+      }
+      if (file.toString('ascii', 0, 4) === 'RIFF' && file.toString('ascii', 8, 12) === 'WEBP') {
+        return 'image/webp';
+      }
+      if (file.toString('ascii', 0, 3) === 'GIF') return 'image/gif';
+      if (file.toString('ascii', 4, 8) === 'ftyp') {
+        const brand = file.toString('ascii', 8, 12).toLowerCase();
+        if (brand.includes('m4a') || brand.includes('m4b')) return 'audio/mp4';
+        if (brand.includes('qt')) return 'video/quicktime';
+        return 'video/mp4';
+      }
+      if (file.toString('ascii', 0, 4) === 'RIFF' && file.toString('ascii', 8, 12) === 'WAVE') {
+        return 'audio/wav';
+      }
+      if (file.toString('ascii', 0, 4) === 'fLaC') return 'audio/flac';
+      if (file.toString('ascii', 0, 4) === 'OggS')
+        return slot === 'video' ? 'video/ogg' : 'audio/ogg';
+      if (file[0] === 0x1a && file[1] === 0x45 && file[2] === 0xdf && file[3] === 0xa3) {
+        return slot === 'audio' ? 'audio/webm' : 'video/webm';
+      }
+    }
+    if (file.length >= 3 && file.toString('ascii', 0, 3) === 'ID3') return 'audio/mpeg';
+    if (file.length >= 2 && file[0] === 0xff && (file[1] & 0xe0) === 0xe0) return 'audio/mpeg';
+  }
+  return undefined;
+}

package/src/version.ts

@@ -1,3 +1,3 @@
 // AUTO-GENERATED by scripts/generate-version.mjs — do not edit.
 // Source of truth: package.json version.
-export const LIB_VERSION = '5.63.2';
+export const LIB_VERSION = '5.63.4';