@positronic/cloudflare 0.0.66 → 0.0.68

package/dist/src/api/brains.js

@@ -155,7 +155,7 @@ function _ts_generator(thisArg, body) {
 }
 import { Hono } from 'hono';
 import { v4 as uuidv4 } from 'uuid';
-import { parseCronExpression } from 'cron-schedule';
+import { Cron } from 'croner';
 import Fuse from 'fuse.js';
 import { isSignalValid, brainMachineDefinition } from '@positronic/core';
 import { getManifest } from '../brain-runner-do.js';
@@ -922,15 +922,15 @@ brains.get('/', function(context) {
 // Create a new schedule
 brains.post('/schedules', function(context) {
     return _async_to_generator(function() {
-        var body, cronExpression, identifier, manifest, resolution, brain, brainTitle, scheduleId, scheduleStub, schedule, error, errorMessage;
+        var body, cronExpression, identifier, manifest, resolution, brain, brainTitle, scheduleDoId, scheduleStub, timezone, schedule, error, errorMessage;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     _state.trys.push([
                         0,
-                        3,
+                        5,
                         ,
-                        4
+                        6
                     ]);
                     return [
                         4,
@@ -959,7 +959,7 @@ brains.post('/schedules', function(context) {
                     }
                     // Validate cron expression before calling DO
                     try {
-                        parseCronExpression(cronExpression);
+                        new Cron(cronExpression);
                     } catch (e) {
                         return [
                             2,
@@ -1001,19 +1001,46 @@ brains.post('/schedules', function(context) {
                     brain = resolution.brain;
                     brainTitle = brain.title || identifier;
                     // Get the schedule singleton instance
-                    scheduleId = context.env.SCHEDULE_DO.idFromName('singleton');
-                    scheduleStub = context.env.SCHEDULE_DO.get(scheduleId);
+                    scheduleDoId = context.env.SCHEDULE_DO.idFromName('singleton');
+                    scheduleStub = context.env.SCHEDULE_DO.get(scheduleDoId);
+                    // Determine timezone: use provided value, fall back to project timezone
+                    timezone = body.timezone;
+                    if (!!timezone) return [
+                        3,
+                        3
+                    ];
                     return [
                         4,
-                        scheduleStub.createSchedule(brainTitle, cronExpression)
+                        scheduleStub.getProjectTimezone()
                     ];
                 case 2:
+                    timezone = _state.sent();
+                    _state.label = 3;
+                case 3:
+                    // Validate timezone
+                    try {
+                        Intl.DateTimeFormat(undefined, {
+                            timeZone: timezone
+                        });
+                    } catch (e) {
+                        return [
+                            2,
+                            context.json({
+                                error: "Invalid timezone: ".concat(timezone)
+                            }, 400)
+                        ];
+                    }
+                    return [
+                        4,
+                        scheduleStub.createSchedule(brainTitle, cronExpression, timezone)
+                    ];
+                case 4:
                     schedule = _state.sent();
                     return [
                         2,
                         context.json(schedule, 201)
                     ];
-                case 3:
+                case 5:
                     error = _state.sent();
                     errorMessage = _instanceof(error, Error) ? error.message : 'Failed to create schedule';
                     return [
@@ -1022,7 +1049,7 @@ brains.post('/schedules', function(context) {
                             error: errorMessage
                         }, 400)
                     ];
-                case 4:
+                case 6:
                     return [
                         2
                     ];
@@ -1078,6 +1105,84 @@ brains.get('/schedules/runs', function(context) {
         });
     })();
 });
+// Get project timezone
+brains.get('/schedules/timezone', function(context) {
+    return _async_to_generator(function() {
+        var scheduleDoId, scheduleStub, timezone;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    scheduleDoId = context.env.SCHEDULE_DO.idFromName('singleton');
+                    scheduleStub = context.env.SCHEDULE_DO.get(scheduleDoId);
+                    return [
+                        4,
+                        scheduleStub.getProjectTimezone()
+                    ];
+                case 1:
+                    timezone = _state.sent();
+                    return [
+                        2,
+                        context.json({
+                            timezone: timezone
+                        })
+                    ];
+            }
+        });
+    })();
+});
+// Set project timezone
+brains.put('/schedules/timezone', function(context) {
+    return _async_to_generator(function() {
+        var body, timezone, scheduleDoId, scheduleStub;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    return [
+                        4,
+                        context.req.json()
+                    ];
+                case 1:
+                    body = _state.sent();
+                    timezone = body.timezone;
+                    if (!timezone) {
+                        return [
+                            2,
+                            context.json({
+                                error: 'Missing required field "timezone"'
+                            }, 400)
+                        ];
+                    }
+                    // Validate timezone
+                    try {
+                        Intl.DateTimeFormat(undefined, {
+                            timeZone: timezone
+                        });
+                    } catch (e) {
+                        return [
+                            2,
+                            context.json({
+                                error: "Invalid timezone: ".concat(timezone)
+                            }, 400)
+                        ];
+                    }
+                    scheduleDoId = context.env.SCHEDULE_DO.idFromName('singleton');
+                    scheduleStub = context.env.SCHEDULE_DO.get(scheduleDoId);
+                    return [
+                        4,
+                        scheduleStub.setProjectTimezone(timezone)
+                    ];
+                case 2:
+                    _state.sent();
+                    return [
+                        2,
+                        context.json({
+                            timezone: timezone
+                        })
+                    ];
+            }
+        });
+    })();
+});
 // Delete a schedule
 brains.delete('/schedules/:scheduleId', function(context) {
     return _async_to_generator(function() {

package/dist/src/brain-runner-do.js

@@ -298,6 +298,7 @@ import { TimeoutAdapter } from './timeout-adapter.js';
 import { PageAdapter } from './page-adapter.js';
 import { EventLoader } from './event-loader.js';
 import { createPagesService } from './pages-service.js';
+import { setGovernorBinding, rateGoverned } from './governor-client-wrapper.js';
 import { CloudflareR2Loader } from './r2-loader.js';
 import { createResources } from '@positronic/core';
 var manifest = null;
@@ -1055,6 +1056,7 @@ export var BrainRunnerDO = /*#__PURE__*/ function(DurableObject) {
                                 env = this.buildRuntimeEnv();
                                 // Create pages service for brain to use
                                 pagesService = createPagesService(brainRunId, this.env.RESOURCES_BUCKET, monitorDOStub, env);
+                                setGovernorBinding(this.env.GOVERNOR_DO);
                                 if (!brainRunner) {
                                     throw new Error('BrainRunner not initialized');
                                 }
@@ -1076,7 +1078,9 @@ export var BrainRunnerDO = /*#__PURE__*/ function(DurableObject) {
                                 signalProvider = new CloudflareSignalProvider(function(filter) {
                                     return _this.getAndConsumeSignals(filter);
                                 });
-                                runnerWithResources = runnerWithResources.withSignalProvider(signalProvider);
+                                runnerWithResources = runnerWithResources.withSignalProvider(signalProvider).withGovernor(function(c) {
+                                    return rateGoverned(c);
+                                });
                                 // Extract options from initialData if present
                                 options = initialData === null || initialData === void 0 ? void 0 : initialData.options;
                                 initialState = initialData && !initialData.options ? initialData : {};
@@ -1233,6 +1237,7 @@ export var BrainRunnerDO = /*#__PURE__*/ function(DurableObject) {
                                 env = this.buildRuntimeEnv();
                                 // Create pages service for brain to use
                                 pagesService = createPagesService(brainRunId, this.env.RESOURCES_BUCKET, monitorDOStub, env);
+                                setGovernorBinding(this.env.GOVERNOR_DO);
                                 if (!brainRunner) {
                                     throw new Error('BrainRunner not initialized');
                                 }
@@ -1253,7 +1258,9 @@ export var BrainRunnerDO = /*#__PURE__*/ function(DurableObject) {
                                 signalProvider = new CloudflareSignalProvider(function(filter) {
                                     return _this.getAndConsumeSignals(filter);
                                 });
-                                runnerWithResources = runnerWithResources.withSignalProvider(signalProvider);
+                                runnerWithResources = runnerWithResources.withSignalProvider(signalProvider).withGovernor(function(c) {
+                                    return rateGoverned(c);
+                                });
                                 // Create abort controller for this run
                                 this.abortController = new AbortController();
                                 batchChunkAdapter = new BatchChunkAdapter(function(signal) {

package/dist/src/dev-server.js

@@ -416,7 +416,7 @@ import { createRequire } from 'module';
 }();
 function generateProject(projectName, projectDir, onSuccess) {
     return _async_to_generator(function() {
-        var devPath, newProjectTemplatePath, cazOptions, templateSourcePath, require, templatePackageJsonPath, copiedNewProjectPkg;
+        var devPath, newProjectTemplatePath, cazOptions, templateSourcePath, inferredDevPath, require, templatePackageJsonPath, realPath, potentialRoot, copiedNewProjectPkg;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -425,6 +425,7 @@ function generateProject(projectName, projectDir, onSuccess) {
                     cazOptions = {
                         name: projectName
                     };
+                    inferredDevPath = false;
                     _state.label = 1;
                 case 1:
                     _state.trys.push([
@@ -448,6 +449,19 @@ function generateProject(projectName, projectDir, onSuccess) {
                         require = createRequire(import.meta.url);
                         templatePackageJsonPath = require.resolve('@positronic/template-new-project/package.json');
                         templateSourcePath = path.dirname(templatePackageJsonPath);
+                        // Auto-detect local workspace: if the template resolves to a real path
+                        // outside node_modules, we're running from a local monorepo (e.g. the user's
+                        // project uses file: references to @positronic/cloudflare). In that case,
+                        // set POSITRONIC_LOCAL_PATH so the template generates file: references too.
+                        realPath = fs.realpathSync(templateSourcePath);
+                        if (!realPath.includes("".concat(path.sep, "node_modules").concat(path.sep))) {
+                            potentialRoot = path.resolve(realPath, '..', '..');
+                            if (fs.existsSync(path.join(potentialRoot, 'packages', 'core')) && fs.existsSync(path.join(potentialRoot, 'packages', 'cloudflare'))) {
+                                devPath = potentialRoot;
+                                process.env.POSITRONIC_LOCAL_PATH = potentialRoot;
+                                inferredDevPath = true;
+                            }
+                        }
                     }
                     // Always copy to a temporary directory to avoid CAZ modifying our source
                     // CAZ only supports local paths, GitHub repos, or ZIP URLs - not npm package names
@@ -485,6 +499,10 @@ function generateProject(projectName, projectDir, onSuccess) {
                         5
                     ];
                 case 4:
+                    // Clean up the temporarily set env var
+                    if (inferredDevPath) {
+                        delete process.env.POSITRONIC_LOCAL_PATH;
+                    }
                     // Clean up the temporary copied new project package
                     fs.rmSync(newProjectTemplatePath, {
                         recursive: true,

package/dist/src/governor-client-wrapper.js

@@ -0,0 +1,364 @@
+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 _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 { estimateRequestTokens } from './token-estimator.js';
+var governorNamespace = null;
+export function setGovernorBinding(ns) {
+    governorNamespace = ns;
+}
+function getGovernorStub(identity) {
+    if (!governorNamespace) return null;
+    return governorNamespace.get(governorNamespace.idFromName(identity));
+}
+function computeIdentity(modelId, apiKey) {
+    return _async_to_generator(function() {
+        var data, hashBuffer, hashArray;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    data = new TextEncoder().encode("".concat(modelId, ":").concat(apiKey));
+                    return [
+                        4,
+                        crypto.subtle.digest('SHA-256', data)
+                    ];
+                case 1:
+                    hashBuffer = _state.sent();
+                    hashArray = new Uint8Array(hashBuffer);
+                    return [
+                        2,
+                        Array.from(hashArray).map(function(b) {
+                            return b.toString(16).padStart(2, '0');
+                        }).join('')
+                    ];
+            }
+        });
+    })();
+}
+function governedCall(_0) {
+    return _async_to_generator(function(param) {
+        var governorStub, modelId, estimatedTokens, call, extractHeaders, error, result, headers;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    governorStub = param.governorStub, modelId = param.modelId, estimatedTokens = param.estimatedTokens, call = param.call, extractHeaders = param.extractHeaders;
+                    if (!governorStub) {
+                        return [
+                            2,
+                            call()
+                        ];
+                    }
+                    _state.label = 1;
+                case 1:
+                    _state.trys.push([
+                        1,
+                        3,
+                        ,
+                        4
+                    ]);
+                    return [
+                        4,
+                        governorStub.waitForCapacity(modelId, estimatedTokens)
+                    ];
+                case 2:
+                    _state.sent();
+                    return [
+                        3,
+                        4
+                    ];
+                case 3:
+                    error = _state.sent();
+                    console.warn('Governor waitForCapacity failed, proceeding without rate limiting:', error);
+                    return [
+                        3,
+                        4
+                    ];
+                case 4:
+                    return [
+                        4,
+                        call()
+                    ];
+                case 5:
+                    result = _state.sent();
+                    headers = extractHeaders(result);
+                    if (headers) {
+                        governorStub.reportHeaders(headers);
+                    }
+                    return [
+                        2,
+                        result
+                    ];
+            }
+        });
+    }).apply(this, arguments);
+}
+export function rateGoverned(client) {
+    var _client_apiKey;
+    var apiKey = (_client_apiKey = client.apiKey) !== null && _client_apiKey !== void 0 ? _client_apiKey : '';
+    var cachedIdentity = null;
+    function getIdentity() {
+        return _async_to_generator(function() {
+            var _client_modelId, modelId;
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        if (cachedIdentity) return [
+                            2,
+                            cachedIdentity
+                        ];
+                        modelId = (_client_modelId = client.modelId) !== null && _client_modelId !== void 0 ? _client_modelId : 'unknown';
+                        return [
+                            4,
+                            computeIdentity(modelId, apiKey)
+                        ];
+                    case 1:
+                        cachedIdentity = _state.sent();
+                        return [
+                            2,
+                            cachedIdentity
+                        ];
+                }
+            });
+        })();
+    }
+    var wrapper = {
+        get identity () {
+            return client.identity;
+        },
+        get modelId () {
+            return client.modelId;
+        },
+        get apiKey () {
+            return client.apiKey;
+        },
+        generateObject: function generateObject(params) {
+            return _async_to_generator(function() {
+                var identity, governorStub, estimated, _client_modelId;
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            return [
+                                4,
+                                getIdentity()
+                            ];
+                        case 1:
+                            identity = _state.sent();
+                            governorStub = getGovernorStub(identity);
+                            estimated = estimateRequestTokens({
+                                prompt: params.prompt,
+                                messages: params.messages,
+                                system: params.system
+                            });
+                            return [
+                                2,
+                                governedCall({
+                                    governorStub: governorStub,
+                                    modelId: (_client_modelId = client.modelId) !== null && _client_modelId !== void 0 ? _client_modelId : 'unknown',
+                                    estimatedTokens: estimated,
+                                    call: function() {
+                                        return client.generateObject(params);
+                                    },
+                                    extractHeaders: function(result) {
+                                        return result.responseHeaders;
+                                    }
+                                })
+                            ];
+                    }
+                });
+            })();
+        },
+        createToolResultMessage: client.createToolResultMessage ? function(toolCallId, toolName, result) {
+            return client.createToolResultMessage(toolCallId, toolName, result);
+        } : undefined,
+        streamText: function streamText(params) {
+            return _async_to_generator(function() {
+                var identity, governorStub, estimated, _client_modelId;
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            return [
+                                4,
+                                getIdentity()
+                            ];
+                        case 1:
+                            identity = _state.sent();
+                            governorStub = getGovernorStub(identity);
+                            estimated = estimateRequestTokens({
+                                prompt: params.prompt,
+                                messages: params.messages,
+                                system: params.system
+                            });
+                            return [
+                                2,
+                                governedCall({
+                                    governorStub: governorStub,
+                                    modelId: (_client_modelId = client.modelId) !== null && _client_modelId !== void 0 ? _client_modelId : 'unknown',
+                                    estimatedTokens: estimated,
+                                    call: function() {
+                                        return client.streamText(params);
+                                    },
+                                    extractHeaders: function(result) {
+                                        return result.responseHeaders;
+                                    }
+                                })
+                            ];
+                    }
+                });
+            })();
+        }
+    };
+    if (client.generateText) {
+        wrapper.generateText = function(params) {
+            return _async_to_generator(function() {
+                var identity, governorStub, estimated, _client_modelId;
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            return [
+                                4,
+                                getIdentity()
+                            ];
+                        case 1:
+                            identity = _state.sent();
+                            governorStub = getGovernorStub(identity);
+                            estimated = estimateRequestTokens({
+                                messages: params.messages,
+                                system: params.system
+                            });
+                            return [
+                                2,
+                                governedCall({
+                                    governorStub: governorStub,
+                                    modelId: (_client_modelId = client.modelId) !== null && _client_modelId !== void 0 ? _client_modelId : 'unknown',
+                                    estimatedTokens: estimated,
+                                    call: function() {
+                                        return client.generateText(params);
+                                    },
+                                    extractHeaders: function(result) {
+                                        return result.responseHeaders;
+                                    }
+                                })
+                            ];
+                    }
+                });
+            })();
+        };
+    }
+    return wrapper;
+}