@hintergrund/worker 0.1.12 → 0.2.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.
Files changed (52) hide show
  1. package/dist/api/cms/handlers/admin-users.handler.d.ts +0 -1
  2. package/dist/api/cms/handlers/admin-users.handler.d.ts.map +1 -1
  3. package/dist/api/cms/handlers/admin-users.handler.js +2 -27
  4. package/dist/api/cms/handlers/auth.handler.d.ts +0 -4
  5. package/dist/api/cms/handlers/auth.handler.d.ts.map +1 -1
  6. package/dist/api/cms/handlers/auth.handler.js +58 -108
  7. package/dist/api/cms/handlers/github-secrets.handler.d.ts.map +1 -1
  8. package/dist/api/cms/handlers/github-secrets.handler.js +33 -7
  9. package/dist/api/cms/handlers/setup.handler.d.ts +2 -0
  10. package/dist/api/cms/handlers/setup.handler.d.ts.map +1 -1
  11. package/dist/api/cms/handlers/setup.handler.js +109 -16
  12. package/dist/api/cms/handlers/website-repo.handler.d.ts.map +1 -1
  13. package/dist/api/cms/handlers/website-repo.handler.js +11 -4
  14. package/dist/api/cms/handlers/website-templates.handler.d.ts +6 -0
  15. package/dist/api/cms/handlers/website-templates.handler.d.ts.map +1 -0
  16. package/dist/api/cms/handlers/website-templates.handler.js +53 -0
  17. package/dist/api/cms/routes/auth.routes.d.ts.map +1 -1
  18. package/dist/api/cms/routes/auth.routes.js +1 -2
  19. package/dist/api/cms/routes/index.d.ts.map +1 -1
  20. package/dist/api/cms/routes/index.js +7 -3
  21. package/dist/hintergrund-assets.d.ts +4 -4
  22. package/dist/hintergrund-assets.d.ts.map +1 -1
  23. package/dist/hintergrund-assets.js +4 -4
  24. package/dist/index.d.ts +7 -1
  25. package/dist/index.d.ts.map +1 -1
  26. package/dist/index.js +4 -2
  27. package/dist/lib/config.d.ts +6 -0
  28. package/dist/lib/config.d.ts.map +1 -1
  29. package/dist/lib/config.js +17 -5
  30. package/dist/lib/email.d.ts +3 -5
  31. package/dist/lib/email.d.ts.map +1 -1
  32. package/dist/lib/email.js +8 -25
  33. package/dist/lib/github-app.d.ts +1 -0
  34. package/dist/lib/github-app.d.ts.map +1 -1
  35. package/dist/lib/github-app.js +25 -1
  36. package/dist/lib/github.d.ts +9 -3
  37. package/dist/lib/github.d.ts.map +1 -1
  38. package/dist/lib/github.js +35 -12
  39. package/dist/lib/jsonc.d.ts +3 -0
  40. package/dist/lib/jsonc.d.ts.map +1 -0
  41. package/dist/lib/jsonc.js +76 -0
  42. package/dist/lib/project-db.d.ts +2 -2
  43. package/dist/lib/project-db.d.ts.map +1 -1
  44. package/dist/lib/project-db.js +12 -11
  45. package/dist/lib/template.d.ts.map +1 -1
  46. package/dist/lib/template.js +75 -213
  47. package/dist/middleware/auth.d.ts.map +1 -1
  48. package/dist/middleware/auth.js +0 -1
  49. package/package.json +35 -35
  50. package/dist/api/emails/handlers/webhook.handler.d.ts +0 -9
  51. package/dist/api/emails/handlers/webhook.handler.d.ts.map +0 -1
  52. package/dist/api/emails/handlers/webhook.handler.js +0 -161
package/dist/index.d.ts CHANGED
@@ -1,14 +1,19 @@
1
1
  import { Hono } from 'hono';
