sune-org/ORP
1
0
Fork 0
mirror of https://github.com/sune-org/ORP.git synced 2026-01-13 16:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert: Update index.js

Browse Source
This commit is contained in:
multipleof4
2025-11-15 19:06:43 -08:00
parent 37a53e17de
commit 5f437b7bcf
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
index.js
View File

@@ -67,7 +67,6 @@ export class MyDurableObject {
this.controller = null; this.controller = null;
this.oaStream = null; this.oaStream = null;
this.pending = ''; this.pending = '';
this.pendingImages = [];
this.flushTimer = null; this.flushTimer = null;
this.lastSavedAt = 0; this.lastSavedAt = 0;
this.lastFlushedAt = 0; this.lastFlushedAt = 0;
@@ -126,7 +125,6 @@ export class MyDurableObject {
this.error = snap.error || null; this.error = snap.error || null;
this.messages = Array.isArray(snap.messages) ? snap.messages : []; this.messages = Array.isArray(snap.messages) ? snap.messages : [];
this.pending = ''; this.pending = '';
this.pendingImages = [];
if (this.phase === 'running') { if (this.phase === 'running') {
this.phase = 'evicted'; this.phase = 'evicted';
@@ -144,28 +142,26 @@ export class MyDurableObject {
} }
replay(ws, after) { replay(ws, after) {
this.buffer.forEach(it => { if (it.seq > after) this.send(ws, { type: 'delta', seq: it.seq, text: it.text, images: it.images }); }); this.buffer.forEach(it => { if (it.seq > after) this.send(ws, { type: 'delta', seq: it.seq, text: it.text }); });
if (this.phase === 'done') this.send(ws, { type: 'done' }); if (this.phase === 'done') this.send(ws, { type: 'done' });
else if (['error', 'evicted'].includes(this.phase)) this.send(ws, { type: 'err', message: this.error || 'The run was terminated unexpectedly.' }); else if (['error', 'evicted'].includes(this.phase)) this.send(ws, { type: 'err', message: this.error || 'The run was terminated unexpectedly.' });
} }
flush(force = false) { flush(force = false) {
if (this.flushTimer) { clearTimeout(this.flushTimer); this.flushTimer = null; } if (this.flushTimer) { clearTimeout(this.flushTimer); this.flushTimer = null; }
if (this.pending || this.pendingImages.length) { if (this.pending) {
const imgs = this.pendingImages.length ? [...this.pendingImages] : undefined; this.buffer.push({ seq: ++this.seq, text: this.pending });
this.buffer.push({ seq: ++this.seq, text: this.pending, images: imgs }); this.bcast({ type: 'delta', seq: this.seq, text: this.pending });
this.bcast({ type: 'delta', seq: this.seq, text: this.pending, images: imgs });
this.pending = ''; this.pending = '';
this.pendingImages = [];
this.lastFlushedAt = Date.now(); this.lastFlushedAt = Date.now();
} }
if (force) this.saveSnapshot(); if (force) this.saveSnapshot();
} }
queueDelta(text, images) { queueDelta(text) {
if (text) this.pending += text; if (!text) return;
if (images && images.length) this.pendingImages.push(...images); this.pending += text;
if (this.pending.length >= BATCH_BYTES || this.pendingImages.length) this.flush(false); if (this.pending.length >= BATCH_BYTES) this.flush(false);
else if (!this.flushTimer) this.flushTimer = setTimeout(() => this.flush(false), BATCH_MS); else if (!this.flushTimer) this.flushTimer = setTimeout(() => this.flush(false), BATCH_MS);
} }
@@ -346,10 +342,6 @@ export class MyDurableObject {
this.queueDelta(delta.content); this.queueDelta(delta.content);
hasContent = true; hasContent = true;
} }
const msg = chunk?.choices?.[0]?.message;
if (msg?.images && msg.images.length) {
this.queueDelta('', msg.images.map(img => ({ type: 'image_url', image_url: { url: img.image_url?.url || img.image_url } })));
}
} }
} }
@@ -361,8 +353,7 @@ export class MyDurableObject {
try { this.controller?.abort(); } catch {} try { this.controller?.abort(); } catch {}
try { this.oaStream?.controller?.abort(); } catch {} try { this.oaStream?.controller?.abort(); } catch {}
this.saveSnapshot(); this.saveSnapshot();
const finalImages = this.buffer.flatMap(b => b.images || []); this.bcast({ type: 'done' });
this.bcast({ type: 'done', images: finalImages.length ? finalImages : undefined });
this.state.waitUntil(this.stopHeartbeat()); this.state.waitUntil(this.stopHeartbeat());
} }
@@ -450,3 +441,4 @@ export class MyDurableObject {
return contents; return contents;
} }
} }