@positronic/cloudflare 0.0.77 → 0.0.78

package/dist/src/files-service.js

@@ -0,0 +1,465 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _ts_generator(thisArg, body) {
+    var f, y, t, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(g && (g = 0, op[0] && (_ = 0)), _)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+}
+import { guessContentType } from './content-type.js';
+import { createR2ZipBuilder } from './zip-builder.js';
+import { isFileHandle } from './file-utils.js';
+export function createFilesService(bucket, brainTitle, brainRunId, currentUser, env) {
+    function resolveKey(name, options) {
+        var _options_scope;
+        var scope = (_options_scope = options === null || options === void 0 ? void 0 : options.scope) !== null && _options_scope !== void 0 ? _options_scope : 'brain';
+        var userName = currentUser.name;
+        switch(scope){
+            case 'run':
+                return "files/user/".concat(userName, "/").concat(brainTitle, "/runs/").concat(brainRunId, "/").concat(name);
+            case 'brain':
+                return "files/user/".concat(userName, "/").concat(brainTitle, "/").concat(name);
+            case 'global':
+                return "files/user/".concat(userName, "/").concat(name);
+        }
+    }
+    function createFileHandle(name, options) {
+        var key = resolveKey(name, options);
+        function writeContent(content) {
+            return _async_to_generator(function() {
+                var contentType, sourceBytes;
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            contentType = guessContentType(name);
+                            if (!(typeof content === 'string')) return [
+                                3,
+                                2
+                            ];
+                            return [
+                                4,
+                                bucket.put(key, content, {
+                                    httpMetadata: {
+                                        contentType: contentType
+                                    }
+                                })
+                            ];
+                        case 1:
+                            _state.sent();
+                            return [
+                                3,
+                                11
+                            ];
+                        case 2:
+                            if (!_instanceof(content, Uint8Array)) return [
+                                3,
+                                4
+                            ];
+                            return [
+                                4,
+                                bucket.put(key, content, {
+                                    httpMetadata: {
+                                        contentType: contentType
+                                    }
+                                })
+                            ];
+                        case 3:
+                            _state.sent();
+                            return [
+                                3,
+                                11
+                            ];
+                        case 4:
+                            if (!_instanceof(content, Response)) return [
+                                3,
+                                6
+                            ];
+                            // R2's ReadableStream type differs from the standard lib's — cast through any
+                            return [
+                                4,
+                                bucket.put(key, content.body, {
+                                    httpMetadata: {
+                                        contentType: contentType
+                                    }
+                                })
+                            ];
+                        case 5:
+                            _state.sent();
+                            return [
+                                3,
+                                11
+                            ];
+                        case 6:
+                            if (!isFileHandle(content)) return [
+                                3,
+                                9
+                            ];
+                            return [
+                                4,
+                                content.readBytes()
+                            ];
+                        case 7:
+                            sourceBytes = _state.sent();
+                            return [
+                                4,
+                                bucket.put(key, sourceBytes, {
+                                    httpMetadata: {
+                                        contentType: contentType
+                                    }
+                                })
+                            ];
+                        case 8:
+                            _state.sent();
+                            return [
+                                3,
+                                11
+                            ];
+                        case 9:
+                            // ReadableStream — R2's type differs from standard lib's, cast through any
+                            return [
+                                4,
+                                bucket.put(key, content, {
+                                    httpMetadata: {
+                                        contentType: contentType
+                                    }
+                                })
+                            ];
+                        case 10:
+                            _state.sent();
+                            _state.label = 11;
+                        case 11:
+                            return [
+                                2,
+                                {
+                                    name: name
+                                }
+                            ];
+                    }
+                });
+            })();
+        }
+        var handle = {
+            name: name,
+            get url () {
+                // R2 key is "files/user/..." — strip the "files/" prefix since the
+                // route is already mounted at /files/
+                return "".concat(env.origin, "/files/").concat(key.slice('files/'.length));
+            },
+            read: function read() {
+                return _async_to_generator(function() {
+                    var object;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    bucket.get(key)
+                                ];
+                            case 1:
+                                object = _state.sent();
+                                if (!object) {
+                                    throw new Error("File '".concat(name, "' not found"));
+                                }
+                                return [
+                                    2,
+                                    object.text()
+                                ];
+                        }
+                    });
+                })();
+            },
+            readBytes: function readBytes() {
+                return _async_to_generator(function() {
+                    var object, arrayBuffer;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    bucket.get(key)
+                                ];
+                            case 1:
+                                object = _state.sent();
+                                if (!object) {
+                                    throw new Error("File '".concat(name, "' not found"));
+                                }
+                                return [
+                                    4,
+                                    object.arrayBuffer()
+                                ];
+                            case 2:
+                                arrayBuffer = _state.sent();
+                                return [
+                                    2,
+                                    new Uint8Array(arrayBuffer)
+                                ];
+                        }
+                    });
+                })();
+            },
+            write: writeContent,
+            exists: function exists() {
+                return _async_to_generator(function() {
+                    var object;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    bucket.head(key)
+                                ];
+                            case 1:
+                                object = _state.sent();
+                                return [
+                                    2,
+                                    object !== null
+                                ];
+                        }
+                    });
+                })();
+            },
+            delete: function _delete() {
+                return _async_to_generator(function() {
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    bucket.delete(key)
+                                ];
+                            case 1:
+                                _state.sent();
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                })();
+            }
+        };
+        return handle;
+    }
+    return {
+        open: function open(name, options) {
+            return createFileHandle(name, options);
+        },
+        write: function write(name, content, options) {
+            return _async_to_generator(function() {
+                var handle;
+                return _ts_generator(this, function(_state) {
+                    handle = createFileHandle(name, options);
+                    return [
+                        2,
+                        handle.write(content)
+                    ];
+                });
+            })();
+        },
+        list: function list() {
+            return _async_to_generator(function() {
+                var prefix, refs, cursor, listed, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, object, name;
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            prefix = "files/user/".concat(currentUser.name, "/").concat(brainTitle, "/");
+                            refs = [];
+                            _state.label = 1;
+                        case 1:
+                            return [
+                                4,
+                                bucket.list({
+                                    prefix: prefix,
+                                    cursor: cursor
+                                })
+                            ];
+                        case 2:
+                            listed = _state.sent();
+                            _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                            try {
+                                for(_iterator = listed.objects[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                                    object = _step.value;
+                                    // Extract the file name from the key by removing the prefix
+                                    name = object.key.slice(prefix.length);
+                                    // Skip run-scoped files (they're in a runs/ subdirectory)
+                                    if (!name.startsWith('runs/')) {
+                                        refs.push({
+                                            name: name
+                                        });
+                                    }
+                                }
+                            } catch (err) {
+                                _didIteratorError = true;
+                                _iteratorError = err;
+                            } finally{
+                                try {
+                                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                        _iterator.return();
+                                    }
+                                } finally{
+                                    if (_didIteratorError) {
+                                        throw _iteratorError;
+                                    }
+                                }
+                            }
+                            cursor = listed.truncated ? listed.cursor : undefined;
+                            _state.label = 3;
+                        case 3:
+                            if (cursor) return [
+                                3,
+                                1
+                            ];
+                            _state.label = 4;
+                        case 4:
+                            return [
+                                2,
+                                refs
+                            ];
+                    }
+                });
+            })();
+        },
+        delete: function _delete(name) {
+            return _async_to_generator(function() {
+                var handle;
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            handle = createFileHandle(name);
+                            return [
+                                4,
+                                handle.delete()
+                            ];
+                        case 1:
+                            _state.sent();
+                            return [
+                                2
+                            ];
+                    }
+                });
+            })();
+        },
+        zip: function zip(name, options) {
+            var key = resolveKey(name, options);
+            return createR2ZipBuilder(bucket, key, name);
+        }
+    };
+}