2
2
  export type Bindings = {
3
3
  SECRET?: string;
4
- BOOTSTRAP_TOKEN?: string;
4
+ SETUP_TOKEN?: string;
5
+ /** Project owner's control-plane email, used only to prefill first-run setup. */
6
+ SETUP_ADMIN_EMAIL?: string;
5
7
  ALLOWED_ORIGINS?: string;
8
+ /** Local test harness only: prevents GitHub Actions workflow dispatches. */
9
+ DISABLE_DEPLOYMENTS?: string;
6
10
  GIT_OWNER?: string;
7
11
  GIT_REPO?: string;
8
12
  GIT_BRANCH?: string;
9
13
  GITHUB_APP_ID?: string;
10
14
  GITHUB_INSTALLATION_ID?: string;
11
15
  GITHUB_APP_PRIVATE_KEY?: string;
16
+ GITHUB_TOKEN_URL?: string;
12
17
  API_KEY?: string;
13
18
  FROM_EMAIL?: string;
14
19
  FROM_NAME?: string;
@@ -18,6 +23,7 @@ export type Bindings = {
18
23
  STRIPE_WEBHOOK_SECRET?: string;
19
24
  STRIPE_PUBLISHABLE_KEY?: string;
20
25
  GEMINI_API_KEY?: string;
26
+ TEMPLATE_REGISTRY_URL?: string;
21
27
  UI_BASE_URL: string;
22
28
  ASSETS: Fetcher;
23
29
  PROJECT_DB?: D1Database;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAW5B,MAAM,MAAM,QAAQ,GAAG;IAEtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IAGzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAGhC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAGhC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACvB,IAAI,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACrB,CAAC;CACF,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC;AAEnE,wBAAgB,SAAS,yDA0GxB;AAGD,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAW5B,MAAM,MAAM,QAAQ,GAAG;IAEtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iFAAiF;IACjF,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,4EAA4E;IAC5E,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAG7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAGhC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACvB,IAAI,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACrB,CAAC;CACF,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC;AAEnE,wBAAgB,SAAS,yDA2GxB;AAGD,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC"}
package/dist/index.js CHANGED
@@ -6,7 +6,7 @@ import shopRoutes from './api/shop/routes';
6
6
  import { authMiddleware } from './middleware/auth';
7
7
  import { getTemplate } from './lib/template';
8
8
  import { ensureSchema } from './lib/project-db';
9
- import { projectNeedsSetup } from './api/cms/handlers/setup.handler';
9
+ import { hasValidSetupToken, projectNeedsSetup } from './api/cms/handlers/setup.handler';
10
10
  export function createApp() {
11
11
  const app = new Hono();
12
12
  app.use('*', async (c, next) => {
@@ -30,6 +30,8 @@ export function createApp() {
30
30
  app.get('/setup', async (c) => {
31
31
  if (!(await projectNeedsSetup(c)))
32
32
  return c.redirect('/login');
33
+ if (!(await hasValidSetupToken(c.env, c.req.query('token'))))
34
+ return c.notFound();
33
35
  return c.html(getTemplate('setup', c.env.UI_BASE_URL));
34
36
  });
35
37
  // Login page route (public)
@@ -43,7 +45,7 @@ export function createApp() {
43
45
  const methods = await db
44
46
  .prepare('SELECT login_method, COUNT(*) AS count FROM admin_users WHERE disabled_at IS NULL GROUP BY login_method ORDER BY count DESC')
45
47
  .all();
46
- const loginMethod = methods.results?.[0]?.login_method === 'magic-link' ? 'magic-link' : 'password';
48
+ const loginMethod = methods.results?.[0]?.login_method === 'otp' ? 'otp' : 'password';
47
49
  configParams = `config='${JSON.stringify({ loginMethod })}'`;
48
50
  }
49
51
  }
@@ -25,11 +25,17 @@ export declare function getShopConfig(env: Record<string, string | undefined> |
25
25
  * @throws Error if GitHub is not configured (required variables missing)
26
26
  */
27
27
  export declare function getGitHubConfig(env: Record<string, string | undefined> | any): {
28
+ githubTokenUrl: string;
29
+ runtimeSecret: string;
28
30
  gitOwner: string;
29
31
  gitRepo: string;
30
32
  gitBranch: any;
33
+ } | {
31
34
  githubAppId: string;
32
35
  githubInstallationId: string;
33
36
  githubPrivateKey: string;
37
+ gitOwner: string;
38
+ gitRepo: string;
39
+ gitBranch: any;
34
40
  };
35
41
  //# sourceMappingURL=config.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAe,MAAM,gCAAgC,CAAC;AAEhI;;;GAGG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,GAAG,GAAG,SAAS,CAOnF;AA4CD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,SAAS,GAAG,WAAW,CAIjE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,GAAG,GAAG,kBAAkB,CAQjG;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,GAAG,GAAG,gBAAgB,CAQ7F;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,GAAG;cAIhD,MAAM;aACR,MAAM;;iBAEG,MAAM;0BACY,MAAM;sBACV,MAAM;EAEvD"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAe,MAAM,gCAAgC,CAAC;AAEhI;;;GAGG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,GAAG,GAAG,SAAS,CAOnF;AA6CD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,SAAS,GAAG,WAAW,CAIjE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,GAAG,GAAG,kBAAkB,CAQjG;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,GAAG,GAAG,gBAAgB,CAQ7F;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,GAAG;oBAUX,MAAM;mBAA+B,MAAM;cANhF,MAAM;aACR,MAAM;;;iBAWG,MAAM;0BACY,MAAM;sBACV,MAAM;cAd3B,MAAM;aACR,MAAM;;EAehC"}
@@ -23,7 +23,8 @@ function getMissingVars(env, requiredVars) {
23
23
  * Check if any variable from a list is set (module is attempted)
24
24
  * Treats empty strings and "NOT_CONFIGURED" placeholder as not set
25
25
  */
26
- const GIT_REQUIRED_VARS = ['GIT_OWNER', 'GIT_REPO', 'GITHUB_APP_ID', 'GITHUB_INSTALLATION_ID', 'GITHUB_APP_PRIVATE_KEY'];
26
+ const GIT_REPOSITORY_VARS = ['GIT_OWNER', 'GIT_REPO'];
27
+ const GITHUB_APP_VARS = ['GITHUB_APP_ID', 'GITHUB_INSTALLATION_ID', 'GITHUB_APP_PRIVATE_KEY'];
27
28
  function loadFromEnvVars(env) {
28
29
  const config = {
29
30
  global: {
@@ -82,13 +83,24 @@ export function getShopConfig(env) {
82
83
  * @throws Error if GitHub is not configured (required variables missing)
83
84
  */
84
85
  export function getGitHubConfig(env) {
85
- const missing = getMissingVars(env, GIT_REQUIRED_VARS);
86
- if (missing.length)
87
- throw new Error(`GitHub not configured. Missing: ${missing.join(', ')}`);
88
- return {
86
+ const missingRepositoryVars = getMissingVars(env, GIT_REPOSITORY_VARS);
87
+ if (missingRepositoryVars.length)
88
+ throw new Error(`GitHub not configured. Missing: ${missingRepositoryVars.join(', ')}`);
89
+ const repository = {
89
90
  gitOwner: env.GIT_OWNER,
90
91
  gitRepo: env.GIT_REPO,
91
92
  gitBranch: env.GIT_BRANCH || 'main',
93
+ };
94
+ if (env.GITHUB_TOKEN_URL) {
95
+ if (!env.SECRET)
96
+ throw new Error('GitHub not configured. Missing: SECRET');
97
+ return { ...repository, githubTokenUrl: env.GITHUB_TOKEN_URL, runtimeSecret: env.SECRET };
98
+ }
99
+ const missingAppVars = getMissingVars(env, GITHUB_APP_VARS);
100
+ if (missingAppVars.length)
101
+ throw new Error(`GitHub not configured. Missing: ${missingAppVars.join(', ')}`);
102
+ return {
103
+ ...repository,
92
104
  githubAppId: env.GITHUB_APP_ID,
93
105
  githubInstallationId: env.GITHUB_INSTALLATION_ID,
94
106
  githubPrivateKey: env.GITHUB_APP_PRIVATE_KEY,
@@ -12,15 +12,13 @@ interface SendEmailParams {
12
12
  replyTo?: string;
13
13
  }
14
14
  export declare function sendEmail(env: Record<string, string | undefined>, params: SendEmailParams): Promise<void>;
15
- /**
16
- * Send a magic link email for passwordless admin authentication.
17
- */
18
- export declare function sendMagicLinkEmail(params: {
15
+ /** Send a one-time email code for passwordless admin authentication. */
16
+ export declare function sendEmailOtp(params: {
19
17
  to: string;
20
18
  apiKey: string;
21
19
  fromEmail: string;
22
20
  fromName?: string;
23
- magicLinkUrl: string;
21
+ code: string;
24
22
  }): Promise<void>;
25
23
  export {};
26
24
  //# sourceMappingURL=email.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../src/lib/email.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,UAAU,eAAe;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAW/G;AAkCD;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAChD,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BhB"}
1
+ {"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../src/lib/email.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,UAAU,eAAe;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAW/G;AAkCD,wEAAwE;AACxE,wBAAsB,YAAY,CAAC,MAAM,EAAE;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACb,GAAG,OAAO,CAAC,IAAI,CAAC,CAahB"}
package/dist/lib/email.js CHANGED
@@ -42,32 +42,15 @@ async function sendViaPlunk(apiKey, fromEmail, fromName, params) {
42
42
  throw new Error(`Plunk API error ${response.status}: ${error}`);
43
43
  }
44
44
  }
45
- /**
46
- * Send a magic link email for passwordless admin authentication.
47
- */
48
- export async function sendMagicLinkEmail(params) {
45
+ /** Send a one-time email code for passwordless admin authentication. */
46
+ export async function sendEmailOtp(params) {
49
47
  const html = renderEmailTemplate({
50
48
  bodyHtml: `
51
- <h1 style="font-size:24px;font-weight:600;text-align:center;margin-bottom:24px;">Sign in to hintergrund</h1>
52
- <p style="margin-bottom:24px;text-align:center;color:#57606a;">Click the button below to sign in. This link will expire in 15 minutes.</p>
53
- <div style="text-align:center;margin-bottom:32px;">
54
- <a href="${params.magicLinkUrl}" style="display:inline-block;background-color:#1f883d;color:white;text-decoration:none;padding:12px 24px;border-radius:6px;font-weight:500;font-size:16px;">Sign in to hintergrund</a>
55
- </div>
56
- <p style="font-size:14px;color:#57606a;text-align:center;">If you didn't request this email, you can safely ignore it.</p>
57
- <hr style="border:none;border-top:1px solid #d0d7de;margin:32px 0;">
58
- <p style="font-size:12px;color:#8c959f;text-align:center;">${params.magicLinkUrl}</p>`,
59
- template: {
60
- primaryColor: '#1f883d',
61
- footerHtml: '',
62
- },
63
- });
64
- await sendEmail({
65
- API_KEY: params.apiKey,
66
- FROM_EMAIL: params.fromEmail,
67
- FROM_NAME: params.fromName,
68
- }, {
69
- to: params.to,
70
- subject: 'Sign in to hintergrund',
71
- html,
49
+ <h1 style="font-size:24px;font-weight:600;text-align:center;margin-bottom:24px;">Sign in to Hintergrund</h1>
50
+ <p style="margin-bottom:16px;text-align:center;color:#57606a;">Enter this one-time code to sign in. It expires in 15 minutes.</p>
51
+ <p style="margin:0 0 32px;text-align:center;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:32px;font-weight:700;letter-spacing:0.2em;color:#1f2328;">${params.code}</p>
52
+ <p style="font-size:14px;color:#57606a;text-align:center;">If you didn't request this code, you can safely ignore this email.</p>`,
53
+ template: { primaryColor: '#1f883d', footerHtml: '' },
72
54
  });
55
+ await sendEmail({ API_KEY: params.apiKey, FROM_EMAIL: params.fromEmail, FROM_NAME: params.fromName }, { to: params.to, subject: `${params.code} is your Hintergrund sign-in code`, html });
73
56
  }
@@ -1,2 +1,3 @@
1
+ export declare function brokeredGitHubToken(tokenUrl: string, runtimeSecret: string): Promise<string>;
1
2
  export declare function githubToken(appId: string, installationId: string, privateKey: string, repo: string): Promise<string>;
2
3
  //# sourceMappingURL=github-app.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"github-app.d.ts","sourceRoot":"","sources":["../../src/lib/github-app.ts"],"names":[],"mappings":"AAiCA,wBAAsB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAa1H"}
1
+ {"version":3,"file":"github-app.d.ts","sourceRoot":"","sources":["../../src/lib/github-app.ts"],"names":[],"mappings":"AAiCA,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAiBlG;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAgB1H"}
@@ -31,6 +31,27 @@ async function jwt(appId, pem) {
31
31
  const signature = await crypto.subtle.sign('RSASSA-PKCS1-v1_5', key, encoder.encode(unsigned));
32
32
  return `${unsigned}.${b64(new Uint8Array(signature))}`;
33
33
  }
34
+ export async function brokeredGitHubToken(tokenUrl, runtimeSecret) {
35
+ const key = `broker:${tokenUrl}`;
36
+ const cached = cache.get(key);
37
+ if (cached && cached.expires > Date.now() + 60_000)
38
+ return cached.token;
39
+ const response = await fetch(tokenUrl, {
40
+ method: 'POST',
41
+ headers: {
42
+ authorization: `Bearer ${runtimeSecret}`,
43
+ accept: 'application/json',
44
+ 'user-agent': 'hintergrund-project',
45
+ },
46
+ });
47
+ if (!response.ok)
48
+ throw new Error('Managed GitHub authentication failed');
49
+ const result = await response.json();
50
+ if (!result.token || !result.expiresAt)
51
+ throw new Error('Managed GitHub authentication returned an invalid token');
52
+ cache.set(key, { token: result.token, expires: Date.parse(result.expiresAt) });
53
+ return result.token;
54
+ }
34
55
  export async function githubToken(appId, installationId, privateKey, repo) {
35
56
  const key = `${appId}:${installationId}:${repo}`;
36
57
  const cached = cache.get(key);
@@ -39,7 +60,10 @@ export async function githubToken(appId, installationId, privateKey, repo) {
39
60
  const response = await fetch(`https://api.github.com/app/installations/${installationId}/access_tokens`, {
40
61
  method: 'POST',
41
62
  headers: { authorization: `Bearer ${await jwt(appId, privateKey)}`, accept: 'application/vnd.github+json', 'user-agent': 'hintergrund-project' },
42
- body: JSON.stringify({ repositories: [repo], permissions: { contents: 'write', actions: 'write' } })
63
+ body: JSON.stringify({
64
+ repositories: [repo],
65
+ permissions: { contents: 'write', actions: 'write', secrets: 'write', workflows: 'write' },
66
+ })
43
67
  });
44
68
  if (!response.ok)
45
69
  throw new Error('GitHub App authentication failed');
@@ -8,14 +8,19 @@ import { Octokit } from '@octokit/rest';
8
8
  /**
9
9
  * GitHub configuration for a module
10
10
  */
11
- export interface GitHubConfig {
11
+ type GitHubRepositoryConfig = {
12
12
  gitOwner: string;
13
13
  gitRepo: string;
14
14
  gitBranch: string;
15
+ };
16
+ export type GitHubConfig = GitHubRepositoryConfig & ({
17
+ githubTokenUrl: string;
18
+ runtimeSecret: string;
19
+ } | {
15
20
  githubAppId: string;
16
21
  githubInstallationId: string;
17
22
  githubPrivateKey: string;
18
- }
23
+ });
19
24
  /**
20
25
  * File entry for tree operations
21
26
  */
@@ -108,7 +113,7 @@ export declare class GitHubClient {
108
113
  * Write multiple files atomically in a single commit
109
114
  * This uses the Git Data API (blob → tree → commit → update ref)
110
115
  */
111
- writeFilesAtomic(files: FileEntry[], message: string, baseCommitSha?: string): Promise<string>;
116
+ writeFilesAtomic(files: FileEntry[], message: string, baseCommitSha?: string, deletions?: string[]): Promise<string>;
112
117
  /**
113
118
  * Delete a file from the repository
114
119
  */
@@ -144,4 +149,5 @@ export declare class GitHubClient {
144
149
  * Create a GitHub client from CMS module config
145
150
  */
146
151
  export declare function createGitHubClient(config: GitHubConfig): GitHubClient;
152
+ export {};
147
153
  //# sourceMappingURL=github.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../../src/lib/github.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAKxC;;GAEG;AACH,MAAM,WAAW,YAAY;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,YAAY;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CAClB;AAwBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAOvD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOpD;AAED;;GAEG;AACH,qBAAa,YAAY;IACxB,OAAO,CAAC,cAAc,CAAmB;IACzC,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,YAAY;IAQhC,OAAO,CAAC,OAAO;IAIf;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IASrC;;;OAGG;IACG,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IA0B5D;;;;OAIG;IACG,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IA8BpF;;;OAGG;IACG,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,CAAC,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAU7E;;;OAGG;IACG,oBAAoB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,CAAC,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAezG;;OAEG;IACG,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,CAAC;IAU7E;;;OAGG;IACG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBhF;;OAEG;IACG,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK/E;;;OAGG;IACG,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA2DpG;;OAEG;IACG,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB9D;;OAEG;IACG,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAyBpD;;;OAGG;IACG,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5D;;OAEG;IACH,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAI9B,wFAAwF;IAClF,kBAAkB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAanD,qDAAqD;IAC/C,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtD;;OAEG;IACH,WAAW;;;;;CAOX;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAErE"}
1
+ {"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../../src/lib/github.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,8 @@
7
7
  import { Octokit } from '@octokit/rest';
8
8
  import nacl from 'tweetnacl';
9
9
  import { blake2b } from 'blakejs';
10
- import { githubToken } from './github-app';
10
+ import { brokeredGitHubToken, githubToken } from './github-app';
11
+ import { parseJsonc, stringifyJsonc } from './jsonc';
11
12
  function toBase64(bytes) {
12
13
  let binary = '';
13
14
  for (const byte of bytes)
@@ -59,8 +60,10 @@ export function encodeUTF8Base64(str) {
59
60
  */
60
61
  export class GitHubClient {
61
62
  constructor(config) {
62
- this.octokitPromise = githubToken(config.githubAppId, config.githubInstallationId, config.githubPrivateKey, config.gitRepo)
63
- .then((token) => new Octokit({ auth: token }));
63
+ const token = 'githubTokenUrl' in config
64
+ ? brokeredGitHubToken(config.githubTokenUrl, config.runtimeSecret)
65
+ : githubToken(config.githubAppId, config.githubInstallationId, config.githubPrivateKey, config.gitRepo);
66
+ this.octokitPromise = token.then((auth) => new Octokit({ auth }));
64
67
  this.owner = config.gitOwner;
65
68
  this.repo = config.gitRepo;
66
69
  this.branch = config.gitBranch;
@@ -148,7 +151,7 @@ export class GitHubClient {
148
151
  if (!result)
149
152
  return null;
150
153
  return {
151
- data: JSON.parse(result.content),
154
+ data: parseJsonc(result.content),
152
155
  sha: result.sha
153
156
  };
154
157
  }
@@ -201,14 +204,17 @@ export class GitHubClient {
201
204
  * Write a JSON file to the repository
202
205
  */
203
206
  async writeJsonFile(path, data, message) {
204
- const content = JSON.stringify(data, null, 2);
207
+ const previous = path.endsWith('.jsonc') ? (await this.readFile(path))?.content : undefined;
208
+ const content = path.endsWith('.jsonc')
209
+ ? stringifyJsonc(data, previous)
210
+ : JSON.stringify(data, null, 2);
205
211
  return this.writeFile(path, content, message);
206
212
  }
207
213
  /**
208
214
  * Write multiple files atomically in a single commit
209
215
  * This uses the Git Data API (blob → tree → commit → update ref)
210
216
  */
211
- async writeFilesAtomic(files, message, baseCommitSha) {
217
+ async writeFilesAtomic(files, message, baseCommitSha, deletions = []) {
212
218
  // Get base commit SHA if not provided
213
219
  const commitSha = baseCommitSha || await this.getCommitSha();
214
220
  // Get the commit to find tree SHA
@@ -217,13 +223,14 @@ export class GitHubClient {
217
223
  repo: this.repo,
218
224
  commit_sha: commitSha
219
225
  });
220
- // Create blobs for all files
221
- const blobs = await Promise.all(files.map(async (file) => {
222
- const isBase64 = file.encoding === 'base64';
226
+ // Text can be embedded directly in the tree request. Binary assets need
227
+ // explicit blobs because GitHub tree content has no base64 encoding flag.
228
+ // Keeping text inline substantially reduces subrequests for template swaps.
229
+ const binaryBlobs = await Promise.all(files.filter((file) => file.encoding === 'base64').map(async (file) => {
223
230
  const blob = await (await this.octokit()).rest.git.createBlob({
224
231
  owner: this.owner,
225
232
  repo: this.repo,
226
- content: isBase64 ? file.content : encodeUTF8Base64(file.content),
233
+ content: file.content,
227
234
  encoding: 'base64'
228
235
  });
229
236
  return {
@@ -233,11 +240,27 @@ export class GitHubClient {
233
240
  sha: blob.data.sha
234
241
  };
235
242
  }));
236
- // Create new tree
243
+ const textEntries = files.filter((file) => file.encoding !== 'base64').map((file) => ({
244
+ path: file.path,
245
+ mode: '100644',
246
+ type: 'blob',
247
+ content: file.content
248
+ }));
249
+ // Create one tree for additions, updates, and deletions so a template
250
+ // switch is represented by a single reversible commit.
237
251
  const newTree = await (await this.octokit()).rest.git.createTree({
238
252
  owner: this.owner,
239
253
  repo: this.repo,
240
- tree: blobs,
254
+ tree: [
255
+ ...textEntries,
256
+ ...binaryBlobs,
257
+ ...deletions.map((path) => ({
258
+ path,
259
+ mode: '100644',
260
+ type: 'blob',
261
+ sha: null
262
+ }))
263
+ ],
241
264
  base_tree: commit.data.tree.sha
242
265
  });
243
266
  // Create new commit
@@ -0,0 +1,3 @@
1
+ export declare function parseJsonc<T>(source: string): T;
2
+ export declare function stringifyJsonc<T>(value: T, previousSource?: string): string;
3
+ //# sourceMappingURL=jsonc.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jsonc.d.ts","sourceRoot":"","sources":["../../src/lib/jsonc.ts"],"names":[],"mappings":"AAEA,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,CAE/C;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,CAiB3E"}
@@ -0,0 +1,76 @@
1
+ const TEMPLATE_MARKER = '@template-content';
2
+ export function parseJsonc(source) {
3
+ return JSON.parse(stripJsonComments(source).replace(/,(?=\s*[}\]])/g, ''));
4
+ }
5
+ export function stringifyJsonc(value, previousSource) {
6
+ const indent = previousSource?.match(/\n([\t ]+)"/)?.[1] ?? '\t';
7
+ let serialized = JSON.stringify(value, null, indent);
8
+ if (!previousSource?.includes(TEMPLATE_MARKER))
9
+ return serialized;
10
+ const commentBlock = /(^[\t ]*\/\/[^\r\n]*(?:\r?\n|$))+/gm;
11
+ for (const match of previousSource.matchAll(commentBlock)) {
12
+ const comment = match[0];
13
+ if (!comment.includes(TEMPLATE_MARKER))
14
+ continue;
15
+ const following = previousSource.slice((match.index ?? 0) + comment.length);
16
+ const property = following.match(/^[\t ]*"((?:\\.|[^"\\])*)"\s*:/)?.[1];
17
+ if (!property)
18
+ continue;
19
+ const pattern = new RegExp(`^${escapeRegExp(indent)}"${escapeRegExp(property)}"\\s*:`, 'm');
20
+ serialized = serialized.replace(pattern, `${comment}${indent}"${property}":`);
21
+ }
22
+ return serialized;
23
+ }
24
+ function stripJsonComments(source) {
25
+ let result = '';
26
+ let inString = false;
27
+ let escaped = false;
28
+ for (let index = 0; index < source.length; index += 1) {
29
+ const char = source[index];
30
+ const next = source[index + 1];
31
+ if (inString) {
32
+ result += char;
33
+ if (escaped)
34
+ escaped = false;
35
+ else if (char === '\\')
36
+ escaped = true;
37
+ else if (char === '"')
38
+ inString = false;
39
+ continue;
40
+ }
41
+ if (char === '"') {
42
+ inString = true;
43
+ result += char;
44
+ continue;
45
+ }
46
+ if (char === '/' && next === '/') {
47
+ result += ' ';
48
+ index += 2;
49
+ while (index < source.length && source[index] !== '\n' && source[index] !== '\r') {
50
+ result += ' ';
51
+ index += 1;
52
+ }
53
+ index -= 1;
54
+ continue;
55
+ }
56
+ if (char === '/' && next === '*') {
57
+ result += ' ';
58
+ index += 2;
59
+ while (index < source.length) {
60
+ if (source[index] === '*' && source[index + 1] === '/') {
61
+ result += ' ';
62
+ index += 1;
63
+ break;
64
+ }
65
+ result += source[index] === '\n' || source[index] === '\r' ? source[index] : ' ';
66
+ index += 1;
67
+ }
68
+ continue;
69
+ }
70
+ result += char;
71
+ }
72
+ return result;
73
+ }
74
+ function escapeRegExp(value) {
75
+ return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
76
+ }
@@ -1,5 +1,5 @@
1
1
  import type { Bindings } from '../index';
2
- export type LoginMethod = 'password' | 'magic-link';
2
+ export type LoginMethod = 'password' | 'otp';
3
3
  export interface AdminUser {
4
4
  id: string;
5
5
  email: string;
@@ -10,7 +10,7 @@ export interface AdminUser {
10
10
  created_at: number;
11
11
  updated_at: number;
12
12
  }
13
- export declare const PROJECT_SCHEMA_SQL = "\nCREATE TABLE IF NOT EXISTS admin_users (\n\tid TEXT NOT NULL PRIMARY KEY,\n\temail TEXT NOT NULL UNIQUE,\n\tname TEXT,\n\tpassword_hash TEXT,\n\tlogin_method TEXT NOT NULL CHECK(login_method IN ('password', 'magic-link')),\n\tdisabled_at INTEGER,\n\tcreated_at INTEGER NOT NULL,\n\tupdated_at INTEGER NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS admin_magic_links (\n\tid TEXT NOT NULL PRIMARY KEY,\n\tuser_id TEXT NOT NULL REFERENCES admin_users(id) ON DELETE CASCADE,\n\ttoken_hash TEXT NOT NULL UNIQUE,\n\texpires_at INTEGER NOT NULL,\n\tused_at INTEGER,\n\tcreated_at INTEGER NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS agent_conversations (\n\tid TEXT NOT NULL PRIMARY KEY,\n\tuser_id TEXT NOT NULL REFERENCES admin_users(id) ON DELETE CASCADE,\n\tmode TEXT NOT NULL CHECK(mode IN ('builder', 'cms')),\n\ttitle TEXT NOT NULL,\n\tmessages_json TEXT NOT NULL,\n\tmodel_metadata_json TEXT NOT NULL DEFAULT '{}',\n\tgit_diff TEXT,\n\tcreated_at INTEGER NOT NULL,\n\tupdated_at INTEGER NOT NULL\n);\n\nCREATE INDEX IF NOT EXISTS idx_admin_magic_links_token ON admin_magic_links(token_hash);\nCREATE INDEX IF NOT EXISTS idx_agent_conversations_user_mode ON agent_conversations(user_id, mode, updated_at);\n\nCREATE TABLE IF NOT EXISTS subscribers (\n\tid TEXT NOT NULL PRIMARY KEY,\n\temail TEXT NOT NULL UNIQUE,\n\tname TEXT,\n\tstatus TEXT NOT NULL DEFAULT 'pending' CHECK(status IN ('pending', 'subscribed', 'unsubscribed', 'bounced', 'complained')),\n\tsource TEXT NOT NULL DEFAULT 'website' CHECK(source IN ('manual', 'import', 'website')),\n\tdata_json TEXT NOT NULL DEFAULT '{}',\n\tconfirmation_token TEXT,\n\tconfirmation_sent_at INTEGER,\n\tconfirmed_at INTEGER,\n\tsubscribed_at INTEGER,\n\tunsubscribed_at INTEGER,\n\tunsubscribe_token TEXT,\n\tcreated_at INTEGER NOT NULL,\n\tupdated_at INTEGER NOT NULL\n);\n\nCREATE UNIQUE INDEX IF NOT EXISTS idx_subscribers_email ON subscribers(email);\nCREATE INDEX IF NOT EXISTS idx_subscribers_status ON subscribers(status);\nCREATE INDEX IF NOT EXISTS idx_subscribers_created_at ON subscribers(created_at DESC);\nCREATE INDEX IF NOT EXISTS idx_subscribers_source ON subscribers(source);\n\nCREATE TABLE IF NOT EXISTS campaigns (\n\tid TEXT NOT NULL PRIMARY KEY,\n\tname TEXT NOT NULL,\n\tsubject TEXT NOT NULL,\n\tbody_html TEXT NOT NULL,\n\tstatus TEXT NOT NULL DEFAULT 'draft' CHECK(status IN ('draft', 'scheduled', 'sent')),\n\trecipient_count INTEGER,\n\tscheduled_at INTEGER,\n\tsent_at INTEGER,\n\tcreated_at INTEGER NOT NULL,\n\tupdated_at INTEGER NOT NULL\n);\n\nCREATE INDEX IF NOT EXISTS idx_campaigns_status ON campaigns(status);\nCREATE INDEX IF NOT EXISTS idx_campaigns_created_at ON campaigns(created_at DESC);\n\nCREATE TABLE IF NOT EXISTS email_sends (\n\tid TEXT NOT NULL PRIMARY KEY,\n\ttype TEXT NOT NULL CHECK(type IN ('campaign', 'transactional', 'auto')),\n\tcampaign_id TEXT REFERENCES campaigns(id) ON DELETE SET NULL,\n\tsubject TEXT NOT NULL,\n\trecipient_count INTEGER NOT NULL DEFAULT 0,\n\tstatus TEXT NOT NULL DEFAULT 'queued' CHECK(status IN ('queued', 'sent', 'failed')),\n\terror TEXT,\n\tsent_at INTEGER,\n\tcreated_at INTEGER NOT NULL\n);\n\nCREATE INDEX IF NOT EXISTS idx_email_sends_type ON email_sends(type);\nCREATE INDEX IF NOT EXISTS idx_email_sends_created_at ON email_sends(created_at DESC);\nCREATE INDEX IF NOT EXISTS idx_email_sends_campaign_id ON email_sends(campaign_id);\n\nCREATE TABLE IF NOT EXISTS shop_orders (\n\tid TEXT NOT NULL PRIMARY KEY,\n\torder_number TEXT NOT NULL UNIQUE,\n\tstatus TEXT NOT NULL DEFAULT 'pending' CHECK(status IN ('pending', 'approved', 'successful', 'aborted', 'failed')),\n\tpayment_method TEXT NOT NULL DEFAULT 'bank_transfer' CHECK(payment_method IN ('bank_transfer', 'stripe')),\n\tcustomer_json TEXT NOT NULL DEFAULT '{}',\n\titems_json TEXT NOT NULL DEFAULT '[]',\n\ttotals_json TEXT NOT NULL DEFAULT '{\"subtotal\":0,\"shipping\":0,\"tax\":0,\"total\":0,\"currency\":\"eur\"}',\n\tstripe_session_id TEXT,\n\tstripe_payment_intent_id TEXT,\n\tinvoice_number TEXT,\n\tinvoice_sent_at INTEGER,\n\tmetadata_json TEXT NOT NULL DEFAULT '{}',\n\tcreated_at INTEGER NOT NULL,\n\tupdated_at INTEGER NOT NULL\n);\n\nCREATE INDEX IF NOT EXISTS idx_shop_orders_status ON shop_orders(status);\nCREATE INDEX IF NOT EXISTS idx_shop_orders_payment_method ON shop_orders(payment_method);\nCREATE INDEX IF NOT EXISTS idx_shop_orders_stripe_session ON shop_orders(stripe_session_id);\nCREATE UNIQUE INDEX IF NOT EXISTS idx_shop_orders_order_number ON shop_orders(order_number);\n";
13
+ export declare const PROJECT_SCHEMA_SQL = "\nCREATE TABLE IF NOT EXISTS admin_users (\n\tid TEXT NOT NULL PRIMARY KEY,\n\temail TEXT NOT NULL UNIQUE,\n\tname TEXT,\n\tpassword_hash TEXT,\n\tlogin_method TEXT NOT NULL CHECK(login_method IN ('password', 'otp')),\n\tinitial_admin INTEGER UNIQUE,\n\tdisabled_at INTEGER,\n\tcreated_at INTEGER NOT NULL,\n\tupdated_at INTEGER NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS agent_conversations (\n\tid TEXT NOT NULL PRIMARY KEY,\n\tuser_id TEXT NOT NULL REFERENCES admin_users(id) ON DELETE CASCADE,\n\tmode TEXT NOT NULL CHECK(mode IN ('builder', 'cms')),\n\ttitle TEXT NOT NULL,\n\tmessages_json TEXT NOT NULL,\n\tmodel_metadata_json TEXT NOT NULL DEFAULT '{}',\n\tgit_diff TEXT,\n\tcreated_at INTEGER NOT NULL,\n\tupdated_at INTEGER NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS admin_email_otps (\n\tid TEXT NOT NULL PRIMARY KEY,\n\tuser_id TEXT NOT NULL REFERENCES admin_users(id) ON DELETE CASCADE,\n\tcode_hash TEXT NOT NULL UNIQUE,\n\texpires_at INTEGER NOT NULL,\n\tused_at INTEGER,\n\tcreated_at INTEGER NOT NULL\n);\n\nCREATE INDEX IF NOT EXISTS idx_admin_email_otps_user ON admin_email_otps(user_id, expires_at);\nCREATE INDEX IF NOT EXISTS idx_agent_conversations_user_mode ON agent_conversations(user_id, mode, updated_at);\n\nCREATE TABLE IF NOT EXISTS subscribers (\n\tid TEXT NOT NULL PRIMARY KEY,\n\temail TEXT NOT NULL UNIQUE,\n\tname TEXT,\n\tstatus TEXT NOT NULL DEFAULT 'pending' CHECK(status IN ('pending', 'subscribed', 'unsubscribed', 'bounced', 'complained')),\n\tsource TEXT NOT NULL DEFAULT 'website' CHECK(source IN ('manual', 'import', 'website')),\n\tdata_json TEXT NOT NULL DEFAULT '{}',\n\tconfirmation_token TEXT,\n\tconfirmation_sent_at INTEGER,\n\tconfirmed_at INTEGER,\n\tsubscribed_at INTEGER,\n\tunsubscribed_at INTEGER,\n\tunsubscribe_token TEXT,\n\tcreated_at INTEGER NOT NULL,\n\tupdated_at INTEGER NOT NULL\n);\n\nCREATE UNIQUE INDEX IF NOT EXISTS idx_subscribers_email ON subscribers(email);\nCREATE INDEX IF NOT EXISTS idx_subscribers_status ON subscribers(status);\nCREATE INDEX IF NOT EXISTS idx_subscribers_created_at ON subscribers(created_at DESC);\nCREATE INDEX IF NOT EXISTS idx_subscribers_source ON subscribers(source);\n\nCREATE TABLE IF NOT EXISTS campaigns (\n\tid TEXT NOT NULL PRIMARY KEY,\n\tname TEXT NOT NULL,\n\tsubject TEXT NOT NULL,\n\tbody_html TEXT NOT NULL,\n\tstatus TEXT NOT NULL DEFAULT 'draft' CHECK(status IN ('draft', 'scheduled', 'sent')),\n\trecipient_count INTEGER,\n\tscheduled_at INTEGER,\n\tsent_at INTEGER,\n\tcreated_at INTEGER NOT NULL,\n\tupdated_at INTEGER NOT NULL\n);\n\nCREATE INDEX IF NOT EXISTS idx_campaigns_status ON campaigns(status);\nCREATE INDEX IF NOT EXISTS idx_campaigns_created_at ON campaigns(created_at DESC);\n\nCREATE TABLE IF NOT EXISTS email_sends (\n\tid TEXT NOT NULL PRIMARY KEY,\n\ttype TEXT NOT NULL CHECK(type IN ('campaign', 'transactional', 'auto')),\n\tcampaign_id TEXT REFERENCES campaigns(id) ON DELETE SET NULL,\n\tsubject TEXT NOT NULL,\n\trecipient_count INTEGER NOT NULL DEFAULT 0,\n\tstatus TEXT NOT NULL DEFAULT 'queued' CHECK(status IN ('queued', 'sent', 'failed')),\n\terror TEXT,\n\tsent_at INTEGER,\n\tcreated_at INTEGER NOT NULL\n);\n\nCREATE INDEX IF NOT EXISTS idx_email_sends_type ON email_sends(type);\nCREATE INDEX IF NOT EXISTS idx_email_sends_created_at ON email_sends(created_at DESC);\nCREATE INDEX IF NOT EXISTS idx_email_sends_campaign_id ON email_sends(campaign_id);\n\nCREATE TABLE IF NOT EXISTS shop_orders (\n\tid TEXT NOT NULL PRIMARY KEY,\n\torder_number TEXT NOT NULL UNIQUE,\n\tstatus TEXT NOT NULL DEFAULT 'pending' CHECK(status IN ('pending', 'approved', 'successful', 'aborted', 'failed')),\n\tpayment_method TEXT NOT NULL DEFAULT 'bank_transfer' CHECK(payment_method IN ('bank_transfer', 'stripe')),\n\tcustomer_json TEXT NOT NULL DEFAULT '{}',\n\titems_json TEXT NOT NULL DEFAULT '[]',\n\ttotals_json TEXT NOT NULL DEFAULT '{\"subtotal\":0,\"shipping\":0,\"tax\":0,\"total\":0,\"currency\":\"eur\"}',\n\tstripe_session_id TEXT,\n\tstripe_payment_intent_id TEXT,\n\tinvoice_number TEXT,\n\tinvoice_sent_at INTEGER,\n\tmetadata_json TEXT NOT NULL DEFAULT '{}',\n\tcreated_at INTEGER NOT NULL,\n\tupdated_at INTEGER NOT NULL\n);\n\nCREATE INDEX IF NOT EXISTS idx_shop_orders_status ON shop_orders(status);\nCREATE INDEX IF NOT EXISTS idx_shop_orders_payment_method ON shop_orders(payment_method);\nCREATE INDEX IF NOT EXISTS idx_shop_orders_stripe_session ON shop_orders(stripe_session_id);\nCREATE UNIQUE INDEX IF NOT EXISTS idx_shop_orders_order_number ON shop_orders(order_number);\n";
14
14
  export declare function getProjectDb(env: Bindings): D1Database;
15
15
  export declare function ensureSchema(env: Bindings): Promise<D1Database>;
16
16
  export declare function nowSeconds(): number;
@@ -1 +1 @@
1
- {"version":3,"file":"project-db.d.ts","sourceRoot":"","sources":["../../src/lib/project-db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,YAAY,CAAC;AAEpD,MAAM,WAAW,SAAS;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,WAAW,CAAC;IAC1B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACnB;AAKD,eAAO,MAAM,kBAAkB,y5IA+G9B,CAAC;AAEF,wBAAgB,YAAY,CAAC,GAAG,EAAE,QAAQ,GAAG,UAAU,CAMtD;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAUrE;AAGD,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOpE;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAMjG;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAM/F;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAM5E"}
1
+ {"version":3,"file":"project-db.d.ts","sourceRoot":"","sources":["../../src/lib/project-db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,KAAK,CAAC;AAE7C,MAAM,WAAW,SAAS;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,WAAW,CAAC;IAC1B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACnB;AAKD,eAAO,MAAM,kBAAkB,u7IAgH9B,CAAC;AAEF,wBAAgB,YAAY,CAAC,GAAG,EAAE,QAAQ,GAAG,UAAU,CAMtD;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAUrE;AAGD,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOpE;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAMjG;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAM/F;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAM5E"}
@@ -7,21 +7,13 @@ CREATE TABLE IF NOT EXISTS admin_users (
7
7
  email TEXT NOT NULL UNIQUE,
8
8
  name TEXT,
9
9
  password_hash TEXT,
10
- login_method TEXT NOT NULL CHECK(login_method IN ('password', 'magic-link')),
10
+ login_method TEXT NOT NULL CHECK(login_method IN ('password', 'otp')),
11
+ initial_admin INTEGER UNIQUE,
11
12
  disabled_at INTEGER,
12
13
  created_at INTEGER NOT NULL,
13
14
  updated_at INTEGER NOT NULL
14
15
  );
15
16
 
16
- CREATE TABLE IF NOT EXISTS admin_magic_links (
17
- id TEXT NOT NULL PRIMARY KEY,
18
- user_id TEXT NOT NULL REFERENCES admin_users(id) ON DELETE CASCADE,
19
- token_hash TEXT NOT NULL UNIQUE,
20
- expires_at INTEGER NOT NULL,
21
- used_at INTEGER,
22
- created_at INTEGER NOT NULL
23
- );
24
-
25
17
  CREATE TABLE IF NOT EXISTS agent_conversations (
26
18
  id TEXT NOT NULL PRIMARY KEY,
27
19
  user_id TEXT NOT NULL REFERENCES admin_users(id) ON DELETE CASCADE,
@@ -34,7 +26,16 @@ CREATE TABLE IF NOT EXISTS agent_conversations (
34
26
  updated_at INTEGER NOT NULL
35
27
  );
36
28
 
37
- CREATE INDEX IF NOT EXISTS idx_admin_magic_links_token ON admin_magic_links(token_hash);
29
+ CREATE TABLE IF NOT EXISTS admin_email_otps (
30
+ id TEXT NOT NULL PRIMARY KEY,
31
+ user_id TEXT NOT NULL REFERENCES admin_users(id) ON DELETE CASCADE,
32
+ code_hash TEXT NOT NULL UNIQUE,
33
+ expires_at INTEGER NOT NULL,
34
+ used_at INTEGER,
35
+ created_at INTEGER NOT NULL
36
+ );
37
+
38
+ CREATE INDEX IF NOT EXISTS idx_admin_email_otps_user ON admin_email_otps(user_id, expires_at);
38
39
  CREATE INDEX IF NOT EXISTS idx_agent_conversations_user_mode ON agent_conversations(user_id, mode, updated_at);
39
40
 
40
41
  CREATE TABLE IF NOT EXISTS subscribers (
@@ -1 +1 @@
1
- {"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/lib/template.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,MAAW,GAAG,MAAM,CA+O3F"}
1
+ {"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/lib/template.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,MAAW,GAAG,MAAM,CAqG3F"}