@sogni-ai/sogni-client 5.63.2 → 5.63.4

package/dist-esm/Projects/index.js

@@ -20,6 +20,7 @@ import getUUID from '../lib/getUUID.js';
 import Cache from '../lib/Cache.js';
 import { enhancementDefaults } from './Job.js';
 import { calculateVideoFrames, getEnhacementStrength, getVideoAssetRequirements, getVideoContextImageSlots, getPixal3dOrbitViewSlots, getMinimaxH3KeyframeSlots, getMinimaxH3ReferenceAudioSlots, getMinimaxH3ReferenceVideoSlots, getVideoWorkflowType, asResultMediaKind, isAudioModel, isModelArtifactModel, isMinimaxH3ReferenceModel, isSegmentationModel, isVideoModel, resultMediaEvidence, usesReferenceMask } from './utils/index.js';
+import { getFileContentType } from './utils/fileContentType.js';
 import { getMaxContextImages, validateSampler, isGptImageModel } from '../lib/validation.js';
 import { isAudioTier, isComfyImageTier, isImageTier, isVideoTier } from './types/ModelTiersRaw.js';
 import { mapAudioTier, mapComfyImageTier, mapImageTier, mapVideoTier } from './types/ModelOptions.js';
@@ -148,46 +149,6 @@ function deriveLoraCapableModelIds(loras) {
     }
     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) {
-    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.
@@ -445,6 +406,8 @@ class ProjectsApi extends ApiGroup {
         /** Projects waiting for a reconnect to be resubmitted on. */
         this._awaitingResubmit = new Set();
         this._resubmitWaiters = new Set();
+        /** Initial sends finish after model lookups and uploads, independently of creation time. */
+        this._submittedAt = new Map();
         /** When each resubmitted project was last sent, for the recently-created grace. */
         this._resubmittedAt = new Map();
         /** Bumped on every transport loss; tells a frame sent before a drop from one sent after. */
@@ -527,6 +490,7 @@ class ProjectsApi extends ApiGroup {
             for (const stopWaiting of this._resubmitWaiters)
                 stopWaiting();
             this._awaitingResubmit.clear();
+            this._submittedAt.clear();
             this._resubmittedAt.clear();
             this._sentOnGeneration.clear();
             this._recoveredCompletedIds.clear();
@@ -961,6 +925,7 @@ class ProjectsApi extends ApiGroup {
         }
         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
@@ -1248,8 +1213,8 @@ class ProjectsApi extends ApiGroup {
         }, Math.max(0, delayMs) + 250);
     }
     _lastSubmittedAt(project) {
-        var _a;
-        return Math.max(project.startedAt.getTime(), (_a = this._resubmittedAt.get(project.id)) !== null && _a !== void 0 ? _a : 0);
+        var _a, _b;
+        return Math.max((_a = this._submittedAt.get(project.id)) !== null && _a !== void 0 ? _a : project.startedAt.getTime(), (_b = this._resubmittedAt.get(project.id)) !== null && _b !== void 0 ? _b : 0);
     }
     handleServerConnected() {
         this.transportDisconnected = false;
@@ -1969,6 +1934,7 @@ class ProjectsApi extends ApiGroup {
     _trackSubmitted(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;
         }
@@ -2028,7 +1994,7 @@ class ProjectsApi extends ApiGroup {
         if (!keyFrame)
             return;
         if (data.referenceAudio && data.referenceAudio !== true) {
-            keyFrame.referenceAudioContentType = getFileContentType(data.referenceAudio);
+            keyFrame.referenceAudioContentType = getFileContentType(data.referenceAudio, 'audio');
         }
     }
     _processVideoAssets(project, data) {
@@ -2092,25 +2058,25 @@ class ProjectsApi extends ApiGroup {
         }
         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;
             (_b = keyFrame.referenceAudioContentType) !== null && _b !== void 0 ? _b : (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');
                 }
             }
         }
@@ -2731,7 +2697,7 @@ class ProjectsApi extends ApiGroup {
             var _a;
             const assertSession = (_a = this._preparingSessions.get(projectId)) !== null && _a !== void 0 ? _a : captureRequestSession(this.client.auth);
             assertSession();
-            const contentType = getFileContentType(file);
+            const contentType = getFileContentType(file, 'audio');
             if (yield this.assets.tryBindFile(file, contentType, { projectId, type: 'referenceAudio', id }))
                 return;
             assertSession();
@@ -2771,7 +2737,7 @@ class ProjectsApi extends ApiGroup {
             var _a;
             const assertSession = (_a = this._preparingSessions.get(projectId)) !== null && _a !== void 0 ? _a : captureRequestSession(this.client.auth);
             assertSession();
-            const contentType = getFileContentType(file);
+            const contentType = getFileContentType(file, 'video');
             if (yield this.assets.tryBindFile(file, contentType, { projectId, type: 'referenceVideo', id }))
                 return;
             assertSession();