@sogni-ai/sogni-client 5.52.0 → 5.53.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/ChannelCoordinator.d.ts +2 -2
- package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/ChannelCoordinator.js +14 -9
- package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/ChannelCoordinator.js.map +1 -1
- package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/index.js +6 -3
- package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/index.js.map +1 -1
- package/dist/ApiClient/WebSocketClient/index.d.ts +1 -1
- package/dist/ApiClient/WebSocketClient/index.js +15 -10
- package/dist/ApiClient/WebSocketClient/index.js.map +1 -1
- package/dist/ApiClient/WebSocketClient/requestDelivery.d.ts +6 -0
- package/dist/ApiClient/WebSocketClient/requestDelivery.js +17 -0
- package/dist/ApiClient/WebSocketClient/requestDelivery.js.map +1 -0
- package/dist/Projects/index.d.ts +8 -1
- package/dist/Projects/index.js +69 -19
- package/dist/Projects/index.js.map +1 -1
- package/dist/Projects/types/EstimationResponse.d.ts +7 -0
- package/dist/Projects/types/index.d.ts +37 -0
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dist-esm/ApiClient/WebSocketClient/BrowserWebSocketClient/ChannelCoordinator.js +14 -9
- package/dist-esm/ApiClient/WebSocketClient/BrowserWebSocketClient/ChannelCoordinator.js.map +1 -1
- package/dist-esm/ApiClient/WebSocketClient/BrowserWebSocketClient/index.js +6 -3
- package/dist-esm/ApiClient/WebSocketClient/BrowserWebSocketClient/index.js.map +1 -1
- package/dist-esm/ApiClient/WebSocketClient/index.js +14 -9
- package/dist-esm/ApiClient/WebSocketClient/index.js.map +1 -1
- package/dist-esm/ApiClient/WebSocketClient/requestDelivery.js +13 -0
- package/dist-esm/ApiClient/WebSocketClient/requestDelivery.js.map +1 -0
- package/dist-esm/Projects/index.js +69 -19
- package/dist-esm/Projects/index.js.map +1 -1
- package/dist-esm/version.js +1 -1
- package/package.json +2 -1
- package/src/ApiClient/WebSocketClient/BrowserWebSocketClient/ChannelCoordinator.ts +21 -11
- package/src/ApiClient/WebSocketClient/BrowserWebSocketClient/index.ts +12 -6
- package/src/ApiClient/WebSocketClient/index.ts +16 -8
- package/src/ApiClient/WebSocketClient/requestDelivery.ts +14 -0
- package/src/Projects/index.ts +66 -18
- package/src/Projects/types/EstimationResponse.ts +5 -0
- package/src/Projects/types/index.ts +37 -0
- package/src/version.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
# [5.53.0](https://github.com/Sogni-AI/sogni-client/compare/v5.52.1...v5.53.0) (2026-09-19)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* **projects:** return the daily fair-use share on cost estimates ([62594b1](https://github.com/Sogni-AI/sogni-client/commit/62594b1c67021015a69711081a2e668dee9514e7))
|
|
7
|
+
|
|
8
|
+
## [5.52.1](https://github.com/Sogni-AI/sogni-client/compare/v5.52.0...v5.52.1) (2026-09-18)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* **browser:** preserve project submissions across socket reconnects ([#25](https://github.com/Sogni-AI/sogni-client/issues/25)) ([d65916e](https://github.com/Sogni-AI/sogni-client/commit/d65916e8a1ed38154c92d3237e2f4d937fa2c5da))
|
|
14
|
+
|
|
1
15
|
# [5.52.0](https://github.com/Sogni-AI/sogni-client/compare/v5.51.1...v5.52.0) (2026-09-18)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Logger } from '../../../lib/DefaultLogger.js';
|
|
2
2
|
interface Callbacks<M, N> {
|
|
3
3
|
onRoleChange: (isPrimary: boolean) => void;
|
|
4
|
-
onMessage: (message: M) => Promise<void>;
|
|
4
|
+
onMessage: (message: M, deadline?: number) => Promise<void>;
|
|
5
5
|
onNotification: (notification: N) => void;
|
|
6
6
|
}
|
|
7
7
|
interface Options<M, N> {
|
|
@@ -62,7 +62,7 @@ declare class ChannelCoordinator<M, N> {
|
|
|
62
62
|
private handleRequestAck;
|
|
63
63
|
private send;
|
|
64
64
|
private broadcast;
|
|
65
|
-
sendMessage(message: M): Promise<any>;
|
|
65
|
+
sendMessage(message: M, ackTimeoutMs?: number): Promise<any>;
|
|
66
66
|
notify(message: N): void;
|
|
67
67
|
}
|
|
68
68
|
export default ChannelCoordinator;
|
|
@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const getUUID_js_1 = __importDefault(require("../../../lib/getUUID.js"));
|
|
16
|
+
const requestDelivery_js_1 = require("../requestDelivery.js");
|
|
16
17
|
const PRIMARY_HEARTBEAT_INTERVAL = 2000;
|
|
17
18
|
const PRIMARY_TIMEOUT = 4000;
|
|
18
19
|
const ELECTION_SETTLE_TIMEOUT = 600;
|
|
@@ -285,8 +286,12 @@ class ChannelCoordinator {
|
|
|
285
286
|
return;
|
|
286
287
|
}
|
|
287
288
|
this.logger.debug(`Received request from secondary`, message.payload);
|
|
288
|
-
|
|
289
|
-
|
|
289
|
+
// Use the sender's clock, not a fresh timeout when a suspended primary
|
|
290
|
+
// finally receives the request. The handler enforces it for socket sends,
|
|
291
|
+
// so an expired request is never forwarded; control messages still apply.
|
|
292
|
+
const deadline = envelope.timestamp + requestDelivery_js_1.SEND_READY_TIMEOUT_MS;
|
|
293
|
+
Promise.resolve()
|
|
294
|
+
.then(() => this.callbacks.onMessage(message.payload, deadline))
|
|
290
295
|
.then(() => {
|
|
291
296
|
this.send({
|
|
292
297
|
type: MessageType.REQUEST_ACK,
|
|
@@ -307,8 +312,8 @@ class ChannelCoordinator {
|
|
|
307
312
|
delete this.ackCallbacks[message.payload.id];
|
|
308
313
|
}
|
|
309
314
|
}
|
|
310
|
-
send(
|
|
311
|
-
return __awaiter(this,
|
|
315
|
+
send(message_1, recipientId_1) {
|
|
316
|
+
return __awaiter(this, arguments, void 0, function* (message, recipientId, ackTimeoutMs = ACK_TIMEOUT) {
|
|
312
317
|
const envelope = {
|
|
313
318
|
id: (0, getUUID_js_1.default)(),
|
|
314
319
|
senderId: this.id,
|
|
@@ -323,10 +328,10 @@ class ChannelCoordinator {
|
|
|
323
328
|
return new Promise((resolve, reject) => {
|
|
324
329
|
const ackTimeout = setTimeout(() => {
|
|
325
330
|
if (this.ackCallbacks[envelope.id]) {
|
|
326
|
-
this.ackCallbacks[envelope.id](new
|
|
331
|
+
this.ackCallbacks[envelope.id](new requestDelivery_js_1.MessageDeliveryUncertainError());
|
|
327
332
|
delete this.ackCallbacks[envelope.id];
|
|
328
333
|
}
|
|
329
|
-
},
|
|
334
|
+
}, ackTimeoutMs);
|
|
330
335
|
this.ackCallbacks[envelope.id] = (error) => {
|
|
331
336
|
clearTimeout(ackTimeout);
|
|
332
337
|
delete this.ackCallbacks[envelope.id];
|
|
@@ -351,8 +356,8 @@ class ChannelCoordinator {
|
|
|
351
356
|
this.channel.postMessage(envelope);
|
|
352
357
|
return envelope.id;
|
|
353
358
|
}
|
|
354
|
-
sendMessage(
|
|
355
|
-
return __awaiter(this,
|
|
359
|
+
sendMessage(message_1) {
|
|
360
|
+
return __awaiter(this, arguments, void 0, function* (message, ackTimeoutMs = ACK_TIMEOUT) {
|
|
356
361
|
this.logger.debug(`Sending message to primary`, message);
|
|
357
362
|
yield this.ensureFreshPrimaryBeforeRequest();
|
|
358
363
|
if (this._isPrimary) {
|
|
@@ -362,7 +367,7 @@ class ChannelCoordinator {
|
|
|
362
367
|
return this.send({
|
|
363
368
|
type: MessageType.REQUEST,
|
|
364
369
|
payload: message
|
|
365
|
-
});
|
|
370
|
+
}, undefined, ackTimeoutMs);
|
|
366
371
|
});
|
|
367
372
|
}
|
|
368
373
|
notify(message) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChannelCoordinator.js","sourceRoot":"","sources":["../../../../src/ApiClient/WebSocketClient/BrowserWebSocketClient/ChannelCoordinator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,yEAA8C;AAG9C,MAAM,0BAA0B,GAAG,IAAI,CAAC;AACxC,MAAM,eAAe,GAAG,IAAI,CAAC;AAC7B,MAAM,uBAAuB,GAAG,GAAG,CAAC;AACpC,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,IAAK,WAQJ;AARD,WAAK,WAAW;IACd,oCAAqB,CAAA;IACrB,sDAAuC,CAAA;IACvC,oDAAqC,CAAA;IACrC,sDAAuC,CAAA;IACvC,sCAAuB,CAAA;IACvB,kCAAmB,CAAA;IACnB,0CAA2B,CAAA;AAC7B,CAAC,EARI,WAAW,KAAX,WAAW,QAQf;AAsDD,MAAM,YAAY,GAAG,yBAAyB,CAAC;AAE/C,IAAI,WAAW,GAAG,KAAK,CAAC;AACxB,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;IAC3E,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,KAAK,SAAS,CAAC;IAC5D,MAAM,CAAC,gBAAgB,CACrB,kBAAkB,EAClB,GAAG,EAAE,CAAC,CAAC,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,KAAK,SAAS,CAAC,CACpE,CAAC;AACJ,CAAC;AAaD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,kBAAkB;IAsBtB,YAAY,EAAE,SAAS,EAAE,MAAM,EAAiB;QArB/B,OAAE,GAAW,IAAA,oBAAO,GAAE,CAAC;QAChC,aAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,YAAO,GAAG,IAAI,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAEtD,eAAU,GAAG,KAAK,CAAC;QAInB,iBAAY,GAA0C,EAAE,CAAC;QAEjE,yCAAyC;QACjC,uBAAkB,GAAY,KAAK,CAAC;QACpC,sBAAiB,GAAwB,IAAI,GAAG,EAAE,CAAC;QAE3D,wCAAwC;QAChC,yBAAoB,GAAW,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1C,mBAAc,GAA0B,IAAI,CAAC;QAC7C,sBAAiB,GAA0B,IAAI,CAAC;QAChD,kBAAa,GAAsB,GAAG,EAAE,GAAE,CAAC,CAAC;QAIlD,IAAI,CAAC,YAAY,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1C,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,aAAa,GAAG,GAAG,EAAE;gBACxB,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,MAAM,GAAG,IAAI,CAAC;oBACd,OAAO,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,4DAA4D;QAC5D,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;YAClC,MAAM,CAAC,gBAAgB,CAAC,cAAc,EAAE,GAAG,EAAE;gBAC3C,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;gBAClB,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAY,eAAe;QACzB,OAAO,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC1D,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAEO,cAAc;QACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,2CAA2C,IAAI,CAAC,eAAe,uBAAuB,WAAW,EAAE,CACpG,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAC/B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QAC1D,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,WAAW,CAAC,QAAQ;YAC1B,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE;SAC5C,CAAC,CAAC;QACH,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC;IAEO,uBAAuB;QAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAChF,CAAC;IAEa,+BAA+B;;YAC3C,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,OAAO;YACT,CAAC;YAED,wEAAwE;YACxE,0EAA0E;YAC1E,yEAAyE;YACzE,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC;YAC1D,IAAI,UAAU,IAAI,eAAe,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC9D,OAAO;YACT,CAAC;YAED,IAAI,UAAU,GAAG,eAAe,EAAE,CAAC;gBACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,+BAA+B,UAAU,+CAA+C,CACzF,CAAC;gBACF,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,CAAC;YAED,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACvC,CAAC;KAAA;IAEO,eAAe;QACrB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,wBAAwB;QACxB,IAAI,eAAe,GAAG,CAAC,QAAQ,CAAC;QAChC,IAAI,QAAQ,GAAkB,IAAI,CAAC;QAEnC,KAAK,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACpD,IAAI,QAAQ,GAAG,eAAe,IAAI,CAAC,QAAQ,KAAK,eAAe,IAAI,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC1F,eAAe,GAAG,QAAQ,CAAC;gBAC3B,QAAQ,GAAG,EAAE,CAAC;YAChB,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;YACzB,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,QAAQ,EAAE,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,QAAQ,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;QAChC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAEO,aAAa;QACnB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvC,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,WAAW,CAAC,gBAAgB;YAClC,OAAO,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE;SACzD,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAEO,cAAc;QACpB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;YACrC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,SAAS,CAAC;oBACb,IAAI,EAAE,WAAW,CAAC,iBAAiB;oBACnC,OAAO,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE;iBACzD,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,CAAC;QACH,CAAC,EAAE,0BAA0B,CAAC,CAAC;IACjC,CAAC;IAEO,aAAa;QACnB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC7B,CAAC;IACH,CAAC;IAEO,mBAAmB;QACzB,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;YACxC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACrB,MAAM,sBAAsB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC;gBACtE,IAAI,sBAAsB,GAAG,eAAe,EAAE,CAAC;oBAC7C,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACzC,CAAC;QACH,CAAC,EAAE,0BAA0B,CAAC,CAAC;IACjC,CAAC;IAEO,aAAa,CAAC,QAAkB;QACtC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QACpD,MAAM,gBAAgB,GAAG,WAAW,IAAI,WAAW,KAAK,IAAI,CAAC,EAAE,CAAC;QAChE,IAAI,QAAQ,KAAK,IAAI,CAAC,EAAE,IAAI,gBAAgB,EAAE,CAAC;YAC7C,OAAO;QACT,CAAC;QACD,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,WAAW,CAAC,QAAQ;gBACvB,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACtC,KAAK,WAAW,CAAC,iBAAiB;gBAChC,OAAO,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;YAC9C,KAAK,WAAW,CAAC,gBAAgB;gBAC/B,OAAO,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;YAC7C,KAAK,WAAW,CAAC,iBAAiB;gBAChC,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACvC,KAAK,WAAW,CAAC,SAAS;gBACxB,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YACvC,KAAK,WAAW,CAAC,OAAO;gBACtB,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/C,KAAK,WAAW,CAAC,WAAW;gBAC1B,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,OAAiB;QACtC,2EAA2E;QAC3E,yEAAyE;QACzE,qEAAqE;QACrE,4DAA4D;QAC5D,EAAE;QACF,wEAAwE;QACxE,wEAAwE;QACxE,sEAAsE;QACtE,uEAAuE;QACvE,4DAA4D;QAC5D,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,WAAW,CAAC,gBAAgB;gBAClC,OAAO,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE;aACzD,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,WAAW,CAAC,iBAAiB;YACnC,OAAO,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE;SACzD,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAChF,IAAI,CAAC,cAAc,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;IAEO,sBAAsB,CAAC,OAAyB;QACtD,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAEO,qBAAqB,CAAC,OAAwB;QACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9D,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvC,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;QAChC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAE/B,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC7B,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAEO,sBAAsB;QAC5B,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzC,CAAC;IAEO,eAAe,CAAC,OAAyB;QAC/C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAEO,aAAa,CAAC,OAAuB,EAAE,QAAkB;QAC/D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,IAAI,CAAC,SAAS;aACX,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC;aAC1B,IAAI,CAAC,GAAG,EAAE;YACT,IAAI,CAAC,IAAI,CACP;gBACE,IAAI,EAAE,WAAW,CAAC,WAAW;gBAC7B,OAAO,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE;aAC7B,EACD,QAAQ,CAAC,QAAQ,CAClB,CAAC;QACJ,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,IAAI,CAAC,IAAI,CACP;gBACE,IAAI,EAAE,WAAW,CAAC,WAAW;gBAC7B,OAAO,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE;aACpC,EACD,QAAQ,CAAC,QAAQ,CAClB,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,gBAAgB,CAAC,OAA0B;QACjD,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC1D,IAAI,WAAW,EAAE,CAAC;YAChB,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAEa,IAAI,CAChB,OAA2C,EAC3C,WAAoB;;YAEpB,MAAM,QAAQ,GAAa;gBACzB,EAAE,EAAE,IAAA,oBAAO,GAAE;gBACb,QAAQ,EAAE,IAAI,CAAC,EAAE;gBACjB,WAAW;gBACX,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,OAAO,EAAE,OAAO;aACjB,CAAC;YACF,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;gBACzC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBACnC,OAAO;YACT,CAAC;YACD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC3C,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE;oBACjC,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;wBACnC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC;wBACtE,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;oBACxC,CAAC;gBACH,CAAC,EAAE,WAAW,CAAC,CAAC;gBAChB,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,KAAW,EAAE,EAAE;oBAC/C,YAAY,CAAC,UAAU,CAAC,CAAC;oBACzB,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;oBACtC,IAAI,KAAK,EAAE,CAAC;wBACV,MAAM,CAAC,KAAK,CAAC,CAAC;oBAChB,CAAC;yBAAM,CAAC;wBACN,OAAO,EAAE,CAAC;oBACZ,CAAC;gBACH,CAAC,CAAC;gBACF,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAEO,SAAS,CAAC,OAAgB;QAChC,MAAM,QAAQ,GAAa;YACzB,EAAE,EAAE,IAAA,oBAAO,GAAE;YACb,QAAQ,EAAE,IAAI,CAAC,EAAE;YACjB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,OAAO,EAAE,OAAO;SACjB,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACnC,OAAO,QAAQ,CAAC,EAAE,CAAC;IACrB,CAAC;IAEY,WAAW,CAAC,OAAU;;YACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAC;YACzD,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAC;YAC7C,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0DAA0D,EAAE,OAAO,CAAC,CAAC;gBACvF,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC3C,CAAC;YACD,OAAO,IAAI,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,WAAW,CAAC,OAAO;gBACzB,OAAO,EAAE,OAAO;aACjB,CAAC,CAAC;QACL,CAAC;KAAA;IAEM,MAAM,CAAC,OAAU;QACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE,OAAO,CAAC,CAAC;QACrE,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,WAAW,CAAC,SAAS;YAC3B,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;IACL,CAAC;CACF;AAED,kBAAe,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"ChannelCoordinator.js","sourceRoot":"","sources":["../../../../src/ApiClient/WebSocketClient/BrowserWebSocketClient/ChannelCoordinator.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ const index_js_1 = require("../../../lib/AuthManager/index.js");
|
|
|
16
16
|
const index_js_2 = __importDefault(require("../index.js"));
|
|
17
17
|
const RestClient_js_1 = __importDefault(require("../../../lib/RestClient.js"));
|
|
18
18
|
const ChannelCoordinator_js_1 = __importDefault(require("./ChannelCoordinator.js"));
|
|
19
|
+
const requestDelivery_js_1 = require("../requestDelivery.js");
|
|
19
20
|
class WrappedClient extends index_js_2.default {
|
|
20
21
|
constructor() {
|
|
21
22
|
super(...arguments);
|
|
@@ -149,18 +150,20 @@ class BrowserWebSocketClient extends RestClient_js_1.default {
|
|
|
149
150
|
// send() connects when needed and waits out a reconnect in progress.
|
|
150
151
|
return this.socketClient.send(messageType, data);
|
|
151
152
|
}
|
|
153
|
+
// The primary may wait out a reconnect before it can send, so the ACK has
|
|
154
|
+
// to outlast that wait. Control messages keep the short default.
|
|
152
155
|
return this.coordinator.sendMessage({
|
|
153
156
|
type: 'socket-send',
|
|
154
157
|
payload: { type: messageType, data }
|
|
155
|
-
});
|
|
158
|
+
}, requestDelivery_js_1.REQUEST_ACK_TIMEOUT_MS);
|
|
156
159
|
});
|
|
157
160
|
}
|
|
158
|
-
handleMessage(message) {
|
|
161
|
+
handleMessage(message, deadline) {
|
|
159
162
|
return __awaiter(this, void 0, void 0, function* () {
|
|
160
163
|
this._logger.debug('Received control message', message);
|
|
161
164
|
switch (message.type) {
|
|
162
165
|
case 'socket-send': {
|
|
163
|
-
return this.socketClient.send(message.payload.type, message.payload.data);
|
|
166
|
+
return this.socketClient.send(message.payload.type, message.payload.data, deadline);
|
|
164
167
|
}
|
|
165
168
|
case 'connect': {
|
|
166
169
|
if (!this.socketClient.isConnected) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ApiClient/WebSocketClient/BrowserWebSocketClient/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,gEAI2C;AAE3C,2DAA0C;AAC1C,+EAAoD;AAGpD,oFAAyD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ApiClient/WebSocketClient/BrowserWebSocketClient/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,6 @@ declare class WebSocketClient extends RestClient<SocketEventMap> implements IWeb
|
|
|
50
50
|
private handleClose;
|
|
51
51
|
private handleError;
|
|
52
52
|
private handleMessage;
|
|
53
|
-
send<T extends MessageType>(messageType: T, data: SocketMessageMap[T]): Promise<void>;
|
|
53
|
+
send<T extends MessageType>(messageType: T, data: SocketMessageMap[T], deadline?: number): Promise<void>;
|
|
54
54
|
}
|
|
55
55
|
export default WebSocketClient;
|
|
@@ -18,16 +18,11 @@ const base64_js_1 = require("../../lib/base64.js");
|
|
|
18
18
|
const isNodejs_js_1 = __importDefault(require("../../lib/isNodejs.js"));
|
|
19
19
|
const ErrorCode_js_1 = require("./ErrorCode.js");
|
|
20
20
|
const version_js_1 = require("../../version.js");
|
|
21
|
+
const requestDelivery_js_1 = require("./requestDelivery.js");
|
|
21
22
|
const eventSubscriptions_js_1 = require("./eventSubscriptions.js");
|
|
22
23
|
const attribution_js_1 = require("../../lib/attribution.js");
|
|
23
24
|
const PROTOCOL_VERSION = '3.0.0';
|
|
24
25
|
const PING_INTERVAL = 15000;
|
|
25
|
-
/**
|
|
26
|
-
* How long `send` waits for a socket that can carry work. Covers a socket
|
|
27
|
-
* deploy (a ~6 s gap plus reconnect backoff) without hanging the caller on a
|
|
28
|
-
* transport that is not coming back.
|
|
29
|
-
*/
|
|
30
|
-
const SEND_READY_TIMEOUT_MS = 30000;
|
|
31
26
|
/**
|
|
32
27
|
* The server drops frames that arrive before its `authenticated` handshake.
|
|
33
28
|
* Every current server sends that frame within milliseconds; if an open socket
|
|
@@ -180,7 +175,7 @@ class WebSocketClient extends RestClient_js_1.default {
|
|
|
180
175
|
* session, or the deadline ends it.
|
|
181
176
|
* @private
|
|
182
177
|
*/
|
|
183
|
-
waitForConnection(timeoutMs = SEND_READY_TIMEOUT_MS) {
|
|
178
|
+
waitForConnection(timeoutMs = requestDelivery_js_1.SEND_READY_TIMEOUT_MS) {
|
|
184
179
|
if (this.isReadyForWork())
|
|
185
180
|
return Promise.resolve();
|
|
186
181
|
if (!this.socket && !this._reconnectExpected) {
|
|
@@ -289,12 +284,22 @@ class WebSocketClient extends RestClient_js_1.default {
|
|
|
289
284
|
this._logger.error('Failed to parse WebSocket message:', err);
|
|
290
285
|
});
|
|
291
286
|
}
|
|
292
|
-
send(
|
|
293
|
-
return __awaiter(this,
|
|
287
|
+
send(messageType_1, data_1) {
|
|
288
|
+
return __awaiter(this, arguments, void 0, function* (messageType, data, deadline = Date.now() + requestDelivery_js_1.SEND_READY_TIMEOUT_MS) {
|
|
289
|
+
const remaining = () => {
|
|
290
|
+
const ms = deadline - Date.now();
|
|
291
|
+
if (ms <= 0)
|
|
292
|
+
throw new Error('WebSocket connection timeout');
|
|
293
|
+
return ms;
|
|
294
|
+
};
|
|
295
|
+
remaining();
|
|
294
296
|
if (!this.isConnected && !this._reconnectExpected) {
|
|
295
297
|
yield this.connect();
|
|
296
298
|
}
|
|
297
|
-
yield this.waitForConnection();
|
|
299
|
+
yield this.waitForConnection(remaining());
|
|
300
|
+
// A suspended tab can resume after its timers' deadlines. Check the wall
|
|
301
|
+
// clock again immediately before sending, even if authentication succeeded.
|
|
302
|
+
remaining();
|
|
298
303
|
this._logger.debug('WebSocket send:', messageType, data);
|
|
299
304
|
this.socket.send(JSON.stringify({ type: messageType, data: (0, base64_js_1.base64Encode)(JSON.stringify(data)) }));
|
|
300
305
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ApiClient/WebSocketClient/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,4EAAiD;AAEjD,kEAAgF;AAChF,mDAAiE;AACjE,wEAA6C;AAC7C,iDAAkD;AAClD,iDAA+C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ApiClient/WebSocketClient/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/** Shared by direct socket sends and requests forwarded by another browser tab. */
|
|
2
|
+
export declare const SEND_READY_TIMEOUT_MS = 30000;
|
|
3
|
+
export declare const REQUEST_ACK_TIMEOUT_MS: number;
|
|
4
|
+
export declare class MessageDeliveryUncertainError extends Error {
|
|
5
|
+
constructor();
|
|
6
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MessageDeliveryUncertainError = exports.REQUEST_ACK_TIMEOUT_MS = exports.SEND_READY_TIMEOUT_MS = void 0;
|
|
4
|
+
/** Shared by direct socket sends and requests forwarded by another browser tab. */
|
|
5
|
+
exports.SEND_READY_TIMEOUT_MS = 30000;
|
|
6
|
+
// Give the socket's readiness failure time to reach the requesting tab. An ACK
|
|
7
|
+
// timeout is ambiguous: the socket may already have sent the request.
|
|
8
|
+
exports.REQUEST_ACK_TIMEOUT_MS = exports.SEND_READY_TIMEOUT_MS + 5000;
|
|
9
|
+
class MessageDeliveryUncertainError extends Error {
|
|
10
|
+
constructor() {
|
|
11
|
+
// Keeps the message of the plain Error it replaces: consumers match on it.
|
|
12
|
+
super('Message delivery timeout');
|
|
13
|
+
this.name = 'MessageDeliveryUncertainError';
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
exports.MessageDeliveryUncertainError = MessageDeliveryUncertainError;
|
|
17
|
+
//# sourceMappingURL=requestDelivery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"requestDelivery.js","sourceRoot":"","sources":["../../../src/ApiClient/WebSocketClient/requestDelivery.ts"],"names":[],"mappings":";;;AAAA,mFAAmF;AACtE,QAAA,qBAAqB,GAAG,KAAM,CAAC;AAE5C,+EAA+E;AAC/E,sEAAsE;AACzD,QAAA,sBAAsB,GAAG,6BAAqB,GAAG,IAAK,CAAC;AAEpE,MAAa,6BAA8B,SAAQ,KAAK;IACtD;QACE,2EAA2E;QAC3E,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,+BAA+B,CAAC;IAC9C,CAAC;CACF;AAND,sEAMC"}
|
package/dist/Projects/index.d.ts
CHANGED
|
@@ -309,6 +309,12 @@ declare class ProjectsApi extends ApiGroup<ProjectApiEvents> {
|
|
|
309
309
|
* @param data
|
|
310
310
|
*/
|
|
311
311
|
create(data: ProjectParams): Promise<Project>;
|
|
312
|
+
/**
|
|
313
|
+
* Track a submitted project. A sync that ran while a secondary tab waited for
|
|
314
|
+
* its request to be forwarded may already have rebuilt this project from the
|
|
315
|
+
* server; events reach the first match, so keep that one and never two.
|
|
316
|
+
*/
|
|
317
|
+
private _trackSubmitted;
|
|
312
318
|
private _processImageAssets;
|
|
313
319
|
/** Voice cloning is the only audio model that takes an upload. */
|
|
314
320
|
private _processAudioAssets;
|
|
@@ -402,7 +408,7 @@ declare class ProjectsApi extends ApiGroup<ProjectApiEvents> {
|
|
|
402
408
|
/**
|
|
403
409
|
* Estimate image project cost
|
|
404
410
|
*/
|
|
405
|
-
estimateCost({ network, tokenType, model, imageCount, stepCount, previewCount, cnEnabled, startingImageStrength, width, height, sizePreset, guidance, sampler, contextImages, gptImageQuality, outputFormat }: EstimateRequest): Promise<CostEstimation>;
|
|
411
|
+
estimateCost({ network, tokenType, model, imageCount, stepCount, previewCount, cnEnabled, startingImageStrength, width, height, sizePreset, guidance, sampler, contextImages, gptImageQuality, outputFormat, billingMode }: EstimateRequest): Promise<CostEstimation>;
|
|
406
412
|
/**
|
|
407
413
|
* Estimate image enhancement cost
|
|
408
414
|
* @param strength
|
|
@@ -437,6 +443,7 @@ declare class ProjectsApi extends ApiGroup<ProjectApiEvents> {
|
|
|
437
443
|
sogni: string;
|
|
438
444
|
estimatedRenderSeconds: number | undefined;
|
|
439
445
|
estimatedTotalSeconds: number | undefined;
|
|
446
|
+
dailyFairUsePct: number | undefined;
|
|
440
447
|
}>;
|
|
441
448
|
/**
|
|
442
449
|
* Estimate the cost of an audio generation job.
|
package/dist/Projects/index.js
CHANGED
|
@@ -46,6 +46,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
46
46
|
};
|
|
47
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
48
|
const ApiGroup_js_1 = __importDefault(require("../ApiGroup.js"));
|
|
49
|
+
const requestDelivery_js_1 = require("../ApiClient/WebSocketClient/requestDelivery.js");
|
|
49
50
|
const ReusableUploads_js_1 = __importDefault(require("./ReusableUploads.js"));
|
|
50
51
|
const Project_js_1 = __importDefault(require("./Project.js"));
|
|
51
52
|
const recovery_js_1 = require("./recovery.js");
|
|
@@ -986,16 +987,18 @@ class ProjectsApi extends ApiGroup_js_1.default {
|
|
|
986
987
|
this._awaitingResubmit.delete(projectId);
|
|
987
988
|
return;
|
|
988
989
|
}
|
|
989
|
-
|
|
990
|
-
.send('jobRequest', request)
|
|
991
|
-
.then(() => {
|
|
990
|
+
const sent = () => {
|
|
992
991
|
this._awaitingResubmit.delete(projectId);
|
|
993
992
|
this._resubmittedAt.set(projectId, Date.now());
|
|
994
993
|
this._unadmittedRequests.set(projectId, request);
|
|
995
994
|
project._keepAlive();
|
|
996
995
|
this._scheduleRecheck(this._recoveryTuning.recentlyCreatedGraceMs);
|
|
997
|
-
}
|
|
998
|
-
|
|
996
|
+
};
|
|
997
|
+
this.client.socket
|
|
998
|
+
.send('jobRequest', request)
|
|
999
|
+
.then(sent)
|
|
1000
|
+
// A missing browser ACK may still have been sent: let the recheck decide.
|
|
1001
|
+
.catch((error) => (error instanceof requestDelivery_js_1.MessageDeliveryUncertainError ? sent() : fail(error)));
|
|
999
1002
|
});
|
|
1000
1003
|
timer = setTimeout(() => {
|
|
1001
1004
|
offConnected();
|
|
@@ -1548,16 +1551,39 @@ class ProjectsApi extends ApiGroup_js_1.default {
|
|
|
1548
1551
|
// Recorded before sending: a refusal can arrive as soon as the frame lands.
|
|
1549
1552
|
this._unadmittedRequests.set(project.id, request);
|
|
1550
1553
|
yield this.client.socket.send('jobRequest', request);
|
|
1551
|
-
this.
|
|
1552
|
-
return project;
|
|
1554
|
+
return this._trackSubmitted(project);
|
|
1553
1555
|
}
|
|
1554
1556
|
catch (error) {
|
|
1557
|
+
if (error instanceof requestDelivery_js_1.MessageDeliveryUncertainError) {
|
|
1558
|
+
// A missing browser ACK does not establish that jobRequest failed.
|
|
1559
|
+
// Preserve the same project for live events and read-only recovery;
|
|
1560
|
+
// neither report a definite creation failure nor submit another job.
|
|
1561
|
+
const tracked = this._trackSubmitted(project);
|
|
1562
|
+
if (tracked === project)
|
|
1563
|
+
this._scheduleRecheck(0);
|
|
1564
|
+
return tracked;
|
|
1565
|
+
}
|
|
1555
1566
|
this._unadmittedRequests.delete(project.id);
|
|
1556
1567
|
project._dispose();
|
|
1557
1568
|
throw error;
|
|
1558
1569
|
}
|
|
1559
1570
|
});
|
|
1560
1571
|
}
|
|
1572
|
+
/**
|
|
1573
|
+
* Track a submitted project. A sync that ran while a secondary tab waited for
|
|
1574
|
+
* its request to be forwarded may already have rebuilt this project from the
|
|
1575
|
+
* server; events reach the first match, so keep that one and never two.
|
|
1576
|
+
*/
|
|
1577
|
+
_trackSubmitted(project) {
|
|
1578
|
+
const tracked = this.projects.find((candidate) => candidate.id === project.id);
|
|
1579
|
+
if (!tracked) {
|
|
1580
|
+
this.projects.push(project);
|
|
1581
|
+
return project;
|
|
1582
|
+
}
|
|
1583
|
+
this._unadmittedRequests.delete(project.id);
|
|
1584
|
+
project._dispose();
|
|
1585
|
+
return tracked;
|
|
1586
|
+
}
|
|
1561
1587
|
_processImageAssets(project, data) {
|
|
1562
1588
|
return __awaiter(this, void 0, void 0, function* () {
|
|
1563
1589
|
var _a, _b;
|
|
@@ -2127,8 +2153,8 @@ class ProjectsApi extends ApiGroup_js_1.default {
|
|
|
2127
2153
|
* Estimate image project cost
|
|
2128
2154
|
*/
|
|
2129
2155
|
estimateCost(_a) {
|
|
2130
|
-
return __awaiter(this, arguments, void 0, function* ({ network = 'fast', tokenType, model, imageCount, stepCount, previewCount, cnEnabled, startingImageStrength, width, height, sizePreset, guidance, sampler, contextImages, gptImageQuality, outputFormat }) {
|
|
2131
|
-
var _b, _c;
|
|
2156
|
+
return __awaiter(this, arguments, void 0, function* ({ network = 'fast', tokenType, model, imageCount, stepCount, previewCount, cnEnabled, startingImageStrength, width, height, sizePreset, guidance, sampler, contextImages, gptImageQuality, outputFormat, billingMode }) {
|
|
2157
|
+
var _b, _c, _d;
|
|
2132
2158
|
let apiVersion = 2;
|
|
2133
2159
|
const modelOptions = yield this.getModelOptions(model);
|
|
2134
2160
|
const pathParams = [
|
|
@@ -2166,6 +2192,8 @@ class ProjectsApi extends ApiGroup_js_1.default {
|
|
|
2166
2192
|
queryParams.set('gptImageQuality', gptImageQuality);
|
|
2167
2193
|
if (outputFormat)
|
|
2168
2194
|
queryParams.set('outputFormat', outputFormat);
|
|
2195
|
+
if (billingMode)
|
|
2196
|
+
queryParams.set('billingMode', billingMode);
|
|
2169
2197
|
const query = queryParams.toString();
|
|
2170
2198
|
const r = yield this.client.socket.get(`/api/v${apiVersion}/job/estimate/${pathParams.join('/')}${query ? `?${query}` : ''}`);
|
|
2171
2199
|
return {
|
|
@@ -2174,7 +2202,8 @@ class ProjectsApi extends ApiGroup_js_1.default {
|
|
|
2174
2202
|
spark: r.quote.project.costInSpark,
|
|
2175
2203
|
sogni: r.quote.project.costInSogni,
|
|
2176
2204
|
estimatedRenderSeconds: (_b = r.benchmark) === null || _b === void 0 ? void 0 : _b.estimatedRenderTimeSec,
|
|
2177
|
-
estimatedTotalSeconds: (_c = r.benchmark) === null || _c === void 0 ? void 0 : _c.estimatedTotalTimeSec
|
|
2205
|
+
estimatedTotalSeconds: (_c = r.benchmark) === null || _c === void 0 ? void 0 : _c.estimatedTotalTimeSec,
|
|
2206
|
+
dailyFairUsePct: (_d = r.dailyFairUse) === null || _d === void 0 ? void 0 : _d.pct
|
|
2178
2207
|
};
|
|
2179
2208
|
});
|
|
2180
2209
|
}
|
|
@@ -2220,7 +2249,7 @@ class ProjectsApi extends ApiGroup_js_1.default {
|
|
|
2220
2249
|
*/
|
|
2221
2250
|
estimateVideoCost(params) {
|
|
2222
2251
|
return __awaiter(this, void 0, void 0, function* () {
|
|
2223
|
-
var _a, _b, _c;
|
|
2252
|
+
var _a, _b, _c, _d, _e;
|
|
2224
2253
|
(0, createJobRequestMessage_js_1.rejectRetiredOutputScale)(params);
|
|
2225
2254
|
const frames = params.frames
|
|
2226
2255
|
? params.frames
|
|
@@ -2266,6 +2295,12 @@ class ProjectsApi extends ApiGroup_js_1.default {
|
|
|
2266
2295
|
params.referenceVideoDurationSeconds >= 0) {
|
|
2267
2296
|
query.set('referenceVideoDurationSeconds', String(params.referenceVideoDurationSeconds));
|
|
2268
2297
|
}
|
|
2298
|
+
// Unpinned, the job renders on the connection's network, so quote that one.
|
|
2299
|
+
const network = (_b = params.network) !== null && _b !== void 0 ? _b : this._currentNetworkType;
|
|
2300
|
+
if (network)
|
|
2301
|
+
query.set('network', network);
|
|
2302
|
+
if (params.billingMode)
|
|
2303
|
+
query.set('billingMode', params.billingMode);
|
|
2269
2304
|
const queryString = query.toString();
|
|
2270
2305
|
const r = yield this.client.socket.get(`/api/v1/job-video/estimate/${path}${queryString ? `?${queryString}` : ''}`);
|
|
2271
2306
|
return {
|
|
@@ -2273,8 +2308,9 @@ class ProjectsApi extends ApiGroup_js_1.default {
|
|
|
2273
2308
|
usd: r.quote.project.costInUSD,
|
|
2274
2309
|
spark: r.quote.project.costInSpark,
|
|
2275
2310
|
sogni: r.quote.project.costInSogni,
|
|
2276
|
-
estimatedRenderSeconds: (
|
|
2277
|
-
estimatedTotalSeconds: (
|
|
2311
|
+
estimatedRenderSeconds: (_c = r.benchmark) === null || _c === void 0 ? void 0 : _c.estimatedRenderTimeSec,
|
|
2312
|
+
estimatedTotalSeconds: (_d = r.benchmark) === null || _d === void 0 ? void 0 : _d.estimatedTotalTimeSec,
|
|
2313
|
+
dailyFairUsePct: (_e = r.dailyFairUse) === null || _e === void 0 ? void 0 : _e.pct
|
|
2278
2314
|
};
|
|
2279
2315
|
});
|
|
2280
2316
|
}
|
|
@@ -2291,7 +2327,7 @@ class ProjectsApi extends ApiGroup_js_1.default {
|
|
|
2291
2327
|
*/
|
|
2292
2328
|
estimateAudioCost(params) {
|
|
2293
2329
|
return __awaiter(this, void 0, void 0, function* () {
|
|
2294
|
-
var _a, _b;
|
|
2330
|
+
var _a, _b, _c, _d;
|
|
2295
2331
|
const pathParams = [
|
|
2296
2332
|
params.tokenType,
|
|
2297
2333
|
params.model,
|
|
@@ -2300,14 +2336,23 @@ class ProjectsApi extends ApiGroup_js_1.default {
|
|
|
2300
2336
|
params.numberOfMedia
|
|
2301
2337
|
];
|
|
2302
2338
|
const path = pathParams.map((p) => encodeURIComponent(p)).join('/');
|
|
2303
|
-
const
|
|
2339
|
+
const query = new URLSearchParams();
|
|
2340
|
+
// Unpinned, the job renders on the connection's network, so quote that one.
|
|
2341
|
+
const network = (_a = params.network) !== null && _a !== void 0 ? _a : this._currentNetworkType;
|
|
2342
|
+
if (network)
|
|
2343
|
+
query.set('network', network);
|
|
2344
|
+
if (params.billingMode)
|
|
2345
|
+
query.set('billingMode', params.billingMode);
|
|
2346
|
+
const queryString = query.toString();
|
|
2347
|
+
const r = yield this.client.socket.get(`/api/v1/job-audio/estimate/${path}${queryString ? `?${queryString}` : ''}`);
|
|
2304
2348
|
return {
|
|
2305
2349
|
token: r.quote.project.costInToken,
|
|
2306
2350
|
usd: r.quote.project.costInUSD,
|
|
2307
2351
|
spark: r.quote.project.costInSpark,
|
|
2308
2352
|
sogni: r.quote.project.costInSogni,
|
|
2309
|
-
estimatedRenderSeconds: (
|
|
2310
|
-
estimatedTotalSeconds: (
|
|
2353
|
+
estimatedRenderSeconds: (_b = r.benchmark) === null || _b === void 0 ? void 0 : _b.estimatedRenderTimeSec,
|
|
2354
|
+
estimatedTotalSeconds: (_c = r.benchmark) === null || _c === void 0 ? void 0 : _c.estimatedTotalTimeSec,
|
|
2355
|
+
dailyFairUsePct: (_d = r.dailyFairUse) === null || _d === void 0 ? void 0 : _d.pct
|
|
2311
2356
|
};
|
|
2312
2357
|
});
|
|
2313
2358
|
}
|
|
@@ -2606,7 +2651,12 @@ class ProjectsApi extends ApiGroup_js_1.default {
|
|
|
2606
2651
|
if (params.includePersonal) {
|
|
2607
2652
|
const catalog = yield this.availableLoras(Object.assign(Object.assign({}, params), { includePersonal: false }));
|
|
2608
2653
|
const personal = yield this.personalLoras.catalog();
|
|
2609
|
-
return Object.assign(Object.assign({}, catalog), { loras: [
|
|
2654
|
+
return Object.assign(Object.assign({}, catalog), { loras: [
|
|
2655
|
+
...catalog.loras,
|
|
2656
|
+
...personal.loras.filter((row) => !params.modelId || row.modelIds.includes(params.modelId))
|
|
2657
|
+
], models: [
|
|
2658
|
+
...new Set([...catalog.models, ...deriveLoraCapableModelIds(personal.loras)])
|
|
2659
|
+
].sort() });
|
|
2610
2660
|
}
|
|
2611
2661
|
const { modelId, forceRefresh } = params;
|
|
2612
2662
|
const cacheKey = modelId !== null && modelId !== void 0 ? modelId : '';
|
|
@@ -2648,7 +2698,7 @@ class ProjectsApi extends ApiGroup_js_1.default {
|
|
|
2648
2698
|
return __awaiter(this, void 0, void 0, function* () {
|
|
2649
2699
|
if (loraId.startsWith('personal-')) {
|
|
2650
2700
|
const { loras } = yield this.personalLoras.catalog();
|
|
2651
|
-
return loras.find(row => row.loraId === loraId);
|
|
2701
|
+
return loras.find((row) => row.loraId === loraId);
|
|
2652
2702
|
}
|
|
2653
2703
|
const { loras } = yield this.availableLoras();
|
|
2654
2704
|
return loras.find((lora) => lora.loraId === loraId);
|