package/dist/src/manifest.js

@@ -202,34 +202,39 @@ var DynamicImportStrategy = /*#__PURE__*/ function() {
             key: "import",
             value: function _import(filename) {
                 return _async_to_generator(function() {
-                    var module, e;
+                    var _this, module, e;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
+                                _this = this;
+                                _state.label = 1;
+                            case 1:
                                 _state.trys.push([
-                                    0,
-                                    2,
+                                    1,
+                                    3,
                                     ,
-                                    3
+                                    4
                                 ]);
                                 return [
                                     4,
-                                    import("".concat(this.brainsDir, "/").concat(filename, ".ts"))
+                                    import("".concat(this.brainsDir, "/").concat(filename, ".tsx")).catch(function() {
+                                        return import("".concat(_this.brainsDir, "/").concat(filename, ".ts"));
+                                    })
                                 ];
-                            case 1:
+                            case 2:
                                 module = _state.sent();
                                 return [
                                     2,
                                     module.default
                                 ];
-                            case 2:
+                            case 3:
                                 e = _state.sent();
                                 console.error("Failed to import brain ".concat(filename, ":"), e);
                                 return [
                                     2,
                                     undefined
                                 ];
-                            case 3:
+                            case 4:
                                 return [
                                     2
                                 ];

package/dist/src/monitor-do.js

@@ -331,6 +331,23 @@ export var MonitorDO = /*#__PURE__*/ function(DurableObject) {
                 }
             }
         },
+        {
+            /**
+   * Reset MonitorDO tracking state for a brain run that is about to be rerun.
+   * Clears stale events (keeping START for hydration), resets status to RUNNING,
+   * and broadcasts so `top` subscribers see the brain immediately.
+   */ key: "prepareForRerun",
+            value: function prepareForRerun(runId) {
+                // Delete all events except START (needed for state machine hydration)
+                this.storage.exec("DELETE FROM brain_events WHERE run_id = ? AND event_type != ?", runId, BRAIN_EVENTS.START);
+                // Reset status to RUNNING, clear terminal fields
+                this.storage.exec("UPDATE brain_runs SET status = ?, completed_at = NULL, error = NULL WHERE run_id = ?", STATUS.RUNNING, runId);
+                // Clear cached machine so it re-hydrates from [START] → running state
+                this.machines.delete(runId);
+                // Notify top subscribers immediately
+                this.broadcastRunningBrains();
+            }
+        },
         {
             key: "broadcastRunningBrains",
             value: function broadcastRunningBrains() {

package/dist/src/schedule-do.js

@@ -255,6 +255,7 @@ import { DurableObject } from 'cloudflare:workers';
 import { v4 as uuidv4 } from 'uuid';
 import { Cron } from 'croner';
 import { BRAIN_EVENTS } from '@positronic/core';
+import { startBrainRun } from './brain-runner-do.js';
 var ALARM_INTERVAL = 60 * 1000;
 export var ScheduleDO = /*#__PURE__*/ function(DurableObject) {
     "use strict";
@@ -681,15 +682,10 @@ export var ScheduleDO = /*#__PURE__*/ function(DurableObject) {
             key: "triggerBrainRun",
             value: function triggerBrainRun(brainTitle, runAsUserName, options, initialState) {
                 return _async_to_generator(function() {
-                    var brainRunId, namespace, doId, stub, initialData;
+                    var initialData, brainRunId;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                brainRunId = uuidv4();
-                                namespace = this.env.BRAIN_RUNNER_DO;
-                                doId = namespace.idFromName(brainRunId);
-                                stub = namespace.get(doId);
-                                console.log("[ScheduleDO] Triggering brain run ".concat(brainTitle, " with id ").concat(brainRunId, " as user ").concat(runAsUserName));
                                 initialData = _object_spread({}, options && {
                                     options: options
                                 }, initialState && {
@@ -697,12 +693,13 @@ export var ScheduleDO = /*#__PURE__*/ function(DurableObject) {
                                 });
                                 return [
                                     4,
-                                    stub.start(brainTitle, brainRunId, {
+                                    startBrainRun(this.env.BRAIN_RUNNER_DO, brainTitle, {
                                         name: runAsUserName
                                     }, Object.keys(initialData).length > 0 ? initialData : undefined)
                                 ];
                             case 1:
-                                _state.sent();
+                                brainRunId = _state.sent();
+                                console.log("[ScheduleDO] Triggered brain run ".concat(brainTitle, " with id ").concat(brainRunId, " as user ").concat(runAsUserName));
                                 return [
                                     2,
                                     brainRunId
@@ -746,17 +743,6 @@ export var ScheduleDO = /*#__PURE__*/ function(DurableObject) {
                 }).call(this);
             }
         },
-        {
-            key: "isValidCronExpression",
-            value: function isValidCronExpression(expression) {
-                try {
-                    new Cron(expression);
-                    return true;
-                } catch (error) {
-                    return false;
-                }
-            }
-        },
         {
             key: "calculateNextRunTime",
             value: function calculateNextRunTime(cronExpression, afterTime, timezone) {