@positronic/cloudflare 0.0.37 → 0.0.38
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.
|
@@ -745,7 +745,7 @@ export var BrainRunnerDO = /*#__PURE__*/ function(DurableObject) {
|
|
|
745
745
|
key: "resume",
|
|
746
746
|
value: function resume(brainRunId, webhookResponse) {
|
|
747
747
|
return _async_to_generator(function() {
|
|
748
|
-
var _this, sql, startEventResult, startEvent, brainTitle, initialState, resolution, brainToRun, eventsResult, initialCompletedSteps, sqliteAdapter, eventStreamAdapter, monitorDOStub, monitorAdapter, scheduleAdapter, webhookAdapter, pageAdapter, env, pagesService, r2Resources, runnerWithResources;
|
|
748
|
+
var _this, sql, startEventResult, startEvent, brainTitle, initialState, resolution, brainToRun, eventsResult, initialCompletedSteps, loopEventsResult, loopEvents, sqliteAdapter, eventStreamAdapter, monitorDOStub, monitorAdapter, scheduleAdapter, webhookAdapter, pageAdapter, env, pagesService, r2Resources, runnerWithResources;
|
|
749
749
|
return _ts_generator(this, function(_state) {
|
|
750
750
|
switch(_state.label){
|
|
751
751
|
case 0:
|
|
@@ -790,6 +790,11 @@ export var BrainRunnerDO = /*#__PURE__*/ function(DurableObject) {
|
|
|
790
790
|
patch: event.patch
|
|
791
791
|
};
|
|
792
792
|
});
|
|
793
|
+
// Load LOOP_* events for potential loop resume
|
|
794
|
+
loopEventsResult = sql.exec("SELECT serialized_event FROM brain_events WHERE event_type LIKE 'loop:%' ORDER BY event_id ASC").toArray();
|
|
795
|
+
loopEvents = loopEventsResult.map(function(row) {
|
|
796
|
+
return JSON.parse(row.serialized_event);
|
|
797
|
+
});
|
|
793
798
|
sqliteAdapter = new BrainRunSQLiteAdapter(sql);
|
|
794
799
|
eventStreamAdapter = this.eventStreamAdapter;
|
|
795
800
|
monitorDOStub = this.env.MONITOR_DO.get(this.env.MONITOR_DO.idFromName('singleton'));
|
|
@@ -830,7 +835,8 @@ export var BrainRunnerDO = /*#__PURE__*/ function(DurableObject) {
|
|
|
830
835
|
initialCompletedSteps: initialCompletedSteps,
|
|
831
836
|
brainRunId: brainRunId,
|
|
832
837
|
response: webhookResponse,
|
|
833
|
-
signal: this.abortController.signal
|
|
838
|
+
signal: this.abortController.signal,
|
|
839
|
+
loopEvents: loopEvents
|
|
834
840
|
}).catch(function(err) {
|
|
835
841
|
console.error("[DO ".concat(brainRunId, "] BrainRunner resume failed:"), err);
|
|
836
842
|
throw err;
|
package/dist/src/monitor-do.js
CHANGED
|
@@ -310,12 +310,15 @@ export var MonitorDO = /*#__PURE__*/ function(DurableObject) {
|
|
|
310
310
|
key: "fetch",
|
|
311
311
|
value: function fetch(request) {
|
|
312
312
|
return _async_to_generator(function() {
|
|
313
|
-
var _this, url, encoder, stream;
|
|
313
|
+
var _this, url, encoder, streamController, stream;
|
|
314
314
|
return _ts_generator(this, function(_state) {
|
|
315
315
|
_this = this;
|
|
316
316
|
url = new URL(request.url);
|
|
317
317
|
encoder = new TextEncoder();
|
|
318
318
|
if (url.pathname === '/watch') {
|
|
319
|
+
// Capture the controller so we can properly unsubscribe on cancel.
|
|
320
|
+
// The cancel callback receives a "reason" parameter, not the controller.
|
|
321
|
+
streamController = null;
|
|
319
322
|
stream = new ReadableStream({
|
|
320
323
|
start: function(controller) {
|
|
321
324
|
return _async_to_generator(function() {
|
|
@@ -323,17 +326,20 @@ export var MonitorDO = /*#__PURE__*/ function(DurableObject) {
|
|
|
323
326
|
return _ts_generator(this, function(_state) {
|
|
324
327
|
switch(_state.label){
|
|
325
328
|
case 0:
|
|
329
|
+
streamController = controller;
|
|
330
|
+
_state.label = 1;
|
|
331
|
+
case 1:
|
|
326
332
|
_state.trys.push([
|
|
327
|
-
|
|
328
|
-
|
|
333
|
+
1,
|
|
334
|
+
3,
|
|
329
335
|
,
|
|
330
|
-
|
|
336
|
+
4
|
|
331
337
|
]);
|
|
332
338
|
return [
|
|
333
339
|
4,
|
|
334
340
|
this.storage.exec("\n SELECT\n run_id as brainRunId,\n brain_title as brainTitle,\n brain_description as brainDescription,\n type,\n status,\n options,\n error,\n created_at as createdAt,\n started_at as startedAt,\n completed_at as completedAt\n FROM brain_runs\n WHERE status = ?\n ORDER BY created_at DESC\n ", STATUS.RUNNING).toArray()
|
|
335
341
|
];
|
|
336
|
-
case
|
|
342
|
+
case 2:
|
|
337
343
|
runningBrains = _state.sent();
|
|
338
344
|
controller.enqueue(encoder.encode("data: ".concat(JSON.stringify({
|
|
339
345
|
runningBrains: runningBrains
|
|
@@ -341,18 +347,18 @@ export var MonitorDO = /*#__PURE__*/ function(DurableObject) {
|
|
|
341
347
|
this.eventStreamHandler.subscribe(controller);
|
|
342
348
|
return [
|
|
343
349
|
3,
|
|
344
|
-
|
|
350
|
+
4
|
|
345
351
|
];
|
|
346
|
-
case
|
|
352
|
+
case 3:
|
|
347
353
|
err = _state.sent();
|
|
348
354
|
console.error('[MONITOR_DO] Error during stream start:', err);
|
|
349
355
|
controller.close();
|
|
350
356
|
this.eventStreamHandler.unsubscribe(controller);
|
|
351
357
|
return [
|
|
352
358
|
3,
|
|
353
|
-
|
|
359
|
+
4
|
|
354
360
|
];
|
|
355
|
-
case
|
|
361
|
+
case 4:
|
|
356
362
|
return [
|
|
357
363
|
2
|
|
358
364
|
];
|
|
@@ -360,8 +366,10 @@ export var MonitorDO = /*#__PURE__*/ function(DurableObject) {
|
|
|
360
366
|
});
|
|
361
367
|
}).call(_this);
|
|
362
368
|
},
|
|
363
|
-
cancel: function(
|
|
364
|
-
|
|
369
|
+
cancel: function() {
|
|
370
|
+
if (streamController) {
|
|
371
|
+
_this.eventStreamHandler.unsubscribe(streamController);
|
|
372
|
+
}
|
|
365
373
|
}
|
|
366
374
|
});
|
|
367
375
|
return [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"brain-runner-do.d.ts","sourceRoot":"","sources":["../../src/brain-runner-do.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAyD,MAAM,kBAAkB,CAAC;AACtG,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAOnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAG1D,wBAAgB,WAAW,CAAC,iBAAiB,EAAE,kBAAkB,QAEhE;AAED,wBAAgB,WAAW,IAAI,kBAAkB,GAAG,IAAI,CAEvD;AAGD,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,QAEjD;AAGD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAE/D;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAE/D;AAED,MAAM,WAAW,GAAG;IAClB,eAAe,EAAE,sBAAsB,CAAC;IACxC,UAAU,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC9C,WAAW,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAChD,gBAAgB,EAAE,QAAQ,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAwDD,qBAAa,aAAc,SAAQ,aAAa,CAAC,GAAG,CAAC;IACnD,OAAO,CAAC,GAAG,CAAa;IACxB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,eAAe,CAAgC;gBAE3C,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG;YAOjC,mBAAmB;IAqEjC;;;OAGG;IACH,OAAO,CAAC,eAAe;IAiBjB,IAAI,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAStD,KAAK,CACT,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAuG7B,MAAM,CACV,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"brain-runner-do.d.ts","sourceRoot":"","sources":["../../src/brain-runner-do.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAyD,MAAM,kBAAkB,CAAC;AACtG,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAOnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAG1D,wBAAgB,WAAW,CAAC,iBAAiB,EAAE,kBAAkB,QAEhE;AAED,wBAAgB,WAAW,IAAI,kBAAkB,GAAG,IAAI,CAEvD;AAGD,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,QAEjD;AAGD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAE/D;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAE/D;AAED,MAAM,WAAW,GAAG;IAClB,eAAe,EAAE,sBAAsB,CAAC;IACxC,UAAU,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC9C,WAAW,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAChD,gBAAgB,EAAE,QAAQ,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAwDD,qBAAa,aAAc,SAAQ,aAAa,CAAC,GAAG,CAAC;IACnD,OAAO,CAAC,GAAG,CAAa;IACxB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,eAAe,CAAgC;gBAE3C,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG;YAOjC,mBAAmB;IAqEjC;;;OAGG;IACH,OAAO,CAAC,eAAe;IAiBjB,IAAI,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAStD,KAAK,CACT,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAuG7B,MAAM,CACV,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAmJhC,KAAK,CAAC,OAAO,EAAE,OAAO;CA4E7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor-do.d.ts","sourceRoot":"","sources":["../../src/monitor-do.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,WAAW,GAAG;CAEnB;AAED,qBAAa,SAAU,SAAQ,aAAa,CAAC,GAAG,CAAC;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,kBAAkB,CAA4B;gBAE1C,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG;IAuD/C,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC;YA8DzB,sBAAsB;IA0B9B,KAAK,CAAC,OAAO,EAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"monitor-do.d.ts","sourceRoot":"","sources":["../../src/monitor-do.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,WAAW,GAAG;CAEnB;AAED,qBAAa,SAAU,SAAQ,aAAa,CAAC,GAAG,CAAC;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,kBAAkB,CAA4B;gBAE1C,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG;IAuD/C,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC;YA8DzB,sBAAsB;IA0B9B,KAAK,CAAC,OAAO,EAAE,OAAO;IAiE5B,YAAY,CAAC,UAAU,EAAE,MAAM;IAa/B;;;OAGG;IACH,MAAM,CAAC,UAAU,EAAE,MAAM;IAqCzB,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,GAAE,MAAW;IA6B9C,UAAU,CAAC,UAAU,EAAE,MAAM;IAyB7B;;;OAGG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAapE;;;OAGG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAiBjE;;;OAGG;IACH,yBAAyB,CAAC,UAAU,EAAE,MAAM;IAU5C;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAgB/D;;OAEG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM;IAU3B;;;OAGG;IACH,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE;IAezD;;;OAGG;IACH,sBAAsB,CAAC,UAAU,EAAE,MAAM;CAU1C"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@positronic/cloudflare",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.38",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -31,9 +31,9 @@
|
|
|
31
31
|
"clean": "rm -rf tsconfig.tsbuildinfo dist"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@positronic/core": "^0.0.
|
|
35
|
-
"@positronic/spec": "^0.0.
|
|
36
|
-
"@positronic/template-new-project": "^0.0.
|
|
34
|
+
"@positronic/core": "^0.0.38",
|
|
35
|
+
"@positronic/spec": "^0.0.38",
|
|
36
|
+
"@positronic/template-new-project": "^0.0.38",
|
|
37
37
|
"aws4fetch": "^1.0.18",
|
|
38
38
|
"caz": "^2.0.0",
|
|
39
39
|
"cron-schedule": "^5.0.4",
|