From d01058595ff3c5fa495f1e7bfe194a60a9132dec Mon Sep 17 00:00:00 2001 From: dswbx Date: Thu, 4 Sep 2025 20:42:19 +0200 Subject: [PATCH] update system info result, fix cloudflare export --- app/src/adapter/cloudflare/cloudflare-workers.adapter.ts | 2 +- app/src/adapter/cloudflare/index.ts | 1 + app/src/modules/db/DbModuleManager.ts | 5 +++-- app/src/modules/server/SystemController.ts | 2 ++ examples/cloudflare-worker/.gitignore | 5 +---- examples/cloudflare-worker/package.json | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/adapter/cloudflare/cloudflare-workers.adapter.ts b/app/src/adapter/cloudflare/cloudflare-workers.adapter.ts index 05c8332..fe278c4 100644 --- a/app/src/adapter/cloudflare/cloudflare-workers.adapter.ts +++ b/app/src/adapter/cloudflare/cloudflare-workers.adapter.ts @@ -34,7 +34,7 @@ export type CloudflareBkndConfig = RuntimeBkndConfig & }; export async function createApp( - config: CloudflareBkndConfig, + config: CloudflareBkndConfig = {}, ctx: Partial> = {}, ) { const appConfig = await makeConfig( diff --git a/app/src/adapter/cloudflare/index.ts b/app/src/adapter/cloudflare/index.ts index 24f0459..a09da7b 100644 --- a/app/src/adapter/cloudflare/index.ts +++ b/app/src/adapter/cloudflare/index.ts @@ -3,6 +3,7 @@ import { d1Sqlite, type D1ConnectionConfig } from "./connection/D1Connection"; export { getFresh, createApp, + serve, type CloudflareEnv, type CloudflareBkndConfig, } from "./cloudflare-workers.adapter"; diff --git a/app/src/modules/db/DbModuleManager.ts b/app/src/modules/db/DbModuleManager.ts index 126a5ea..bf69355 100644 --- a/app/src/modules/db/DbModuleManager.ts +++ b/app/src/modules/db/DbModuleManager.ts @@ -197,6 +197,7 @@ export class DbModuleManager extends ModuleManager { this.logger.context("save").log("saving version", this.version()); const { configs, secrets } = this.extractSecrets(); const version = this.version(); + const store_secrets = this.options?.storeSecrets !== false; await this.emgr.emit( new ModuleManagerSecretsExtractedEvent({ @@ -229,7 +230,7 @@ export class DbModuleManager extends ModuleManager { json: configs, }, ]; - if (this.options?.storeSecrets) { + if (store_secrets) { updates.push({ version: state.configs.version, type: "secrets", @@ -275,7 +276,7 @@ export class DbModuleManager extends ModuleManager { } // store secrets - if (this.options?.storeSecrets) { + if (store_secrets) { if (!state.secrets || state.secrets?.version !== version) { await this.mutator().insertOne({ version: state.configs.version, diff --git a/app/src/modules/server/SystemController.ts b/app/src/modules/server/SystemController.ts index f25b191..8db32e4 100644 --- a/app/src/modules/server/SystemController.ts +++ b/app/src/modules/server/SystemController.ts @@ -409,6 +409,8 @@ export class SystemController extends Controller { config: c.get("app")?.version(), bknd: getVersion(), }, + mode: this.app.mode, + readonly: this.app.isReadOnly(), runtime: getRuntimeKey(), connection: { name: this.app.em.connection.name, diff --git a/examples/cloudflare-worker/.gitignore b/examples/cloudflare-worker/.gitignore index 6fd7128..b47971c 100644 --- a/examples/cloudflare-worker/.gitignore +++ b/examples/cloudflare-worker/.gitignore @@ -95,10 +95,7 @@ web_modules/ # dotenv environment variable files .env -.env.development.local -.env.test.local -.env.production.local -.env.local +.env.* # parcel-bundler cache (https://parceljs.org/) diff --git a/examples/cloudflare-worker/package.json b/examples/cloudflare-worker/package.json index 02faf9d..5169a19 100644 --- a/examples/cloudflare-worker/package.json +++ b/examples/cloudflare-worker/package.json @@ -15,6 +15,6 @@ }, "devDependencies": { "typescript": "^5.9.2", - "wrangler": "^4.28.1" + "wrangler": "^4.34.0" } }