@dragonmastery/tamer 0.35.0 → 0.35.2
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.
- package/dist/{apply-B2wMY64Q.mjs → apply-Cz1lxAOp.mjs} +11 -11
- package/dist/{apply-B2wMY64Q.mjs.map → apply-Cz1lxAOp.mjs.map} +1 -1
- package/dist/{applyTarget-KBomh7SL.mjs → applyTarget-BI6QAVwA.mjs} +2 -2
- package/dist/{applyTarget-KBomh7SL.mjs.map → applyTarget-BI6QAVwA.mjs.map} +1 -1
- package/dist/bootstrap-CsL4IT9Z.mjs +34 -0
- package/dist/bootstrap-CsL4IT9Z.mjs.map +1 -0
- package/dist/{cloudflareSnapshot-BVlpH5K6.mjs → cloudflareSnapshot-CpNFH4zd.mjs} +4 -4
- package/dist/{cloudflareSnapshot-BVlpH5K6.mjs.map → cloudflareSnapshot-CpNFH4zd.mjs.map} +1 -1
- package/dist/{deploy-C4Mi_qwz.mjs → deploy-D2tQrtN9.mjs} +7 -7
- package/dist/{deploy-C4Mi_qwz.mjs.map → deploy-D2tQrtN9.mjs.map} +1 -1
- package/dist/{destroy-DDVWxl7U.mjs → destroy-CEv14T0X.mjs} +8 -8
- package/dist/{destroy-DDVWxl7U.mjs.map → destroy-CEv14T0X.mjs.map} +1 -1
- package/dist/{destroy-tenant-DL99EoRZ.mjs → destroy-tenant-Ugu7Y1EH.mjs} +2 -2
- package/dist/{destroy-tenant-DL99EoRZ.mjs.map → destroy-tenant-Ugu7Y1EH.mjs.map} +1 -1
- package/dist/{dev-BiPXBOKk.mjs → dev-vGQIP7tD.mjs} +6 -6
- package/dist/{dev-BiPXBOKk.mjs.map → dev-vGQIP7tD.mjs.map} +1 -1
- package/dist/{dns-records.sync-FyzKl-Ph.mjs → dns-records.sync-PoahWQjY.mjs} +2 -2
- package/dist/{dns-records.sync-FyzKl-Ph.mjs.map → dns-records.sync-PoahWQjY.mjs.map} +1 -1
- package/dist/{doctor-DDwsA2V6.mjs → doctor-BnsOxqnA.mjs} +2 -2
- package/dist/{doctor-DDwsA2V6.mjs.map → doctor-BnsOxqnA.mjs.map} +1 -1
- package/dist/{drift-DqMtlwkg.mjs → drift-C3wIrNyg.mjs} +4 -4
- package/dist/{drift-RpShXwG7.mjs → drift-C7pgj4Iw.mjs} +5 -5
- package/dist/{drift-RpShXwG7.mjs.map → drift-C7pgj4Iw.mjs.map} +1 -1
- package/dist/{emit-BUPlQH-r.mjs → emit-vpibELHm.mjs} +3 -3
- package/dist/{emit-BUPlQH-r.mjs.map → emit-vpibELHm.mjs.map} +1 -1
- package/dist/{events-D9kQWwH8.mjs → events-yk4J3l0M.mjs} +2 -2
- package/dist/{events-D9kQWwH8.mjs.map → events-yk4J3l0M.mjs.map} +1 -1
- package/dist/{generator-BCcu_eoO.mjs → generator-7b97QsuM.mjs} +2 -2
- package/dist/{generator-BCcu_eoO.mjs.map → generator-7b97QsuM.mjs.map} +1 -1
- package/dist/{import-DHmLtue3.mjs → import-CZ6509_t.mjs} +3 -3
- package/dist/{import-DHmLtue3.mjs.map → import-CZ6509_t.mjs.map} +1 -1
- package/dist/{migrate-36WDEaFz.mjs → migrate-DDBMzPtR.mjs} +4 -4
- package/dist/{migrate-36WDEaFz.mjs.map → migrate-DDBMzPtR.mjs.map} +1 -1
- package/dist/{plan-k0jLGYyw.mjs → plan-Dot2VV7R.mjs} +8 -8
- package/dist/{plan-k0jLGYyw.mjs.map → plan-Dot2VV7R.mjs.map} +1 -1
- package/dist/{provision-tenant-BjFpVm-y.mjs → provision-tenant-C2EL79oz.mjs} +2 -2
- package/dist/{provision-tenant-BjFpVm-y.mjs.map → provision-tenant-C2EL79oz.mjs.map} +1 -1
- package/dist/{registry-DyToEush.mjs → registry-D-vo1TTV.mjs} +2 -2
- package/dist/{registry-DyToEush.mjs.map → registry-D-vo1TTV.mjs.map} +1 -1
- package/dist/{stackOutputs-CkpNSng8.mjs → stackOutputs-CuLa76D4.mjs} +2 -2
- package/dist/{stackOutputs-CkpNSng8.mjs.map → stackOutputs-CuLa76D4.mjs.map} +1 -1
- package/dist/{status-DaaOPBEf.mjs → status-_k3a77Fw.mjs} +4 -4
- package/dist/{status-DaaOPBEf.mjs.map → status-_k3a77Fw.mjs.map} +1 -1
- package/dist/{sync-DEudPgQc.mjs → sync-C5RjLfgk.mjs} +5 -5
- package/dist/{sync-DEudPgQc.mjs.map → sync-C5RjLfgk.mjs.map} +1 -1
- package/dist/tamer.mjs +35 -35
- package/dist/tamer.mjs.map +1 -1
- package/dist/{types-BQajHdJb.mjs → types-CqmFeIBf.mjs} +4 -4
- package/dist/{types-BQajHdJb.mjs.map → types-CqmFeIBf.mjs.map} +1 -1
- package/dist/{verifyPlanFile-CpxwOxrV.mjs → verifyPlanFile-DSO-yS64.mjs} +2 -2
- package/dist/{verifyPlanFile-CpxwOxrV.mjs.map → verifyPlanFile-DSO-yS64.mjs.map} +1 -1
- package/dist/{wfp-delete-DsfqSBxt.mjs → wfp-delete-C-1pIY3Z.mjs} +2 -2
- package/dist/{wfp-delete-DsfqSBxt.mjs.map → wfp-delete-C-1pIY3Z.mjs.map} +1 -1
- package/dist/{wfp-put-DX_bH-s7.mjs → wfp-put-D0tDs0J5.mjs} +2 -2
- package/dist/{wfp-put-DX_bH-s7.mjs.map → wfp-put-D0tDs0J5.mjs.map} +1 -1
- package/dist/{worker-route-CUQBu9xe.mjs → worker-route-RexL6xCk.mjs} +2 -2
- package/dist/{worker-route-CUQBu9xe.mjs.map → worker-route-RexL6xCk.mjs.map} +1 -1
- package/dist/{workers-BjDCuyVv.mjs → workers-CS0tlbdk.mjs} +2 -2
- package/dist/{workers-BjDCuyVv.mjs.map → workers-CS0tlbdk.mjs.map} +1 -1
- package/package.json +1 -1
- package/dist/bootstrap-C7CZYHzb.mjs +0 -33
- package/dist/bootstrap-C7CZYHzb.mjs.map +0 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import "./registry-
|
|
1
|
+
import { B as loadConfig, C as stackNameForConfig, I as CFApiClient, L as cloudflareAccountIdFromEnv, O as resolveWorkerConfig, f as fetchStackImports, h as StateManager, j as wranglerConfigCliArgs, u as namingFromConfig, z as getWorkers } from "./tamer.mjs";
|
|
2
|
+
import "./registry-D-vo1TTV.mjs";
|
|
3
3
|
import "./r2S3EmptyBucket-B9_pHfvB.mjs";
|
|
4
|
-
import { n as writeWranglerJson, t as generateWranglerConfig } from "./generator-
|
|
4
|
+
import { n as writeWranglerJson, t as generateWranglerConfig } from "./generator-7b97QsuM.mjs";
|
|
5
5
|
import { n as spawnWranglerSync } from "./wranglerSpawn-CqVNGkA9.mjs";
|
|
6
6
|
|
|
7
7
|
//#region src/cli/commands/types.ts
|
|
@@ -39,4 +39,4 @@ async function runTypes(options) {
|
|
|
39
39
|
|
|
40
40
|
//#endregion
|
|
41
41
|
export { runTypes };
|
|
42
|
-
//# sourceMappingURL=types-
|
|
42
|
+
//# sourceMappingURL=types-CqmFeIBf.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types-
|
|
1
|
+
{"version":3,"file":"types-CqmFeIBf.mjs","names":[],"sources":["../src/cli/commands/types.ts"],"sourcesContent":["import { loadConfig, getWorkers } from \"../../core/config/loader.js\";\nimport { cloudflareAccountIdFromEnv } from \"../../core/cloudflareEnv.js\";\nimport { namingFromConfig } from \"../../core/config/namingFromConfig.js\";\nimport { wranglerConfigCliArgs } from \"../../core/wrangler/wranglerOutFile.js\";\nimport { spawnWranglerSync } from \"../../core/wrangler/wranglerSpawn.js\";\nimport { StateManager } from \"../../core/state/StateManager.js\";\nimport { stackNameForConfig } from \"../../core/state/stackName.js\";\nimport { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport { resolveWorkerConfig } from \"../../core/config/resolver.js\";\nimport { fetchStackImports } from \"../../core/imports/fetchStackImports.js\";\nimport {\n generateWranglerConfig,\n writeWranglerJson,\n} from \"../../core/wrangler/generator.js\";\n\nexport async function runTypes(options: {\n worker?: string;\n env?: string;\n configPath?: string;\n}): Promise<void> {\n const workerFilter = options.worker;\n const env = options.env ?? \"local\";\n const configPath = options.configPath;\n const baseDir = process.cwd();\n\n const config = await loadConfig(configPath, { env });\n const accountId =\n config.account_id ?? cloudflareAccountIdFromEnv();\n if (!accountId) {\n throw new Error(\n \"account_id required in config or CLOUDFLARE_ACCOUNT_ID env var\",\n );\n }\n\n const naming = namingFromConfig(config);\n const api = new CFApiClient(accountId);\n const state = new StateManager(\n config.tenant.id,\n env,\n stackNameForConfig(config),\n );\n await state.hydrate(api);\n const imports = await fetchStackImports(api, config, env);\n\n const workers = await getWorkers(config, baseDir);\n const toRun = workerFilter\n ? workers.filter(([k]) => k === workerFilter)\n : workers;\n\n if (toRun.length === 0) {\n throw new Error(\n workerFilter\n ? `Worker \"${workerFilter}\" not found`\n : \"No workers configured\",\n );\n }\n\n for (const [workerKey, workerConfig] of toRun) {\n const resolved = await resolveWorkerConfig(\n config,\n workerKey,\n workerConfig,\n env,\n baseDir,\n accountId,\n naming,\n state,\n { imports },\n );\n const wranglerConfig = generateWranglerConfig(resolved, state, naming);\n writeWranglerJson(resolved.workerDir, wranglerConfig, resolved.wranglerOutFile);\n\n const typesArgs = [\n \"wrangler\",\n ...wranglerConfigCliArgs(resolved.wranglerOutFile),\n \"types\",\n ];\n const result = spawnWranglerSync(typesArgs, {\n cwd: resolved.workerDir,\n stdio: \"inherit\",\n });\n if (result.status !== 0) {\n throw new Error(`wrangler types failed for ${workerKey}`);\n }\n console.log(`Generated types for ${workerKey}`);\n }\n}\n"],"mappings":";;;;;;;AAeA,eAAsB,SAAS,SAIb;CAChB,MAAM,eAAe,QAAQ;CAC7B,MAAM,MAAM,QAAQ,OAAO;CAC3B,MAAM,aAAa,QAAQ;CAC3B,MAAM,UAAU,QAAQ,KAAK;CAE7B,MAAM,SAAS,MAAM,WAAW,YAAY,EAAE,KAAK,CAAC;CACpD,MAAM,YACJ,OAAO,cAAc,4BAA4B;AACnD,KAAI,CAAC,UACH,OAAM,IAAI,MACR,iEACD;CAGH,MAAM,SAAS,iBAAiB,OAAO;CACvC,MAAM,MAAM,IAAI,YAAY,UAAU;CACtC,MAAM,QAAQ,IAAI,aAChB,OAAO,OAAO,IACd,KACA,mBAAmB,OAAO,CAC3B;AACD,OAAM,MAAM,QAAQ,IAAI;CACxB,MAAM,UAAU,MAAM,kBAAkB,KAAK,QAAQ,IAAI;CAEzD,MAAM,UAAU,MAAM,WAAW,QAAQ,QAAQ;CACjD,MAAM,QAAQ,eACV,QAAQ,QAAQ,CAAC,OAAO,MAAM,aAAa,GAC3C;AAEJ,KAAI,MAAM,WAAW,EACnB,OAAM,IAAI,MACR,eACI,WAAW,aAAa,eACxB,wBACL;AAGH,MAAK,MAAM,CAAC,WAAW,iBAAiB,OAAO;EAC7C,MAAM,WAAW,MAAM,oBACrB,QACA,WACA,cACA,KACA,SACA,WACA,QACA,OACA,EAAE,SAAS,CACZ;EACD,MAAM,iBAAiB,uBAAuB,UAAU,OAAO,OAAO;AACtE,oBAAkB,SAAS,WAAW,gBAAgB,SAAS,gBAAgB;AAW/E,MAJe,kBALG;GAChB;GACA,GAAG,sBAAsB,SAAS,gBAAgB;GAClD;GACD,EAC2C;GAC1C,KAAK,SAAS;GACd,OAAO;GACR,CAAC,CACS,WAAW,EACpB,OAAM,IAAI,MAAM,6BAA6B,YAAY;AAE3D,UAAQ,IAAI,uBAAuB,YAAY"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { a as readPlanFile, r as computeAttestation } from "./cloudflareSnapshot-
|
|
1
|
+
import { a as readPlanFile, r as computeAttestation } from "./cloudflareSnapshot-CpNFH4zd.mjs";
|
|
2
2
|
|
|
3
3
|
//#region src/core/plan/verifyPlanFile.ts
|
|
4
4
|
function verifyPlanFile(args) {
|
|
@@ -30,4 +30,4 @@ function verifyPlanFile(args) {
|
|
|
30
30
|
|
|
31
31
|
//#endregion
|
|
32
32
|
export { verifyPlanFile as t };
|
|
33
|
-
//# sourceMappingURL=verifyPlanFile-
|
|
33
|
+
//# sourceMappingURL=verifyPlanFile-DSO-yS64.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyPlanFile-
|
|
1
|
+
{"version":3,"file":"verifyPlanFile-DSO-yS64.mjs","names":["reasons: string[]"],"sources":["../src/core/plan/verifyPlanFile.ts"],"sourcesContent":["/**\n * Cross-check a saved {@link PlanFile} against the current `(config, state,\n * live Cloudflare)` triple. Shared by `tamer apply --plan` and `tamer\n * destroy --plan`: both commands must refuse to execute against drifted\n * inputs unless the operator explicitly passes `--allow-stale`.\n *\n * The hashes are produced by {@link computeAttestation} (config + state)\n * and {@link hashCloudflareSnapshot} (live CF snapshot). Same algorithm on\n * both sides; if either side ever changes its canonical-JSON contract,\n * older plans must be regenerated.\n */\n\nimport type { CfiConfig, CfiState } from \"../../types.js\";\nimport { computeAttestation, readPlanFile } from \"./planFile.js\";\nimport type { PlanMode } from \"./plan.types.js\";\n\nexport function verifyPlanFile(args: {\n /** Filesystem path passed by the operator (`--plan plan.json`). */\n planPath: string;\n /** \"apply\" or \"destroy\" — used for diagnostics only. */\n command: \"apply\" | \"destroy\";\n /**\n * Required mode for the plan. `apply --plan` accepts only forward plans;\n * `destroy --plan` accepts only destroy plans. Mismatch is a hard error\n * (no `--allow-stale` override) since the actions are different.\n */\n expectedMode: PlanMode;\n env: string;\n tenantId: string;\n config: CfiConfig;\n stateAtPlanCheck: CfiState;\n /**\n * Hash of the live Cloudflare snapshot computed at run time. When the\n * plan was generated with `attestation.cloudflareHash`, mismatches mean\n * infra drifted out-of-band between plan and run. Omitted for\n * `env: local` and for older plan files written before drift-aware\n * refresh.\n */\n liveCloudflareHash: string | undefined;\n allowStale: boolean;\n}): void {\n const plan = readPlanFile(args.planPath);\n const cmd = args.command;\n\n if (plan.tenantId !== args.tenantId) {\n throw new Error(\n `${cmd} --plan: plan tenant \"${plan.tenantId}\" does not match current config tenant \"${args.tenantId}\"`,\n );\n }\n if (plan.env !== args.env) {\n throw new Error(\n `${cmd} --plan: plan env \"${plan.env}\" does not match --env \"${args.env}\"`,\n );\n }\n\n const planMode = plan.report.mode ?? \"forward\";\n if (planMode !== args.expectedMode) {\n throw new Error(\n `${cmd} --plan: plan mode \"${planMode}\" does not match expected mode \"${args.expectedMode}\". ` +\n `Use \\`tamer plan${args.expectedMode === \"destroy\" ? \" --destroy\" : \"\"} --out ${args.planPath}\\` to regenerate.`,\n );\n }\n\n const current = computeAttestation(args.config, args.stateAtPlanCheck);\n const configMatches = current.configHash === plan.attestation.configHash;\n const stateMatches = current.stateHash === plan.attestation.stateHash;\n const cloudflareMatches =\n plan.attestation.cloudflareHash === undefined ||\n args.liveCloudflareHash === undefined ||\n plan.attestation.cloudflareHash === args.liveCloudflareHash;\n\n if (configMatches && stateMatches && cloudflareMatches) {\n console.log(`Plan attestation verified (${args.planPath}).`);\n return;\n }\n\n const reasons: string[] = [];\n if (!configMatches) reasons.push(\"config has changed since plan was generated\");\n if (!stateMatches) reasons.push(\"recorded state has changed since plan was generated\");\n if (!cloudflareMatches)\n reasons.push(\n \"Cloudflare-side resources drifted since plan was generated (out-of-band create/delete)\",\n );\n const detail = reasons.join(\"; \");\n\n if (args.allowStale) {\n console.warn(\n `Plan attestation mismatch (${detail}). Proceeding anyway because --allow-stale was set.`,\n );\n return;\n }\n throw new Error(\n `${cmd} --plan refused: ${detail}. Re-run \"tamer plan${args.expectedMode === \"destroy\" ? \" --destroy\" : \"\"} --out ${args.planPath}\" or pass --allow-stale to override.`,\n );\n}\n"],"mappings":";;;AAgBA,SAAgB,eAAe,MAwBtB;CACP,MAAM,OAAO,aAAa,KAAK,SAAS;CACxC,MAAM,MAAM,KAAK;AAEjB,KAAI,KAAK,aAAa,KAAK,SACzB,OAAM,IAAI,MACR,GAAG,IAAI,wBAAwB,KAAK,SAAS,0CAA0C,KAAK,SAAS,GACtG;AAEH,KAAI,KAAK,QAAQ,KAAK,IACpB,OAAM,IAAI,MACR,GAAG,IAAI,qBAAqB,KAAK,IAAI,0BAA0B,KAAK,IAAI,GACzE;CAGH,MAAM,WAAW,KAAK,OAAO,QAAQ;AACrC,KAAI,aAAa,KAAK,aACpB,OAAM,IAAI,MACR,GAAG,IAAI,sBAAsB,SAAS,kCAAkC,KAAK,aAAa,qBACrE,KAAK,iBAAiB,YAAY,eAAe,GAAG,SAAS,KAAK,SAAS,mBACjG;CAGH,MAAM,UAAU,mBAAmB,KAAK,QAAQ,KAAK,iBAAiB;CACtE,MAAM,gBAAgB,QAAQ,eAAe,KAAK,YAAY;CAC9D,MAAM,eAAe,QAAQ,cAAc,KAAK,YAAY;CAC5D,MAAM,oBACJ,KAAK,YAAY,mBAAmB,UACpC,KAAK,uBAAuB,UAC5B,KAAK,YAAY,mBAAmB,KAAK;AAE3C,KAAI,iBAAiB,gBAAgB,mBAAmB;AACtD,UAAQ,IAAI,8BAA8B,KAAK,SAAS,IAAI;AAC5D;;CAGF,MAAMA,UAAoB,EAAE;AAC5B,KAAI,CAAC,cAAe,SAAQ,KAAK,8CAA8C;AAC/E,KAAI,CAAC,aAAc,SAAQ,KAAK,sDAAsD;AACtF,KAAI,CAAC,kBACH,SAAQ,KACN,yFACD;CACH,MAAM,SAAS,QAAQ,KAAK,KAAK;AAEjC,KAAI,KAAK,YAAY;AACnB,UAAQ,KACN,8BAA8B,OAAO,qDACtC;AACD;;AAEF,OAAM,IAAI,MACR,GAAG,IAAI,mBAAmB,OAAO,sBAAsB,KAAK,iBAAiB,YAAY,eAAe,GAAG,SAAS,KAAK,SAAS,sCACnI"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { B as loadConfig, I as CFApiClient, L as cloudflareAccountIdFromEnv } from "./tamer.mjs";
|
|
2
2
|
|
|
3
3
|
//#region src/cli/commands/wfp-delete.ts
|
|
4
4
|
function parseWfpDeleteArgs(argv) {
|
|
@@ -32,4 +32,4 @@ async function runWfpDelete(options) {
|
|
|
32
32
|
|
|
33
33
|
//#endregion
|
|
34
34
|
export { parseWfpDeleteArgs, runWfpDelete };
|
|
35
|
-
//# sourceMappingURL=wfp-delete-
|
|
35
|
+
//# sourceMappingURL=wfp-delete-C-1pIY3Z.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wfp-delete-
|
|
1
|
+
{"version":3,"file":"wfp-delete-C-1pIY3Z.mjs","names":["opts: Record<string, string | boolean>"],"sources":["../src/cli/commands/wfp-delete.ts"],"sourcesContent":["import { loadConfig } from \"../../core/config/loader.js\";\nimport { cloudflareAccountIdFromEnv } from \"../../core/cloudflareEnv.js\";\nimport { CFApiClient } from \"../../core/api/CFApiClient.js\";\n\nexport function parseWfpDeleteArgs(argv: string[]): {\n namespace: string;\n scriptName: string;\n force?: boolean;\n configPath?: string;\n} {\n const opts: Record<string, string | boolean> = {};\n for (let i = 0; i < argv.length; i++) {\n const arg = argv[i];\n if (!arg.startsWith(\"--\")) continue;\n const key = arg.slice(2).replace(/-/g, \"_\");\n const next = argv[i + 1];\n if (next && !next.startsWith(\"--\")) {\n opts[key] = next;\n i++;\n } else {\n opts[key] = true;\n }\n }\n const namespace = opts.namespace as string | undefined;\n const scriptName = opts.script_name as string | undefined;\n if (!namespace || !scriptName) {\n throw new Error(\n \"usage: tamer wfp delete --namespace <name> --script-name <name> [--force] [--config <project.config.ts>]\",\n );\n }\n return {\n namespace,\n scriptName,\n force: opts.force === true || opts.force === \"true\",\n configPath: opts.config as string | undefined,\n };\n}\n\nexport async function runWfpDelete(options: {\n namespace: string;\n scriptName: string;\n force?: boolean;\n configPath?: string;\n}): Promise<void> {\n const config = await loadConfig(options.configPath, { env: \"local\" });\n const accountId = config.account_id ?? cloudflareAccountIdFromEnv();\n if (!accountId) {\n throw new Error(\n \"account_id required in config or CLOUDFLARE_ACCOUNT_ID env var\",\n );\n }\n\n const api = new CFApiClient(accountId);\n await api.dispatchNamespaceScriptDelete(options.namespace, options.scriptName, {\n force: options.force,\n });\n console.log(\n `Deleted script \"${options.scriptName}\" from dispatch namespace \"${options.namespace}\".`,\n );\n}\n"],"mappings":";;;AAIA,SAAgB,mBAAmB,MAKjC;CACA,MAAMA,OAAyC,EAAE;AACjD,MAAK,IAAI,IAAI,GAAG,IAAI,KAAK,QAAQ,KAAK;EACpC,MAAM,MAAM,KAAK;AACjB,MAAI,CAAC,IAAI,WAAW,KAAK,CAAE;EAC3B,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC,QAAQ,MAAM,IAAI;EAC3C,MAAM,OAAO,KAAK,IAAI;AACtB,MAAI,QAAQ,CAAC,KAAK,WAAW,KAAK,EAAE;AAClC,QAAK,OAAO;AACZ;QAEA,MAAK,OAAO;;CAGhB,MAAM,YAAY,KAAK;CACvB,MAAM,aAAa,KAAK;AACxB,KAAI,CAAC,aAAa,CAAC,WACjB,OAAM,IAAI,MACR,2GACD;AAEH,QAAO;EACL;EACA;EACA,OAAO,KAAK,UAAU,QAAQ,KAAK,UAAU;EAC7C,YAAY,KAAK;EAClB;;AAGH,eAAsB,aAAa,SAKjB;CAEhB,MAAM,aADS,MAAM,WAAW,QAAQ,YAAY,EAAE,KAAK,SAAS,CAAC,EAC5C,cAAc,4BAA4B;AACnE,KAAI,CAAC,UACH,OAAM,IAAI,MACR,iEACD;AAIH,OADY,IAAI,YAAY,UAAU,CAC5B,8BAA8B,QAAQ,WAAW,QAAQ,YAAY,EAC7E,OAAO,QAAQ,OAChB,CAAC;AACF,SAAQ,IACN,mBAAmB,QAAQ,WAAW,6BAA6B,QAAQ,UAAU,IACtF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { B as loadConfig, I as CFApiClient, L as cloudflareAccountIdFromEnv } from "./tamer.mjs";
|
|
2
2
|
import { t as buildSingleModuleDispatchForm } from "./buildDispatchUploadForm-BNDcS5_9.mjs";
|
|
3
3
|
import { resolve } from "path";
|
|
4
4
|
|
|
@@ -48,4 +48,4 @@ async function runWfpPut(options) {
|
|
|
48
48
|
|
|
49
49
|
//#endregion
|
|
50
50
|
export { parseWfpPutArgs, runWfpPut };
|
|
51
|
-
//# sourceMappingURL=wfp-put-
|
|
51
|
+
//# sourceMappingURL=wfp-put-D0tDs0J5.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wfp-put-
|
|
1
|
+
{"version":3,"file":"wfp-put-D0tDs0J5.mjs","names":["opts: Record<string, string | boolean | string[]>"],"sources":["../src/cli/commands/wfp-put.ts"],"sourcesContent":["import { resolve } from \"path\";\nimport { loadConfig } from \"../../core/config/loader.js\";\nimport { cloudflareAccountIdFromEnv } from \"../../core/cloudflareEnv.js\";\nimport { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport { buildSingleModuleDispatchForm } from \"../../core/wfp/buildDispatchUploadForm.js\";\n\nexport function parseWfpPutArgs(argv: string[]): {\n namespace: string;\n scriptName: string;\n main: string;\n compatDate?: string;\n flags?: string[];\n configPath?: string;\n} {\n const opts: Record<string, string | boolean | string[]> = {};\n for (let i = 0; i < argv.length; i++) {\n const arg = argv[i];\n if (!arg.startsWith(\"--\")) continue;\n const key = arg.slice(2).replace(/-/g, \"_\");\n const next = argv[i + 1];\n if (key === \"compat_flags\") {\n if (next && !next.startsWith(\"--\")) {\n opts[key] = next.split(\",\").map((s) => s.trim()).filter(Boolean);\n i++;\n }\n } else if (next && !next.startsWith(\"--\")) {\n opts[key] = next;\n i++;\n }\n }\n const namespace = opts.namespace as string | undefined;\n const scriptName = opts.script_name as string | undefined;\n const main = opts.main as string | undefined;\n if (!namespace || !scriptName || !main) {\n throw new Error(\n \"usage: tamer wfp put --namespace <name> --script-name <name> --main <file> [--compatibility-date <yyyy-mm-dd>] [--compat-flags a,b] [--config <project.config.ts>]\",\n );\n }\n return {\n namespace,\n scriptName,\n main: resolve(process.cwd(), main),\n compatDate:\n (opts.compatibility_date as string | undefined) ??\n (opts.compat_date as string | undefined),\n flags: opts.compat_flags as string[] | undefined,\n configPath: opts.config as string | undefined,\n };\n}\n\nexport async function runWfpPut(options: {\n namespace: string;\n scriptName: string;\n main: string;\n compatDate?: string;\n flags?: string[];\n configPath?: string;\n}): Promise<void> {\n const config = await loadConfig(options.configPath, { env: \"local\" });\n const accountId =\n config.account_id ?? cloudflareAccountIdFromEnv();\n if (!accountId) {\n throw new Error(\n \"account_id required in config or CLOUDFLARE_ACCOUNT_ID env var\",\n );\n }\n\n const compatDate =\n options.compatDate ??\n config.compatibility_date ??\n new Date().toISOString().slice(0, 10);\n\n const form = buildSingleModuleDispatchForm(options.main, {\n compatibility_date: compatDate,\n compatibility_flags: options.flags,\n });\n\n const api = new CFApiClient(accountId);\n await api.dispatchNamespaceScriptPut(\n options.namespace,\n options.scriptName,\n form,\n );\n console.log(\n `Uploaded script \"${options.scriptName}\" to dispatch namespace \"${options.namespace}\".`,\n );\n}\n"],"mappings":";;;;;AAMA,SAAgB,gBAAgB,MAO9B;CACA,MAAMA,OAAoD,EAAE;AAC5D,MAAK,IAAI,IAAI,GAAG,IAAI,KAAK,QAAQ,KAAK;EACpC,MAAM,MAAM,KAAK;AACjB,MAAI,CAAC,IAAI,WAAW,KAAK,CAAE;EAC3B,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC,QAAQ,MAAM,IAAI;EAC3C,MAAM,OAAO,KAAK,IAAI;AACtB,MAAI,QAAQ,gBACV;OAAI,QAAQ,CAAC,KAAK,WAAW,KAAK,EAAE;AAClC,SAAK,OAAO,KAAK,MAAM,IAAI,CAAC,KAAK,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,QAAQ;AAChE;;aAEO,QAAQ,CAAC,KAAK,WAAW,KAAK,EAAE;AACzC,QAAK,OAAO;AACZ;;;CAGJ,MAAM,YAAY,KAAK;CACvB,MAAM,aAAa,KAAK;CACxB,MAAM,OAAO,KAAK;AAClB,KAAI,CAAC,aAAa,CAAC,cAAc,CAAC,KAChC,OAAM,IAAI,MACR,qKACD;AAEH,QAAO;EACL;EACA;EACA,MAAM,QAAQ,QAAQ,KAAK,EAAE,KAAK;EAClC,YACG,KAAK,sBACL,KAAK;EACR,OAAO,KAAK;EACZ,YAAY,KAAK;EAClB;;AAGH,eAAsB,UAAU,SAOd;CAChB,MAAM,SAAS,MAAM,WAAW,QAAQ,YAAY,EAAE,KAAK,SAAS,CAAC;CACrE,MAAM,YACJ,OAAO,cAAc,4BAA4B;AACnD,KAAI,CAAC,UACH,OAAM,IAAI,MACR,iEACD;CAGH,MAAM,aACJ,QAAQ,cACR,OAAO,uCACP,IAAI,MAAM,EAAC,aAAa,CAAC,MAAM,GAAG,GAAG;CAEvC,MAAM,OAAO,8BAA8B,QAAQ,MAAM;EACvD,oBAAoB;EACpB,qBAAqB,QAAQ;EAC9B,CAAC;AAGF,OADY,IAAI,YAAY,UAAU,CAC5B,2BACR,QAAQ,WACR,QAAQ,YACR,KACD;AACD,SAAQ,IACN,oBAAoB,QAAQ,WAAW,2BAA2B,QAAQ,UAAU,IACrF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { E as mergedWorkerConfigForEnv, O as resolveWorkerConfig, z as getWorkers } from "./tamer.mjs";
|
|
2
2
|
import { n as workerRouteStateKey, t as findZoneIdByName } from "./zoneResolver-D9bz6-0l.mjs";
|
|
3
3
|
|
|
4
4
|
//#region src/features/worker-route/worker-route.sync.ts
|
|
@@ -259,4 +259,4 @@ async function workerRoutesDrift(env, config, baseDir, accountId, naming, state,
|
|
|
259
259
|
|
|
260
260
|
//#endregion
|
|
261
261
|
export { workerRouteSync as i, workerRoutesDestroy as n, workerRoutesApply as r, workerRoutesDrift as t };
|
|
262
|
-
//# sourceMappingURL=worker-route-
|
|
262
|
+
//# sourceMappingURL=worker-route-RexL6xCk.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-route-CUQBu9xe.mjs","names":["list: Array<{ id: string; pattern: string; script: string }>","entry: WorkerRouteStateEntry","list: Array<{ id: string; pattern: string; script: string }>","key","entry: WorkerRouteStateEntry","drift: ResourceDrift","list: Array<{ id: string; pattern: string; script: string }>"],"sources":["../src/features/worker-route/worker-route.sync.ts","../src/features/worker-route/worker-route.prune.ts","../src/features/worker-route/worker-route.apply.ts","../src/features/worker-route/worker-route.destroy.ts","../src/features/worker-route/worker-route.drift.ts"],"sourcesContent":["import type { CfiConfig } from \"../../types.js\";\nimport type { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport type { StateManager } from \"../../core/state/StateManager.js\";\nimport type { NamingEngine } from \"../../core/naming/NamingEngine.js\";\nimport { getWorkers } from \"../../core/config/loader.js\";\nimport { resolveWorkerConfig } from \"../../core/config/resolver.js\";\nimport { findZoneIdByName } from \"../../core/routes/zoneResolver.js\";\nimport { workerRouteStateKey } from \"./worker-route.stateKey.js\";\nimport type { WorkerRouteStateEntry } from \"../../types.js\";\n\n/**\n * Merge Workers zone routes for `tamerRoutes` (API-managed) into state from\n * Cloudflare listings. Drops stale `worker_route` rows for workers in this\n * config when the route no longer exists on CF.\n */\nexport async function workerRouteSync(\n env: string,\n config: CfiConfig,\n baseDir: string,\n accountId: string,\n naming: NamingEngine,\n state: StateManager,\n api: CFApiClient,\n opts: {\n /**\n * Pre-fetched sibling stack outputs so cross-stack route hosts/zones\n * resolve to real patterns (else they stay as placeholders and never\n * match anything CF returned). Optional — sync is tolerant mode.\n */\n imports?: Record<string, Record<string, string>>;\n } = {},\n): Promise<void> {\n if (env === \"local\") return;\n\n const workers = await getWorkers(config, baseDir);\n const workerKeys = new Set(workers.map(([k]) => k));\n const touchedKeys = new Set<string>();\n const ts = new Date().toISOString();\n\n for (const [workerKey, wc] of workers) {\n const resolved = await resolveWorkerConfig(\n config,\n workerKey,\n wc,\n env,\n baseDir,\n accountId,\n naming,\n state,\n { referencesMode: \"tolerant\", imports: opts.imports },\n );\n for (const route of resolved.apiManagedRoutes) {\n const zoneId = await findZoneIdByName(api, route.zone_name);\n if (!zoneId) {\n console.warn(\n `[sync] worker routes: zone \"${route.zone_name}\" not found; skip ${route.pattern}`,\n );\n continue;\n }\n let list: Array<{ id: string; pattern: string; script: string }>;\n try {\n list = await api.zoneWorkerRoutesList(zoneId);\n } catch (err) {\n const msg = err instanceof Error ? err.message : String(err);\n console.warn(\n `[sync] worker routes: list failed for zone ${route.zone_name}: ${msg}`,\n );\n continue;\n }\n const hit = list.find(\n (r) => r.pattern === route.pattern && r.script === resolved.workerName,\n );\n if (!hit) continue;\n\n const key = workerRouteStateKey(zoneId, hit.id);\n touchedKeys.add(key);\n const existing = state.get(key);\n const prev =\n existing?.type === \"worker_route\" ? existing : undefined;\n const entry: WorkerRouteStateEntry = {\n type: \"worker_route\",\n workerKey,\n workerName: resolved.workerName,\n zoneId,\n zoneName: route.zone_name,\n routeId: hit.id,\n pattern: route.pattern,\n createdAt: prev?.createdAt ?? ts,\n updatedAt: ts,\n };\n state.set(key, entry);\n }\n }\n\n /**\n * Dropping stale `worker_route` state without calling Cloudflare's zone route\n * delete API leaves orphaned public URL patterns on the script (common after\n * removing `tamerRoutes`).\n */\n for (const [k, e] of Object.entries(state.getAll())) {\n if (e.type !== \"worker_route\") continue;\n if (!workerKeys.has(e.workerKey)) continue;\n if (touchedKeys.has(k)) continue;\n try {\n await api.zoneWorkerRouteDelete(e.zoneId, e.routeId);\n console.log(\n `[sync] deleted stale Workers zone route ${e.pattern} → ${e.workerName} (${e.zoneName})`,\n );\n } catch (err) {\n const msg = err instanceof Error ? err.message : String(err);\n console.warn(`[sync] failed to delete stale zone route ${e.pattern}: ${msg}`);\n }\n state.delete(k);\n }\n}\n","import type { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport type { StateManager } from \"../../core/state/StateManager.js\";\nimport type { ResolvedWorkerConfig } from \"../../core/config/resolver.js\";\nimport { findZoneIdByName } from \"../../core/routes/zoneResolver.js\";\nimport { workerRouteStateKey } from \"./worker-route.stateKey.js\";\n\n/**\n * Remove Workers **zone routes** (`/zones/{id}/workers/routes`) that still point\n * at {@link ResolvedWorkerConfig.workerName} but are **not** in the resolved\n * desired set ({@link ResolvedWorkerConfig.apiManagedRoutes}), scoped to\n * {@link staleSweepZones}.\n *\n * Used on **`tamer deploy`** after removing `tamerRoutes` so orphaned patterns\n * are not left on the account. Wrangler **`routes`** / custom domains are a\n * separate surface — this only touches API-managed zone routes.\n *\n * When {@link staleSweepZones} is omitted or empty, this is a no-op (safe default).\n */\nexport async function pruneStaleApiManagedZoneRoutesForWorker(\n api: CFApiClient,\n state: StateManager,\n resolved: ResolvedWorkerConfig,\n staleSweepZones: string[] | undefined,\n): Promise<void> {\n if (!staleSweepZones?.length) return;\n\n const desired = new Set(\n resolved.apiManagedRoutes.map((r) => `${r.zone_name}\\0${r.pattern}`),\n );\n\n for (const zoneName of staleSweepZones) {\n const zoneId = await findZoneIdByName(api, zoneName);\n if (!zoneId) {\n console.warn(\n `[deploy] stale route prune: zone \"${zoneName}\" not found; skip`,\n );\n continue;\n }\n\n let list: Array<{ id: string; pattern: string; script: string }>;\n try {\n list = await api.zoneWorkerRoutesList(zoneId);\n } catch (err) {\n const msg = err instanceof Error ? err.message : String(err);\n console.warn(\n `[deploy] stale route prune: list failed for \"${zoneName}\": ${msg}`,\n );\n continue;\n }\n\n for (const r of list) {\n if (r.script !== resolved.workerName) continue;\n const sig = `${zoneName}\\0${r.pattern}`;\n if (desired.has(sig)) continue;\n\n try {\n await api.zoneWorkerRouteDelete(zoneId, r.id);\n console.log(\n `[deploy] pruned stale zone route ${r.pattern} → ${resolved.workerName} (${zoneName})`,\n );\n } catch (err) {\n const msg = err instanceof Error ? err.message : String(err);\n console.warn(\n `[deploy] stale route prune: failed to delete ${r.pattern}: ${msg}`,\n );\n }\n state.delete(workerRouteStateKey(zoneId, r.id));\n }\n }\n}\n","import type { CfiConfig } from \"../../types.js\";\nimport type { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport type { StateManager } from \"../../core/state/StateManager.js\";\nimport type { NamingEngine } from \"../../core/naming/NamingEngine.js\";\nimport { getWorkers } from \"../../core/config/loader.js\";\nimport {\n mergedWorkerConfigForEnv,\n resolveWorkerConfig,\n} from \"../../core/config/resolver.js\";\nimport { findZoneIdByName } from \"../../core/routes/zoneResolver.js\";\nimport { pruneStaleApiManagedZoneRoutesForWorker } from \"./worker-route.prune.js\";\nimport { workerRouteStateKey } from \"./worker-route.stateKey.js\";\nimport type { WorkerRouteStateEntry } from \"../../types.js\";\n\n/**\n * Ensure API-managed zone routes exist after the Worker script exists (call\n * after successful `wrangler deploy`).\n */\nexport async function workerRoutesApply(\n env: string,\n config: CfiConfig,\n baseDir: string,\n accountId: string,\n naming: NamingEngine,\n state: StateManager,\n api: CFApiClient,\n opts: {\n /**\n * Pre-fetched sibling stack outputs for `${tamer:import:…}` references\n * in `tamerRoutes[].host` / `.zone`. Caller (`deploy`) is expected to\n * load these once and reuse across worker iterations to avoid repeated\n * D1 hydrate calls.\n */\n imports?: Record<string, Record<string, string>>;\n } = {},\n): Promise<void> {\n if (env === \"local\") return;\n\n const workers = await getWorkers(config, baseDir);\n const ts = new Date().toISOString();\n\n for (const [workerKey, wc] of workers) {\n const declared = mergedWorkerConfigForEnv(wc, env, config.tenant);\n const staleSweepZones = declared.tamerStaleRouteSweepZones;\n const resolved = await resolveWorkerConfig(\n config,\n workerKey,\n wc,\n env,\n baseDir,\n accountId,\n naming,\n state,\n { imports: opts.imports },\n );\n await pruneStaleApiManagedZoneRoutesForWorker(\n api,\n state,\n resolved,\n staleSweepZones,\n );\n for (const route of resolved.apiManagedRoutes) {\n const zoneId = await findZoneIdByName(api, route.zone_name);\n if (!zoneId) {\n throw new Error(\n `worker routes: zone \"${route.zone_name}\" not found (check DNS / account access)`,\n );\n }\n const list = await api.zoneWorkerRoutesList(zoneId);\n const exists = list.find(\n (r) => r.pattern === route.pattern && r.script === resolved.workerName,\n );\n if (exists) {\n const key = workerRouteStateKey(zoneId, exists.id);\n const existing = state.get(key);\n const prev =\n existing?.type === \"worker_route\" ? existing : undefined;\n state.set(key, {\n type: \"worker_route\",\n workerKey,\n workerName: resolved.workerName,\n zoneId,\n zoneName: route.zone_name,\n routeId: exists.id,\n pattern: route.pattern,\n createdAt: prev?.createdAt ?? ts,\n updatedAt: ts,\n });\n continue;\n }\n\n const created = await api.zoneWorkerRouteCreate(zoneId, {\n pattern: route.pattern,\n script: resolved.workerName,\n });\n const key = workerRouteStateKey(zoneId, created.id);\n const entry: WorkerRouteStateEntry = {\n type: \"worker_route\",\n workerKey,\n workerName: resolved.workerName,\n zoneId,\n zoneName: route.zone_name,\n routeId: created.id,\n pattern: route.pattern,\n createdAt: ts,\n updatedAt: ts,\n };\n state.set(key, entry);\n }\n }\n}\n","import type { CfiConfig } from \"../../types.js\";\nimport type { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport type { StateManager } from \"../../core/state/StateManager.js\";\nimport { getWorkers } from \"../../core/config/loader.js\";\n\n/**\n * Delete API-managed zone routes for workers declared in this stack's config\n * (before deleting Workers so routes are not left orphaned).\n */\nexport async function workerRoutesDestroy(\n env: string,\n config: CfiConfig,\n baseDir: string,\n state: StateManager,\n api: CFApiClient,\n): Promise<void> {\n if (env === \"local\") return;\n\n const workers = await getWorkers(config, baseDir);\n const allowed = new Set(workers.map(([k]) => k));\n\n for (const [k, e] of Object.entries(state.getAll())) {\n if (e.type !== \"worker_route\") continue;\n if (!allowed.has(e.workerKey)) continue;\n try {\n await api.zoneWorkerRouteDelete(e.zoneId, e.routeId);\n console.log(\n `Deleted zone route ${e.pattern} (${e.routeId}) → ${e.workerName}`,\n );\n } catch (err) {\n console.warn(\n `Failed to delete zone route ${e.pattern}:`,\n err instanceof Error ? err.message : err,\n );\n }\n state.delete(k);\n }\n}\n","import type { CfiConfig } from \"../../types.js\";\nimport type { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport type { StateManager } from \"../../core/state/StateManager.js\";\nimport type { NamingEngine } from \"../../core/naming/NamingEngine.js\";\nimport type { ResourceDrift } from \"../../core/drift/drift.types.js\";\nimport { getWorkers } from \"../../core/config/loader.js\";\nimport { resolveWorkerConfig } from \"../../core/config/resolver.js\";\nimport { findZoneIdByName } from \"../../core/routes/zoneResolver.js\";\nimport type { WorkerRouteStateEntry } from \"../../types.js\";\n\nfunction stateRouteForWorkerPattern(\n state: StateManager,\n workerKey: string,\n pattern: string,\n): WorkerRouteStateEntry | undefined {\n for (const e of Object.values(state.getAll())) {\n if (\n e.type === \"worker_route\" &&\n e.workerKey === workerKey &&\n e.pattern === pattern\n ) {\n return e;\n }\n }\n return undefined;\n}\n\nexport async function workerRoutesDrift(\n env: string,\n config: CfiConfig,\n baseDir: string,\n accountId: string,\n naming: NamingEngine,\n state: StateManager,\n api: CFApiClient,\n opts: {\n /** Pre-fetched sibling stack outputs; tolerant lookup. */\n imports?: Record<string, Record<string, string>>;\n } = {},\n): Promise<ResourceDrift | null> {\n if (env === \"local\") return null;\n\n const workers = await getWorkers(config, baseDir);\n const drift: ResourceDrift = {\n kind: \"worker_route\",\n missingFromCloudflare: [],\n unrecordedInState: [],\n undeployed: [],\n };\n let sawAnyApiRoute = false;\n\n for (const [workerKey, wc] of workers) {\n const resolved = await resolveWorkerConfig(\n config,\n workerKey,\n wc,\n env,\n baseDir,\n accountId,\n naming,\n state,\n { referencesMode: \"tolerant\", imports: opts.imports },\n );\n for (const route of resolved.apiManagedRoutes) {\n sawAnyApiRoute = true;\n const zoneId = await findZoneIdByName(api, route.zone_name);\n if (!zoneId) {\n drift.undeployed.push({\n logicalName: workerKey,\n derivedName: route.pattern,\n detail: `zone \"${route.zone_name}\" not found`,\n });\n continue;\n }\n let list: Array<{ id: string; pattern: string; script: string }>;\n try {\n list = await api.zoneWorkerRoutesList(zoneId);\n } catch {\n continue;\n }\n const hit = list.find(\n (r) => r.pattern === route.pattern && r.script === resolved.workerName,\n );\n const st = stateRouteForWorkerPattern(state, workerKey, route.pattern);\n if (hit) {\n if (!st || st.routeId !== hit.id) {\n drift.unrecordedInState.push({\n logicalName: workerKey,\n derivedName: route.pattern,\n cfId: hit.id,\n });\n }\n } else if (st) {\n drift.missingFromCloudflare.push({\n logicalName: workerKey,\n derivedName: route.pattern,\n cfId: st.routeId,\n });\n } else {\n drift.undeployed.push({\n logicalName: workerKey,\n derivedName: route.pattern,\n });\n }\n }\n }\n\n return sawAnyApiRoute ? drift : null;\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worker-route-RexL6xCk.mjs","names":["list: Array<{ id: string; pattern: string; script: string }>","entry: WorkerRouteStateEntry","list: Array<{ id: string; pattern: string; script: string }>","key","entry: WorkerRouteStateEntry","drift: ResourceDrift","list: Array<{ id: string; pattern: string; script: string }>"],"sources":["../src/features/worker-route/worker-route.sync.ts","../src/features/worker-route/worker-route.prune.ts","../src/features/worker-route/worker-route.apply.ts","../src/features/worker-route/worker-route.destroy.ts","../src/features/worker-route/worker-route.drift.ts"],"sourcesContent":["import type { CfiConfig } from \"../../types.js\";\nimport type { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport type { StateManager } from \"../../core/state/StateManager.js\";\nimport type { NamingEngine } from \"../../core/naming/NamingEngine.js\";\nimport { getWorkers } from \"../../core/config/loader.js\";\nimport { resolveWorkerConfig } from \"../../core/config/resolver.js\";\nimport { findZoneIdByName } from \"../../core/routes/zoneResolver.js\";\nimport { workerRouteStateKey } from \"./worker-route.stateKey.js\";\nimport type { WorkerRouteStateEntry } from \"../../types.js\";\n\n/**\n * Merge Workers zone routes for `tamerRoutes` (API-managed) into state from\n * Cloudflare listings. Drops stale `worker_route` rows for workers in this\n * config when the route no longer exists on CF.\n */\nexport async function workerRouteSync(\n env: string,\n config: CfiConfig,\n baseDir: string,\n accountId: string,\n naming: NamingEngine,\n state: StateManager,\n api: CFApiClient,\n opts: {\n /**\n * Pre-fetched sibling stack outputs so cross-stack route hosts/zones\n * resolve to real patterns (else they stay as placeholders and never\n * match anything CF returned). Optional — sync is tolerant mode.\n */\n imports?: Record<string, Record<string, string>>;\n } = {},\n): Promise<void> {\n if (env === \"local\") return;\n\n const workers = await getWorkers(config, baseDir);\n const workerKeys = new Set(workers.map(([k]) => k));\n const touchedKeys = new Set<string>();\n const ts = new Date().toISOString();\n\n for (const [workerKey, wc] of workers) {\n const resolved = await resolveWorkerConfig(\n config,\n workerKey,\n wc,\n env,\n baseDir,\n accountId,\n naming,\n state,\n { referencesMode: \"tolerant\", imports: opts.imports },\n );\n for (const route of resolved.apiManagedRoutes) {\n const zoneId = await findZoneIdByName(api, route.zone_name);\n if (!zoneId) {\n console.warn(\n `[sync] worker routes: zone \"${route.zone_name}\" not found; skip ${route.pattern}`,\n );\n continue;\n }\n let list: Array<{ id: string; pattern: string; script: string }>;\n try {\n list = await api.zoneWorkerRoutesList(zoneId);\n } catch (err) {\n const msg = err instanceof Error ? err.message : String(err);\n console.warn(\n `[sync] worker routes: list failed for zone ${route.zone_name}: ${msg}`,\n );\n continue;\n }\n const hit = list.find(\n (r) => r.pattern === route.pattern && r.script === resolved.workerName,\n );\n if (!hit) continue;\n\n const key = workerRouteStateKey(zoneId, hit.id);\n touchedKeys.add(key);\n const existing = state.get(key);\n const prev =\n existing?.type === \"worker_route\" ? existing : undefined;\n const entry: WorkerRouteStateEntry = {\n type: \"worker_route\",\n workerKey,\n workerName: resolved.workerName,\n zoneId,\n zoneName: route.zone_name,\n routeId: hit.id,\n pattern: route.pattern,\n createdAt: prev?.createdAt ?? ts,\n updatedAt: ts,\n };\n state.set(key, entry);\n }\n }\n\n /**\n * Dropping stale `worker_route` state without calling Cloudflare's zone route\n * delete API leaves orphaned public URL patterns on the script (common after\n * removing `tamerRoutes`).\n */\n for (const [k, e] of Object.entries(state.getAll())) {\n if (e.type !== \"worker_route\") continue;\n if (!workerKeys.has(e.workerKey)) continue;\n if (touchedKeys.has(k)) continue;\n try {\n await api.zoneWorkerRouteDelete(e.zoneId, e.routeId);\n console.log(\n `[sync] deleted stale Workers zone route ${e.pattern} → ${e.workerName} (${e.zoneName})`,\n );\n } catch (err) {\n const msg = err instanceof Error ? err.message : String(err);\n console.warn(`[sync] failed to delete stale zone route ${e.pattern}: ${msg}`);\n }\n state.delete(k);\n }\n}\n","import type { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport type { StateManager } from \"../../core/state/StateManager.js\";\nimport type { ResolvedWorkerConfig } from \"../../core/config/resolver.js\";\nimport { findZoneIdByName } from \"../../core/routes/zoneResolver.js\";\nimport { workerRouteStateKey } from \"./worker-route.stateKey.js\";\n\n/**\n * Remove Workers **zone routes** (`/zones/{id}/workers/routes`) that still point\n * at {@link ResolvedWorkerConfig.workerName} but are **not** in the resolved\n * desired set ({@link ResolvedWorkerConfig.apiManagedRoutes}), scoped to\n * {@link staleSweepZones}.\n *\n * Used on **`tamer deploy`** after removing `tamerRoutes` so orphaned patterns\n * are not left on the account. Wrangler **`routes`** / custom domains are a\n * separate surface — this only touches API-managed zone routes.\n *\n * When {@link staleSweepZones} is omitted or empty, this is a no-op (safe default).\n */\nexport async function pruneStaleApiManagedZoneRoutesForWorker(\n api: CFApiClient,\n state: StateManager,\n resolved: ResolvedWorkerConfig,\n staleSweepZones: string[] | undefined,\n): Promise<void> {\n if (!staleSweepZones?.length) return;\n\n const desired = new Set(\n resolved.apiManagedRoutes.map((r) => `${r.zone_name}\\0${r.pattern}`),\n );\n\n for (const zoneName of staleSweepZones) {\n const zoneId = await findZoneIdByName(api, zoneName);\n if (!zoneId) {\n console.warn(\n `[deploy] stale route prune: zone \"${zoneName}\" not found; skip`,\n );\n continue;\n }\n\n let list: Array<{ id: string; pattern: string; script: string }>;\n try {\n list = await api.zoneWorkerRoutesList(zoneId);\n } catch (err) {\n const msg = err instanceof Error ? err.message : String(err);\n console.warn(\n `[deploy] stale route prune: list failed for \"${zoneName}\": ${msg}`,\n );\n continue;\n }\n\n for (const r of list) {\n if (r.script !== resolved.workerName) continue;\n const sig = `${zoneName}\\0${r.pattern}`;\n if (desired.has(sig)) continue;\n\n try {\n await api.zoneWorkerRouteDelete(zoneId, r.id);\n console.log(\n `[deploy] pruned stale zone route ${r.pattern} → ${resolved.workerName} (${zoneName})`,\n );\n } catch (err) {\n const msg = err instanceof Error ? err.message : String(err);\n console.warn(\n `[deploy] stale route prune: failed to delete ${r.pattern}: ${msg}`,\n );\n }\n state.delete(workerRouteStateKey(zoneId, r.id));\n }\n }\n}\n","import type { CfiConfig } from \"../../types.js\";\nimport type { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport type { StateManager } from \"../../core/state/StateManager.js\";\nimport type { NamingEngine } from \"../../core/naming/NamingEngine.js\";\nimport { getWorkers } from \"../../core/config/loader.js\";\nimport {\n mergedWorkerConfigForEnv,\n resolveWorkerConfig,\n} from \"../../core/config/resolver.js\";\nimport { findZoneIdByName } from \"../../core/routes/zoneResolver.js\";\nimport { pruneStaleApiManagedZoneRoutesForWorker } from \"./worker-route.prune.js\";\nimport { workerRouteStateKey } from \"./worker-route.stateKey.js\";\nimport type { WorkerRouteStateEntry } from \"../../types.js\";\n\n/**\n * Ensure API-managed zone routes exist after the Worker script exists (call\n * after successful `wrangler deploy`).\n */\nexport async function workerRoutesApply(\n env: string,\n config: CfiConfig,\n baseDir: string,\n accountId: string,\n naming: NamingEngine,\n state: StateManager,\n api: CFApiClient,\n opts: {\n /**\n * Pre-fetched sibling stack outputs for `${tamer:import:…}` references\n * in `tamerRoutes[].host` / `.zone`. Caller (`deploy`) is expected to\n * load these once and reuse across worker iterations to avoid repeated\n * D1 hydrate calls.\n */\n imports?: Record<string, Record<string, string>>;\n } = {},\n): Promise<void> {\n if (env === \"local\") return;\n\n const workers = await getWorkers(config, baseDir);\n const ts = new Date().toISOString();\n\n for (const [workerKey, wc] of workers) {\n const declared = mergedWorkerConfigForEnv(wc, env, config.tenant);\n const staleSweepZones = declared.tamerStaleRouteSweepZones;\n const resolved = await resolveWorkerConfig(\n config,\n workerKey,\n wc,\n env,\n baseDir,\n accountId,\n naming,\n state,\n { imports: opts.imports },\n );\n await pruneStaleApiManagedZoneRoutesForWorker(\n api,\n state,\n resolved,\n staleSweepZones,\n );\n for (const route of resolved.apiManagedRoutes) {\n const zoneId = await findZoneIdByName(api, route.zone_name);\n if (!zoneId) {\n throw new Error(\n `worker routes: zone \"${route.zone_name}\" not found (check DNS / account access)`,\n );\n }\n const list = await api.zoneWorkerRoutesList(zoneId);\n const exists = list.find(\n (r) => r.pattern === route.pattern && r.script === resolved.workerName,\n );\n if (exists) {\n const key = workerRouteStateKey(zoneId, exists.id);\n const existing = state.get(key);\n const prev =\n existing?.type === \"worker_route\" ? existing : undefined;\n state.set(key, {\n type: \"worker_route\",\n workerKey,\n workerName: resolved.workerName,\n zoneId,\n zoneName: route.zone_name,\n routeId: exists.id,\n pattern: route.pattern,\n createdAt: prev?.createdAt ?? ts,\n updatedAt: ts,\n });\n continue;\n }\n\n const created = await api.zoneWorkerRouteCreate(zoneId, {\n pattern: route.pattern,\n script: resolved.workerName,\n });\n const key = workerRouteStateKey(zoneId, created.id);\n const entry: WorkerRouteStateEntry = {\n type: \"worker_route\",\n workerKey,\n workerName: resolved.workerName,\n zoneId,\n zoneName: route.zone_name,\n routeId: created.id,\n pattern: route.pattern,\n createdAt: ts,\n updatedAt: ts,\n };\n state.set(key, entry);\n }\n }\n}\n","import type { CfiConfig } from \"../../types.js\";\nimport type { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport type { StateManager } from \"../../core/state/StateManager.js\";\nimport { getWorkers } from \"../../core/config/loader.js\";\n\n/**\n * Delete API-managed zone routes for workers declared in this stack's config\n * (before deleting Workers so routes are not left orphaned).\n */\nexport async function workerRoutesDestroy(\n env: string,\n config: CfiConfig,\n baseDir: string,\n state: StateManager,\n api: CFApiClient,\n): Promise<void> {\n if (env === \"local\") return;\n\n const workers = await getWorkers(config, baseDir);\n const allowed = new Set(workers.map(([k]) => k));\n\n for (const [k, e] of Object.entries(state.getAll())) {\n if (e.type !== \"worker_route\") continue;\n if (!allowed.has(e.workerKey)) continue;\n try {\n await api.zoneWorkerRouteDelete(e.zoneId, e.routeId);\n console.log(\n `Deleted zone route ${e.pattern} (${e.routeId}) → ${e.workerName}`,\n );\n } catch (err) {\n console.warn(\n `Failed to delete zone route ${e.pattern}:`,\n err instanceof Error ? err.message : err,\n );\n }\n state.delete(k);\n }\n}\n","import type { CfiConfig } from \"../../types.js\";\nimport type { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport type { StateManager } from \"../../core/state/StateManager.js\";\nimport type { NamingEngine } from \"../../core/naming/NamingEngine.js\";\nimport type { ResourceDrift } from \"../../core/drift/drift.types.js\";\nimport { getWorkers } from \"../../core/config/loader.js\";\nimport { resolveWorkerConfig } from \"../../core/config/resolver.js\";\nimport { findZoneIdByName } from \"../../core/routes/zoneResolver.js\";\nimport type { WorkerRouteStateEntry } from \"../../types.js\";\n\nfunction stateRouteForWorkerPattern(\n state: StateManager,\n workerKey: string,\n pattern: string,\n): WorkerRouteStateEntry | undefined {\n for (const e of Object.values(state.getAll())) {\n if (\n e.type === \"worker_route\" &&\n e.workerKey === workerKey &&\n e.pattern === pattern\n ) {\n return e;\n }\n }\n return undefined;\n}\n\nexport async function workerRoutesDrift(\n env: string,\n config: CfiConfig,\n baseDir: string,\n accountId: string,\n naming: NamingEngine,\n state: StateManager,\n api: CFApiClient,\n opts: {\n /** Pre-fetched sibling stack outputs; tolerant lookup. */\n imports?: Record<string, Record<string, string>>;\n } = {},\n): Promise<ResourceDrift | null> {\n if (env === \"local\") return null;\n\n const workers = await getWorkers(config, baseDir);\n const drift: ResourceDrift = {\n kind: \"worker_route\",\n missingFromCloudflare: [],\n unrecordedInState: [],\n undeployed: [],\n };\n let sawAnyApiRoute = false;\n\n for (const [workerKey, wc] of workers) {\n const resolved = await resolveWorkerConfig(\n config,\n workerKey,\n wc,\n env,\n baseDir,\n accountId,\n naming,\n state,\n { referencesMode: \"tolerant\", imports: opts.imports },\n );\n for (const route of resolved.apiManagedRoutes) {\n sawAnyApiRoute = true;\n const zoneId = await findZoneIdByName(api, route.zone_name);\n if (!zoneId) {\n drift.undeployed.push({\n logicalName: workerKey,\n derivedName: route.pattern,\n detail: `zone \"${route.zone_name}\" not found`,\n });\n continue;\n }\n let list: Array<{ id: string; pattern: string; script: string }>;\n try {\n list = await api.zoneWorkerRoutesList(zoneId);\n } catch {\n continue;\n }\n const hit = list.find(\n (r) => r.pattern === route.pattern && r.script === resolved.workerName,\n );\n const st = stateRouteForWorkerPattern(state, workerKey, route.pattern);\n if (hit) {\n if (!st || st.routeId !== hit.id) {\n drift.unrecordedInState.push({\n logicalName: workerKey,\n derivedName: route.pattern,\n cfId: hit.id,\n });\n }\n } else if (st) {\n drift.missingFromCloudflare.push({\n logicalName: workerKey,\n derivedName: route.pattern,\n cfId: st.routeId,\n });\n } else {\n drift.undeployed.push({\n logicalName: workerKey,\n derivedName: route.pattern,\n });\n }\n }\n }\n\n return sawAnyApiRoute ? drift : null;\n}\n"],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { O as resolveWorkerConfig, u as namingFromConfig, z as getWorkers } from "./tamer.mjs";
|
|
2
2
|
import { n as spawnWranglerSync } from "./wranglerSpawn-CqVNGkA9.mjs";
|
|
3
3
|
|
|
4
4
|
//#region src/features/workers/workers.destroy.ts
|
|
@@ -83,4 +83,4 @@ async function workersDrift(env, config, baseDir, accountId, naming, state, api,
|
|
|
83
83
|
|
|
84
84
|
//#endregion
|
|
85
85
|
export { workersDestroy as n, workersDrift as t };
|
|
86
|
-
//# sourceMappingURL=workers-
|
|
86
|
+
//# sourceMappingURL=workers-CS0tlbdk.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workers-
|
|
1
|
+
{"version":3,"file":"workers-CS0tlbdk.mjs","names":["resolved: Awaited<ReturnType<typeof resolveWorkerConfig>>[]","drift: ResourceDrift","exists: boolean"],"sources":["../src/features/workers/workers.destroy.ts","../src/features/workers/workers.drift.ts"],"sourcesContent":["import type { CfiConfig } from \"../../types.js\";\nimport type { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport type { StateManager } from \"../../core/state/StateManager.js\";\nimport { getWorkers } from \"../../core/config/loader.js\";\nimport { namingFromConfig } from \"../../core/config/namingFromConfig.js\";\nimport { resolveWorkerConfig } from \"../../core/config/resolver.js\";\nimport { spawnWranglerSync } from \"../../core/wrangler/wranglerSpawn.js\";\n\n/**\n * Remove deployed Workers: dispatch-namespace scripts via CF API, then global scripts via `wrangler delete`.\n * Call before deleting D1/R2/KV/dispatch namespaces so bindings and namespace script counts are cleared.\n */\nexport async function workersDestroy(\n env: string,\n baseDir: string,\n accountId: string,\n config: CfiConfig,\n state: StateManager,\n api: CFApiClient,\n _force?: boolean,\n): Promise<void> {\n const naming = namingFromConfig(config);\n const workers = await getWorkers(config, baseDir);\n const resolved: Awaited<ReturnType<typeof resolveWorkerConfig>>[] = [];\n\n for (const [workerKey, workerConfig] of workers) {\n // Tolerant resolution: destroy only consumes `workerName` and\n // `dispatchNamespace` — both derived from naming, not references —\n // so unresolved `${tamer:import:…}` placeholders in `vars` /\n // `tamerRoutes` must not crash teardown of a stack whose siblings\n // have already been destroyed.\n resolved.push(\n await resolveWorkerConfig(\n config,\n workerKey,\n workerConfig,\n env,\n baseDir,\n accountId,\n naming,\n state,\n { referencesMode: \"tolerant\" },\n ),\n );\n }\n\n const inNamespace = resolved.filter((r) => r.dispatchNamespace);\n const globalWorkers = resolved.filter((r) => !r.dispatchNamespace);\n\n for (const r of inNamespace) {\n const ns = r.dispatchNamespace!;\n try {\n await api.dispatchNamespaceScriptDelete(ns, r.workerName, {\n force: true,\n });\n console.log(`Deleted Worker \"${r.workerName}\" from dispatch namespace \"${ns}\"`);\n } catch (err) {\n console.warn(\n `Failed to delete dispatch Worker \"${r.workerName}\" in \"${ns}\":`,\n err instanceof Error ? err.message : err,\n );\n }\n }\n\n for (const r of globalWorkers) {\n // Do not pass `--config` here: per-worker `wrangler.*.json` files are often\n // absent (gitignored / only emitted by apply/deploy). `wrangler delete` only\n // needs the script name plus account credentials from the environment.\n // Using `cwd: baseDir` keeps `.env` loading consistent with other commands\n // (stack root). Passing `--config` with a missing file also breaks on\n // Windows (malformed path: cwd + absolute config).\n const args = [\"wrangler\", \"delete\", r.workerName, \"--force\"];\n const result = spawnWranglerSync(args, {\n cwd: baseDir,\n stdio: \"inherit\",\n shell: false,\n });\n if (result.status !== 0) {\n console.warn(\n `wrangler delete failed for \"${r.workerName}\" (cwd: ${baseDir}); script may not exist.`,\n );\n } else {\n console.log(`Deleted Worker \"${r.workerName}\"`);\n }\n }\n}\n","import type { CfiConfig } from \"../../types.js\";\nimport type { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport type { StateManager } from \"../../core/state/StateManager.js\";\nimport type { NamingEngine } from \"../../core/naming/NamingEngine.js\";\nimport type { ResourceDrift } from \"../../core/drift/drift.types.js\";\nimport { getWorkers } from \"../../core/config/loader.js\";\nimport { resolveWorkerConfig } from \"../../core/config/resolver.js\";\n\n/**\n * Drift for declared **global** Worker scripts (not dispatch-namespace\n * tenant scripts — those are owned by `provision-tenant` / WFP).\n *\n * Tamer does not store deployed worker script ids in state today, so this\n * report only emits `undeployed` (declared but missing on Cloudflare). It\n * never claims `unrecordedInState` for scripts because the state model has\n * no `worker_script` entry to be missing.\n *\n * Returns `null` for `local` env or when there are no global workers (so\n * `computeDriftReport` can skip emitting the section entirely).\n */\nexport async function workersDrift(\n env: string,\n config: CfiConfig,\n baseDir: string,\n accountId: string,\n naming: NamingEngine,\n state: StateManager,\n api: CFApiClient,\n opts: {\n /** Pre-fetched sibling stack outputs; tolerant lookup. */\n imports?: Record<string, Record<string, string>>;\n } = {},\n): Promise<ResourceDrift | null> {\n if (env === \"local\") return null;\n\n const workers = await getWorkers(config, baseDir);\n if (workers.length === 0) return null;\n\n const drift: ResourceDrift = {\n kind: \"worker_script\",\n missingFromCloudflare: [],\n unrecordedInState: [],\n undeployed: [],\n };\n\n let sawGlobalWorker = false;\n for (const [workerKey, wc] of workers) {\n const resolved = await resolveWorkerConfig(\n config,\n workerKey,\n wc,\n env,\n baseDir,\n accountId,\n naming,\n state,\n { referencesMode: \"tolerant\", imports: opts.imports },\n );\n if (resolved.dispatchNamespace) continue;\n sawGlobalWorker = true;\n\n let exists: boolean;\n try {\n const script = await api.workersScriptGet(resolved.workerName);\n exists = !!script;\n } catch {\n continue;\n }\n if (!exists) {\n drift.undeployed.push({\n logicalName: workerKey,\n derivedName: resolved.workerName,\n });\n }\n }\n\n return sawGlobalWorker ? drift : null;\n}\n"],"mappings":";;;;;;;;AAYA,eAAsB,eACpB,KACA,SACA,WACA,QACA,OACA,KACA,QACe;CACf,MAAM,SAAS,iBAAiB,OAAO;CACvC,MAAM,UAAU,MAAM,WAAW,QAAQ,QAAQ;CACjD,MAAMA,WAA8D,EAAE;AAEtE,MAAK,MAAM,CAAC,WAAW,iBAAiB,QAMtC,UAAS,KACP,MAAM,oBACJ,QACA,WACA,cACA,KACA,SACA,WACA,QACA,OACA,EAAE,gBAAgB,YAAY,CAC/B,CACF;CAGH,MAAM,cAAc,SAAS,QAAQ,MAAM,EAAE,kBAAkB;CAC/D,MAAM,gBAAgB,SAAS,QAAQ,MAAM,CAAC,EAAE,kBAAkB;AAElE,MAAK,MAAM,KAAK,aAAa;EAC3B,MAAM,KAAK,EAAE;AACb,MAAI;AACF,SAAM,IAAI,8BAA8B,IAAI,EAAE,YAAY,EACxD,OAAO,MACR,CAAC;AACF,WAAQ,IAAI,mBAAmB,EAAE,WAAW,6BAA6B,GAAG,GAAG;WACxE,KAAK;AACZ,WAAQ,KACN,qCAAqC,EAAE,WAAW,QAAQ,GAAG,KAC7D,eAAe,QAAQ,IAAI,UAAU,IACtC;;;AAIL,MAAK,MAAM,KAAK,cAad,KALe,kBADF;EAAC;EAAY;EAAU,EAAE;EAAY;EAAU,EACrB;EACrC,KAAK;EACL,OAAO;EACP,OAAO;EACR,CAAC,CACS,WAAW,EACpB,SAAQ,KACN,+BAA+B,EAAE,WAAW,UAAU,QAAQ,0BAC/D;KAED,SAAQ,IAAI,mBAAmB,EAAE,WAAW,GAAG;;;;;;;;;;;;;;;;;AC9DrD,eAAsB,aACpB,KACA,QACA,SACA,WACA,QACA,OACA,KACA,OAGI,EAAE,EACyB;AAC/B,KAAI,QAAQ,QAAS,QAAO;CAE5B,MAAM,UAAU,MAAM,WAAW,QAAQ,QAAQ;AACjD,KAAI,QAAQ,WAAW,EAAG,QAAO;CAEjC,MAAMC,QAAuB;EAC3B,MAAM;EACN,uBAAuB,EAAE;EACzB,mBAAmB,EAAE;EACrB,YAAY,EAAE;EACf;CAED,IAAI,kBAAkB;AACtB,MAAK,MAAM,CAAC,WAAW,OAAO,SAAS;EACrC,MAAM,WAAW,MAAM,oBACrB,QACA,WACA,IACA,KACA,SACA,WACA,QACA,OACA;GAAE,gBAAgB;GAAY,SAAS,KAAK;GAAS,CACtD;AACD,MAAI,SAAS,kBAAmB;AAChC,oBAAkB;EAElB,IAAIC;AACJ,MAAI;AAEF,YAAS,CAAC,CADK,MAAM,IAAI,iBAAiB,SAAS,WAAW;UAExD;AACN;;AAEF,MAAI,CAAC,OACH,OAAM,WAAW,KAAK;GACpB,aAAa;GACb,aAAa,SAAS;GACvB,CAAC;;AAIN,QAAO,kBAAkB,QAAQ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dragonmastery/tamer",
|
|
3
|
-
"version": "0.35.
|
|
3
|
+
"version": "0.35.2",
|
|
4
4
|
"description": "Tamer: Cloudflare Workers infra CLI (sync, apply, deploy, migrate, destroy) and Wrangler-oriented TypeScript types.",
|
|
5
5
|
"author": "DragonMastery",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE",
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
import { C as tamerStateDatabaseName, H as loadConfig, I as ensureTamerSecretsDatabase, L as tamerSecretsDatabaseName, R as CFApiClient, S as ensureTamerStateDatabase, h as StateManager, w as stackNameForConfig, z as cloudflareAccountIdFromEnv } from "./tamer.mjs";
|
|
2
|
-
import "./r2S3EmptyBucket-B9_pHfvB.mjs";
|
|
3
|
-
import { n as ensureTamerArtifactsBucket } from "./tamerArtifactsR2-7qUbhOLD.mjs";
|
|
4
|
-
|
|
5
|
-
//#region src/cli/commands/bootstrap.ts
|
|
6
|
-
async function runBootstrap(options) {
|
|
7
|
-
const { env, configPath } = options;
|
|
8
|
-
if (env === "local") {
|
|
9
|
-
console.log("bootstrap: env=local uses in-memory state only; no D1/R2 metadata is created.");
|
|
10
|
-
return;
|
|
11
|
-
}
|
|
12
|
-
const config = await loadConfig(configPath, { env });
|
|
13
|
-
const accountId = config.account_id ?? cloudflareAccountIdFromEnv();
|
|
14
|
-
if (!accountId) throw new Error("account_id required in config or CLOUDFLARE_ACCOUNT_ID env var");
|
|
15
|
-
const api = new CFApiClient(accountId);
|
|
16
|
-
const stackName = stackNameForConfig(config);
|
|
17
|
-
const uuid = await ensureTamerStateDatabase(api, config.tenant.id, env, stackName);
|
|
18
|
-
console.log(`Tamer state ready: D1 uuid=${uuid} name=${tamerStateDatabaseName()} (env=${env}, stack=${stackName})`);
|
|
19
|
-
const bucketName = await ensureTamerArtifactsBucket(api);
|
|
20
|
-
console.log(`Tamer artifacts ready: R2 bucket=${bucketName}`);
|
|
21
|
-
const secretsUuid = await ensureTamerSecretsDatabase(api);
|
|
22
|
-
console.log(`Tamer secrets vault ready: D1 uuid=${secretsUuid} name=${tamerSecretsDatabaseName()}`);
|
|
23
|
-
const state = new StateManager(config.tenant.id, env, stackName);
|
|
24
|
-
await state.hydrate(api);
|
|
25
|
-
state.beginOperation("bootstrap");
|
|
26
|
-
if (!state.getStackMeta()?.name) state.setStackMeta({ name: stackName });
|
|
27
|
-
state.finishOperation("ready");
|
|
28
|
-
await state.persist(api);
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
//#endregion
|
|
32
|
-
export { runBootstrap };
|
|
33
|
-
//# sourceMappingURL=bootstrap-C7CZYHzb.mjs.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap-C7CZYHzb.mjs","names":[],"sources":["../src/cli/commands/bootstrap.ts"],"sourcesContent":["import { loadConfig } from \"../../core/config/loader.js\";\nimport { cloudflareAccountIdFromEnv } from \"../../core/cloudflareEnv.js\";\nimport { CFApiClient } from \"../../core/api/CFApiClient.js\";\nimport {\n ensureTamerStateDatabase,\n tamerStateDatabaseName,\n} from \"../../core/state/tamerStateDb.js\";\nimport {\n ensureTamerArtifactsBucket,\n} from \"../../core/state/tamerArtifactsR2.js\";\nimport {\n ensureTamerSecretsDatabase,\n tamerSecretsDatabaseName,\n} from \"../../core/secrets/secretsDb.js\";\nimport { StateManager } from \"../../core/state/StateManager.js\";\nimport { stackNameForConfig } from \"../../core/state/stackName.js\";\n\nexport async function runBootstrap(options: {\n env: string;\n configPath?: string;\n}): Promise<void> {\n const { env, configPath } = options;\n if (env === \"local\") {\n console.log(\n \"bootstrap: env=local uses in-memory state only; no D1/R2 metadata is created.\",\n );\n return;\n }\n\n const config = await loadConfig(configPath, { env });\n const accountId =\n config.account_id ?? cloudflareAccountIdFromEnv();\n if (!accountId) {\n throw new Error(\n \"account_id required in config or CLOUDFLARE_ACCOUNT_ID env var\",\n );\n }\n\n const api = new CFApiClient(accountId);\n const stackName = stackNameForConfig(config);\n const uuid = await ensureTamerStateDatabase(\n api,\n config.tenant.id,\n env,\n stackName,\n );\n console.log(\n `Tamer state ready: D1 uuid=${uuid} name=${tamerStateDatabaseName()} (env=${env}, stack=${stackName})`,\n );\n\n const bucketName = await ensureTamerArtifactsBucket(api);\n console.log(`Tamer artifacts ready: R2 bucket=${bucketName}`);\n\n const secretsUuid = await ensureTamerSecretsDatabase(api);\n console.log(\n `Tamer secrets vault ready: D1 uuid=${secretsUuid} name=${tamerSecretsDatabaseName()}`,\n );\n\n const state = new StateManager(config.tenant.id, env, stackName);\n await state.hydrate(api);\n state.beginOperation(\"bootstrap\");\n if (!state.getStackMeta()?.name) {\n state.setStackMeta({ name: stackName });\n }\n state.finishOperation(\"ready\");\n await state.persist(api);\n}\n"],"mappings":";;;;;AAiBA,eAAsB,aAAa,SAGjB;CAChB,MAAM,EAAE,KAAK,eAAe;AAC5B,KAAI,QAAQ,SAAS;AACnB,UAAQ,IACN,gFACD;AACD;;CAGF,MAAM,SAAS,MAAM,WAAW,YAAY,EAAE,KAAK,CAAC;CACpD,MAAM,YACJ,OAAO,cAAc,4BAA4B;AACnD,KAAI,CAAC,UACH,OAAM,IAAI,MACR,iEACD;CAGH,MAAM,MAAM,IAAI,YAAY,UAAU;CACtC,MAAM,YAAY,mBAAmB,OAAO;CAC5C,MAAM,OAAO,MAAM,yBACjB,KACA,OAAO,OAAO,IACd,KACA,UACD;AACD,SAAQ,IACN,8BAA8B,KAAK,QAAQ,wBAAwB,CAAC,QAAQ,IAAI,UAAU,UAAU,GACrG;CAED,MAAM,aAAa,MAAM,2BAA2B,IAAI;AACxD,SAAQ,IAAI,oCAAoC,aAAa;CAE7D,MAAM,cAAc,MAAM,2BAA2B,IAAI;AACzD,SAAQ,IACN,sCAAsC,YAAY,QAAQ,0BAA0B,GACrF;CAED,MAAM,QAAQ,IAAI,aAAa,OAAO,OAAO,IAAI,KAAK,UAAU;AAChE,OAAM,MAAM,QAAQ,IAAI;AACxB,OAAM,eAAe,YAAY;AACjC,KAAI,CAAC,MAAM,cAAc,EAAE,KACzB,OAAM,aAAa,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAM,gBAAgB,QAAQ;AAC9B,OAAM,MAAM,QAAQ,IAAI"}
|