clefbase 1.3.5 → 1.3.6
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/cli-src/cli/api.js +25 -3
- package/dist/cli-src/cli/commands/deploy.js +177 -28
- package/dist/cli-src/cli/index.js +36 -8
- package/dist/cli.js +191 -41
- package/dist/hosting/index.d.ts +92 -6
- package/dist/hosting/index.d.ts.map +1 -1
- package/dist/hosting/index.js +67 -14
- package/dist/hosting/index.js.map +1 -1
- package/package.json +1 -1
package/dist/cli-src/cli/api.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/**
|
|
3
|
-
* Raw API calls used by the CLI.
|
|
3
|
+
* api.ts — Raw API calls used by the CLI.
|
|
4
4
|
* Written as plain fetch calls (not using HttpClient) so the CLI can be
|
|
5
5
|
* bundled independently and doesn't pull in the full SDK at runtime.
|
|
6
6
|
*/
|
|
@@ -41,6 +41,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
41
41
|
exports.CliApiError = void 0;
|
|
42
42
|
exports.listSites = listSites;
|
|
43
43
|
exports.createSite = createSite;
|
|
44
|
+
exports.deleteSite = deleteSite;
|
|
45
|
+
exports.getDnsStatus = getDnsStatus;
|
|
46
|
+
exports.reprovisionDns = reprovisionDns;
|
|
44
47
|
exports.createDeploy = createDeploy;
|
|
45
48
|
exports.uploadFileBatch = uploadFileBatch;
|
|
46
49
|
exports.finalizeDeploy = finalizeDeploy;
|
|
@@ -96,6 +99,27 @@ async function createSite(cfg, name, description) {
|
|
|
96
99
|
body: JSON.stringify({ name, description }),
|
|
97
100
|
});
|
|
98
101
|
}
|
|
102
|
+
/**
|
|
103
|
+
* Delete a site.
|
|
104
|
+
*
|
|
105
|
+
* First call (confirm=false): returns { requiresConfirmation: true, dnsRecord?, message }
|
|
106
|
+
* Second call (confirm=true, deleteDns?): actually deletes
|
|
107
|
+
*/
|
|
108
|
+
async function deleteSite(cfg, siteId, opts = {}) {
|
|
109
|
+
const params = new URLSearchParams();
|
|
110
|
+
if (opts.confirm)
|
|
111
|
+
params.set("confirm", "true");
|
|
112
|
+
if (opts.deleteDns)
|
|
113
|
+
params.set("deleteDns", "true");
|
|
114
|
+
const qs = params.toString() ? `?${params}` : "";
|
|
115
|
+
return apiFetch(`${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}${qs}`, { method: "DELETE", headers: adminHeaders(cfg) });
|
|
116
|
+
}
|
|
117
|
+
async function getDnsStatus(cfg, siteId) {
|
|
118
|
+
return apiFetch(`${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/dns`, { headers: adminHeaders(cfg) });
|
|
119
|
+
}
|
|
120
|
+
async function reprovisionDns(cfg, siteId) {
|
|
121
|
+
return apiFetch(`${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/dns/provision`, { method: "POST", headers: adminHeaders(cfg), body: JSON.stringify({}) });
|
|
122
|
+
}
|
|
99
123
|
async function createDeploy(cfg, siteId, entrypoint = "index.html") {
|
|
100
124
|
return apiFetch(`${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/deploys`, {
|
|
101
125
|
method: "POST",
|
|
@@ -108,7 +132,6 @@ async function uploadFileBatch(cfg, deployId, files) {
|
|
|
108
132
|
const url = `${base(cfg)}/api/hosting/databases/${cfg.projectId}/deploys/${deployId}/files/batch`;
|
|
109
133
|
let res;
|
|
110
134
|
if (typeof FormData !== "undefined") {
|
|
111
|
-
// Node 18+ native FormData: Buffer must be wrapped in Blob/File
|
|
112
135
|
const form = new FormData();
|
|
113
136
|
for (const f of files) {
|
|
114
137
|
const filename = f.path.split("/").pop() ?? f.path;
|
|
@@ -124,7 +147,6 @@ async function uploadFileBatch(cfg, deployId, files) {
|
|
|
124
147
|
});
|
|
125
148
|
}
|
|
126
149
|
else {
|
|
127
|
-
// Older Node: use form-data package which natively accepts Buffers
|
|
128
150
|
const mod = await Promise.resolve().then(() => __importStar(require("form-data")));
|
|
129
151
|
const FormDataLegacy = mod.default;
|
|
130
152
|
const form = new FormDataLegacy();
|
|
@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.runDeploy = runDeploy;
|
|
7
7
|
exports.runHostingInit = runHostingInit;
|
|
8
8
|
exports.runStatus = runStatus;
|
|
9
|
+
exports.runDnsStatus = runDnsStatus;
|
|
10
|
+
exports.runDnsReprovision = runDnsReprovision;
|
|
9
11
|
const path_1 = __importDefault(require("path"));
|
|
10
12
|
const fs_1 = __importDefault(require("fs"));
|
|
11
13
|
const chalk_1 = __importDefault(require("chalk"));
|
|
@@ -65,6 +67,9 @@ function fmtBytes(n) {
|
|
|
65
67
|
return `${(n / 1024).toFixed(1)} KB`;
|
|
66
68
|
return `${(n / (1024 * 1024)).toFixed(2)} MB`;
|
|
67
69
|
}
|
|
70
|
+
function siteUrl(site) {
|
|
71
|
+
return site.customDomain ? `https://${site.customDomain}` : site.previewUrl;
|
|
72
|
+
}
|
|
68
73
|
// ─── deploy ───────────────────────────────────────────────────────────────────
|
|
69
74
|
async function runDeploy(opts) {
|
|
70
75
|
const cwd = opts.cwd ?? process.cwd();
|
|
@@ -75,18 +80,24 @@ async function runDeploy(opts) {
|
|
|
75
80
|
// ── Resolve / pick a site ─────────────────────────────────────────────────
|
|
76
81
|
let siteId = opts.site ?? cfg.hosting?.siteId ?? "";
|
|
77
82
|
let siteName = cfg.hosting?.siteName ?? "";
|
|
83
|
+
let previewUrl = "";
|
|
78
84
|
if (!siteId) {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
siteName =
|
|
85
|
+
const site = await pickOrCreateSite(cfg);
|
|
86
|
+
siteId = site.id;
|
|
87
|
+
siteName = site.name;
|
|
88
|
+
previewUrl = site.previewUrl;
|
|
82
89
|
cfg.hosting = {
|
|
83
90
|
siteId,
|
|
84
91
|
siteName,
|
|
92
|
+
previewUrl,
|
|
85
93
|
distDir: cfg.hosting?.distDir ?? "dist",
|
|
86
94
|
entrypoint: cfg.hosting?.entrypoint ?? "index.html",
|
|
87
95
|
};
|
|
88
96
|
(0, config_1.saveConfig)(cfg, cwd);
|
|
89
97
|
}
|
|
98
|
+
else {
|
|
99
|
+
previewUrl = cfg.hosting?.previewUrl ?? "";
|
|
100
|
+
}
|
|
90
101
|
// ── Resolve dist dir ──────────────────────────────────────────────────────
|
|
91
102
|
const distDir = opts.dir ?? cfg.hosting?.distDir ?? await promptDistDir(cwd);
|
|
92
103
|
const absDir = path_1.default.isAbsolute(distDir) ? distDir : path_1.default.join(cwd, distDir);
|
|
@@ -111,9 +122,10 @@ async function runDeploy(opts) {
|
|
|
111
122
|
}
|
|
112
123
|
// ── Summary ───────────────────────────────────────────────────────────────
|
|
113
124
|
console.log();
|
|
114
|
-
console.log(` ${chalk_1.default.bold("Site:")}
|
|
115
|
-
console.log(` ${chalk_1.default.bold("
|
|
116
|
-
console.log(` ${chalk_1.default.bold("
|
|
125
|
+
console.log(` ${chalk_1.default.bold("Site:")} ${siteName} ${chalk_1.default.dim(siteId)}`);
|
|
126
|
+
console.log(` ${chalk_1.default.bold("Preview:")} ${chalk_1.default.cyan(previewUrl || "(set after deploy)")}`);
|
|
127
|
+
console.log(` ${chalk_1.default.bold("From:")} ${path_1.default.relative(cwd, absDir)}`);
|
|
128
|
+
console.log(` ${chalk_1.default.bold("Files:")} ${files.length} ${chalk_1.default.dim("(" + fmtBytes(totalBytes) + ")")}`);
|
|
117
129
|
console.log();
|
|
118
130
|
// ── Create deploy ─────────────────────────────────────────────────────────
|
|
119
131
|
const deploySpinner = (0, ora_1.default)("Creating deploy…").start();
|
|
@@ -165,10 +177,30 @@ async function runDeploy(opts) {
|
|
|
165
177
|
finSpinner.fail(`Finalize failed: ${err.message}`);
|
|
166
178
|
process.exit(1);
|
|
167
179
|
}
|
|
168
|
-
// ── Result
|
|
169
|
-
|
|
180
|
+
// ── Result — fetch the canonical URL from the live site record ────────────
|
|
181
|
+
// The previewUrl from the config may be stale (e.g. if the site was renamed)
|
|
182
|
+
// and a custom domain may have been added since init. Always fetch the live
|
|
183
|
+
// site record to get the correct canonical URL.
|
|
184
|
+
let canonicalUrl = previewUrl;
|
|
185
|
+
try {
|
|
186
|
+
// Fetch the current site record to get the canonical URL — it may differ
|
|
187
|
+
// from the config if the site was renamed or a custom domain was added.
|
|
188
|
+
const sites = await (0, api_1.listSites)(cfg);
|
|
189
|
+
const liveSite = sites.find(s => s.id === siteId);
|
|
190
|
+
if (liveSite) {
|
|
191
|
+
canonicalUrl = siteUrl(liveSite);
|
|
192
|
+
// Keep the config preview URL in sync for future deploys.
|
|
193
|
+
if (cfg.hosting && liveSite.previewUrl && cfg.hosting.previewUrl !== liveSite.previewUrl) {
|
|
194
|
+
cfg.hosting.previewUrl = liveSite.previewUrl;
|
|
195
|
+
(0, config_1.saveConfig)(cfg, cwd);
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
catch { /* best-effort — fall back to stored previewUrl */ }
|
|
170
200
|
console.log();
|
|
171
|
-
|
|
201
|
+
if (canonicalUrl) {
|
|
202
|
+
console.log(chalk_1.default.green.bold(` ✓ ${canonicalUrl}`));
|
|
203
|
+
}
|
|
172
204
|
console.log();
|
|
173
205
|
}
|
|
174
206
|
// ─── hosting:init ─────────────────────────────────────────────────────────────
|
|
@@ -177,9 +209,7 @@ async function runHostingInit(cwd = process.cwd()) {
|
|
|
177
209
|
console.log();
|
|
178
210
|
console.log(chalk_1.default.bold.cyan(" Hosting Setup"));
|
|
179
211
|
console.log();
|
|
180
|
-
const
|
|
181
|
-
const sites = await (0, api_1.listSites)(cfg).catch(() => []);
|
|
182
|
-
const siteName = sites.find(s => s.id === siteId)?.name ?? siteId;
|
|
212
|
+
const site = await pickOrCreateSite(cfg);
|
|
183
213
|
const { distDir } = await inquirer_1.default.prompt([{
|
|
184
214
|
type: "input", name: "distDir",
|
|
185
215
|
message: "Build output directory",
|
|
@@ -192,10 +222,20 @@ async function runHostingInit(cwd = process.cwd()) {
|
|
|
192
222
|
default: cfg.hosting?.entrypoint ?? "index.html",
|
|
193
223
|
}]);
|
|
194
224
|
cfg.services.hosting = true;
|
|
195
|
-
cfg.hosting = {
|
|
225
|
+
cfg.hosting = {
|
|
226
|
+
siteId: site.id,
|
|
227
|
+
siteName: site.name,
|
|
228
|
+
previewUrl: site.previewUrl,
|
|
229
|
+
distDir: distDir.trim(),
|
|
230
|
+
entrypoint: entrypoint.trim(),
|
|
231
|
+
};
|
|
196
232
|
(0, config_1.saveConfig)(cfg, cwd);
|
|
197
233
|
console.log();
|
|
198
|
-
console.log(chalk_1.default.green(` ✓ Linked to "${
|
|
234
|
+
console.log(chalk_1.default.green(` ✓ Linked to "${site.name}"`));
|
|
235
|
+
console.log(chalk_1.default.dim(` Preview URL: ${site.previewUrl}`));
|
|
236
|
+
if (site.dnsWarning) {
|
|
237
|
+
console.log(chalk_1.default.yellow(` ⚠ ${site.dnsWarning}`));
|
|
238
|
+
}
|
|
199
239
|
console.log(chalk_1.default.dim(" Run `clefbase deploy` to go live."));
|
|
200
240
|
console.log();
|
|
201
241
|
}
|
|
@@ -218,15 +258,91 @@ async function runStatus(cwd = process.cwd()) {
|
|
|
218
258
|
else {
|
|
219
259
|
sp.succeed("Active deploy");
|
|
220
260
|
const d = active.deploy;
|
|
221
|
-
const url = `${cfg.serverUrl.replace(/\/+$/, "")}/hosted/${cfg.projectId}/${cfg.hosting.siteId}`;
|
|
222
261
|
console.log();
|
|
223
262
|
console.log(` ${chalk_1.default.bold("Site:")} ${cfg.hosting.siteName} ${chalk_1.default.dim(cfg.hosting.siteId)}`);
|
|
224
263
|
console.log(` ${chalk_1.default.bold("Deploy:")} ${chalk_1.default.dim(d.id)}`);
|
|
225
264
|
console.log(` ${chalk_1.default.bold("Status:")} ${chalk_1.default.green(d.status)}`);
|
|
226
265
|
console.log(` ${chalk_1.default.bold("Files:")} ${d.fileCount} ${chalk_1.default.dim(fmtBytes(d.totalBytes ?? 0))}`);
|
|
227
266
|
console.log(` ${chalk_1.default.bold("Deployed:")} ${new Date(d.finishedAt ?? d.createdAt).toLocaleString()}`);
|
|
228
|
-
|
|
267
|
+
if (cfg.hosting.previewUrl) {
|
|
268
|
+
console.log(` ${chalk_1.default.bold("Preview:")} ${chalk_1.default.cyan(cfg.hosting.previewUrl)}`);
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
catch (err) {
|
|
273
|
+
sp.fail(err.message);
|
|
274
|
+
}
|
|
275
|
+
console.log();
|
|
276
|
+
}
|
|
277
|
+
// ─── hosting:dns ──────────────────────────────────────────────────────────────
|
|
278
|
+
async function runDnsStatus(cwd = process.cwd()) {
|
|
279
|
+
const cfg = (0, config_1.requireConfig)(cwd);
|
|
280
|
+
console.log();
|
|
281
|
+
console.log(chalk_1.default.bold(" DNS Status"));
|
|
282
|
+
console.log();
|
|
283
|
+
if (!cfg.hosting?.siteId) {
|
|
284
|
+
console.log(chalk_1.default.yellow(" No site linked. Run `clefbase hosting:init` first.\n"));
|
|
285
|
+
return;
|
|
286
|
+
}
|
|
287
|
+
const sp = (0, ora_1.default)("Checking DNS records…").start();
|
|
288
|
+
try {
|
|
289
|
+
const dns = await (0, api_1.getDnsStatus)(cfg, cfg.hosting.siteId);
|
|
290
|
+
sp.succeed("DNS checked");
|
|
291
|
+
console.log();
|
|
292
|
+
// Preview subdomain
|
|
293
|
+
console.log(` ${chalk_1.default.bold("Preview subdomain:")}`);
|
|
294
|
+
console.log(` URL: ${chalk_1.default.cyan(dns.previewUrl)}`);
|
|
295
|
+
if (dns.preview.isCorrect) {
|
|
296
|
+
console.log(` DNS: ${chalk_1.default.green("✓ Correctly configured")}`);
|
|
297
|
+
}
|
|
298
|
+
else if (dns.preview.isConflict) {
|
|
299
|
+
console.log(` DNS: ${chalk_1.default.red("✗ Conflict — " + dns.preview.message)}`);
|
|
300
|
+
console.log(chalk_1.default.dim(" Run `clefbase hosting:dns:reprovision` to fix."));
|
|
301
|
+
}
|
|
302
|
+
else {
|
|
303
|
+
console.log(` DNS: ${chalk_1.default.yellow("⚠ Not yet provisioned")}`);
|
|
304
|
+
console.log(chalk_1.default.dim(" Run `clefbase hosting:dns:reprovision` to create the record."));
|
|
229
305
|
}
|
|
306
|
+
// Custom domain
|
|
307
|
+
if (dns.customDomain) {
|
|
308
|
+
console.log();
|
|
309
|
+
console.log(` ${chalk_1.default.bold("Custom domain:")}`);
|
|
310
|
+
console.log(` Domain: ${dns.customDomain.domain}`);
|
|
311
|
+
if (dns.customDomain.cnameOk) {
|
|
312
|
+
console.log(` DNS: ${chalk_1.default.green("✓ CNAME correctly points to " + dns.customDomain.cnameTarget)}`);
|
|
313
|
+
}
|
|
314
|
+
else if (dns.customDomain.conflict) {
|
|
315
|
+
console.log(` DNS: ${chalk_1.default.red("✗ Conflict — existing record points to " + dns.customDomain.cnameTarget)}`);
|
|
316
|
+
}
|
|
317
|
+
else {
|
|
318
|
+
console.log(` DNS: ${chalk_1.default.yellow("⚠ CNAME not yet set")}`);
|
|
319
|
+
console.log(` Add: CNAME ${dns.customDomain.instructions.name} → ${dns.customDomain.instructions.content}`);
|
|
320
|
+
console.log(chalk_1.default.dim(` Note: ${dns.customDomain.instructions.note}`));
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
catch (err) {
|
|
325
|
+
sp.fail(err.message);
|
|
326
|
+
}
|
|
327
|
+
console.log();
|
|
328
|
+
}
|
|
329
|
+
// ─── hosting:dns:reprovision ──────────────────────────────────────────────────
|
|
330
|
+
async function runDnsReprovision(cwd = process.cwd()) {
|
|
331
|
+
const cfg = (0, config_1.requireConfig)(cwd);
|
|
332
|
+
if (!cfg.hosting?.siteId) {
|
|
333
|
+
console.error(chalk_1.default.red("\n No site linked. Run `clefbase hosting:init` first.\n"));
|
|
334
|
+
process.exit(1);
|
|
335
|
+
}
|
|
336
|
+
const sp = (0, ora_1.default)(`Provisioning DNS for ${cfg.hosting.siteName}…`).start();
|
|
337
|
+
try {
|
|
338
|
+
const result = await (0, api_1.reprovisionDns)(cfg, cfg.hosting.siteId);
|
|
339
|
+
if (result.created) {
|
|
340
|
+
sp.succeed(chalk_1.default.green(`DNS record created: ${result.subdomain}`));
|
|
341
|
+
}
|
|
342
|
+
else {
|
|
343
|
+
sp.succeed(chalk_1.default.dim(`DNS record already correct: ${result.subdomain}`));
|
|
344
|
+
}
|
|
345
|
+
console.log(chalk_1.default.cyan(` ${result.url}`));
|
|
230
346
|
}
|
|
231
347
|
catch (err) {
|
|
232
348
|
sp.fail(err.message);
|
|
@@ -234,6 +350,11 @@ async function runStatus(cwd = process.cwd()) {
|
|
|
234
350
|
console.log();
|
|
235
351
|
}
|
|
236
352
|
// ─── Helpers ──────────────────────────────────────────────────────────────────
|
|
353
|
+
/**
|
|
354
|
+
* Interactive site picker / creator.
|
|
355
|
+
* Shows existing sites, allows creating a new one.
|
|
356
|
+
* On creation: enforces uniqueness, shows preview URL.
|
|
357
|
+
*/
|
|
237
358
|
async function pickOrCreateSite(cfg) {
|
|
238
359
|
const sp = (0, ora_1.default)("Fetching sites…").start();
|
|
239
360
|
let sites = [];
|
|
@@ -246,7 +367,10 @@ async function pickOrCreateSite(cfg) {
|
|
|
246
367
|
}
|
|
247
368
|
if (sites.length > 0) {
|
|
248
369
|
const choices = [
|
|
249
|
-
...sites.map(s => ({
|
|
370
|
+
...sites.map(s => ({
|
|
371
|
+
name: `${s.name} ${chalk_1.default.dim(s.previewUrl || s.id)}`,
|
|
372
|
+
value: s.id,
|
|
373
|
+
})),
|
|
250
374
|
{ name: chalk_1.default.cyan("+ Create a new site"), value: "__new__" },
|
|
251
375
|
];
|
|
252
376
|
const { chosen } = await inquirer_1.default.prompt([{
|
|
@@ -254,18 +378,43 @@ async function pickOrCreateSite(cfg) {
|
|
|
254
378
|
message: "Which site should receive this deploy?",
|
|
255
379
|
choices,
|
|
256
380
|
}]);
|
|
257
|
-
if (chosen !== "__new__")
|
|
258
|
-
return chosen;
|
|
381
|
+
if (chosen !== "__new__") {
|
|
382
|
+
return sites.find(s => s.id === chosen);
|
|
383
|
+
}
|
|
384
|
+
}
|
|
385
|
+
return createSiteInteractive(cfg);
|
|
386
|
+
}
|
|
387
|
+
/** Prompt for a new site name, handle conflict errors with retry. */
|
|
388
|
+
async function createSiteInteractive(cfg) {
|
|
389
|
+
while (true) {
|
|
390
|
+
const { name } = await inquirer_1.default.prompt([{
|
|
391
|
+
type: "input", name: "name",
|
|
392
|
+
message: "New site name (used as subdomain, e.g. my-app → my-app.preview.cleforyx.com)",
|
|
393
|
+
validate: (v) => v.trim().length >= 2 || "Must be at least 2 characters",
|
|
394
|
+
}]);
|
|
395
|
+
const s = (0, ora_1.default)(`Creating "${name.trim()}"…`).start();
|
|
396
|
+
try {
|
|
397
|
+
const site = await (0, api_1.createSite)(cfg, name.trim());
|
|
398
|
+
s.succeed(chalk_1.default.green(`Created "${site.name}" → ${chalk_1.default.cyan(site.previewUrl)}`));
|
|
399
|
+
if (site.dnsWarning) {
|
|
400
|
+
console.log(chalk_1.default.yellow(` ⚠ ${site.dnsWarning}`));
|
|
401
|
+
}
|
|
402
|
+
return site;
|
|
403
|
+
}
|
|
404
|
+
catch (err) {
|
|
405
|
+
const message = err.message;
|
|
406
|
+
// 409 conflict — name already taken
|
|
407
|
+
if (message.toLowerCase().includes("already exists") || message.includes("409")) {
|
|
408
|
+
s.fail(chalk_1.default.red(message));
|
|
409
|
+
console.log(chalk_1.default.dim(" Please choose a different name.\n"));
|
|
410
|
+
// Loop to prompt again
|
|
411
|
+
}
|
|
412
|
+
else {
|
|
413
|
+
s.fail(message);
|
|
414
|
+
throw err;
|
|
415
|
+
}
|
|
416
|
+
}
|
|
259
417
|
}
|
|
260
|
-
const { name } = await inquirer_1.default.prompt([{
|
|
261
|
-
type: "input", name: "name",
|
|
262
|
-
message: "New site name",
|
|
263
|
-
validate: (v) => v.trim().length > 0 || "Required",
|
|
264
|
-
}]);
|
|
265
|
-
const s = (0, ora_1.default)(`Creating "${name}"…`).start();
|
|
266
|
-
const site = await (0, api_1.createSite)(cfg, name.trim());
|
|
267
|
-
s.succeed(chalk_1.default.green(`Created "${site.name}" ${chalk_1.default.dim(site.id)}`));
|
|
268
|
-
return site.id;
|
|
269
418
|
}
|
|
270
419
|
async function promptDistDir(cwd) {
|
|
271
420
|
const { dir } = await inquirer_1.default.prompt([{
|
|
@@ -79,6 +79,32 @@ program
|
|
|
79
79
|
fatal(err);
|
|
80
80
|
}
|
|
81
81
|
});
|
|
82
|
+
// ─── hosting:dns ──────────────────────────────────────────────────────────────
|
|
83
|
+
program
|
|
84
|
+
.command("hosting:dns")
|
|
85
|
+
.alias("dns")
|
|
86
|
+
.description("Show DNS status for the linked site's preview and custom domains")
|
|
87
|
+
.action(async () => {
|
|
88
|
+
try {
|
|
89
|
+
await (0, deploy_1.runDnsStatus)();
|
|
90
|
+
}
|
|
91
|
+
catch (err) {
|
|
92
|
+
fatal(err);
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
// ─── hosting:dns:reprovision ──────────────────────────────────────────────────
|
|
96
|
+
program
|
|
97
|
+
.command("hosting:dns:reprovision")
|
|
98
|
+
.alias("dns:reprovision")
|
|
99
|
+
.description("(Re-)provision the Cloudflare CNAME for the linked site")
|
|
100
|
+
.action(async () => {
|
|
101
|
+
try {
|
|
102
|
+
await (0, deploy_1.runDnsReprovision)();
|
|
103
|
+
}
|
|
104
|
+
catch (err) {
|
|
105
|
+
fatal(err);
|
|
106
|
+
}
|
|
107
|
+
});
|
|
82
108
|
// ─── info ─────────────────────────────────────────────────────────────────────
|
|
83
109
|
program
|
|
84
110
|
.command("info")
|
|
@@ -94,14 +120,16 @@ program
|
|
|
94
120
|
// ─── help footer ─────────────────────────────────────────────────────────────
|
|
95
121
|
program.addHelpText("after", `
|
|
96
122
|
${chalk_1.default.bold("Examples:")}
|
|
97
|
-
${chalk_1.default.cyan("clefbase init")}
|
|
98
|
-
${chalk_1.default.cyan("clefbase deploy")}
|
|
99
|
-
${chalk_1.default.cyan("clefbase deploy -d ./dist")}
|
|
100
|
-
${chalk_1.default.cyan("clefbase deploy -m \"v2 release\"")}
|
|
101
|
-
${chalk_1.default.cyan("clefbase hosting:init")}
|
|
102
|
-
${chalk_1.default.cyan("clefbase hosting:status")}
|
|
103
|
-
${chalk_1.default.cyan("clefbase hosting:sites")}
|
|
104
|
-
${chalk_1.default.cyan("clefbase
|
|
123
|
+
${chalk_1.default.cyan("clefbase init")} Set up a new project
|
|
124
|
+
${chalk_1.default.cyan("clefbase deploy")} Deploy your built site
|
|
125
|
+
${chalk_1.default.cyan("clefbase deploy -d ./dist")} Deploy from a specific directory
|
|
126
|
+
${chalk_1.default.cyan("clefbase deploy -m \"v2 release\"")} Deploy with a release note
|
|
127
|
+
${chalk_1.default.cyan("clefbase hosting:init")} Link or create a hosted site
|
|
128
|
+
${chalk_1.default.cyan("clefbase hosting:status")} Show current live deploy
|
|
129
|
+
${chalk_1.default.cyan("clefbase hosting:sites")} List all sites
|
|
130
|
+
${chalk_1.default.cyan("clefbase hosting:dns")} Show DNS status
|
|
131
|
+
${chalk_1.default.cyan("clefbase hosting:dns:reprovision")} Fix / create the preview CNAME
|
|
132
|
+
${chalk_1.default.cyan("clefbase info")} Show config & connection status
|
|
105
133
|
`);
|
|
106
134
|
program.parse(process.argv);
|
|
107
135
|
// ─── Helper ───────────────────────────────────────────────────────────────────
|
package/dist/cli.js
CHANGED
|
@@ -33736,6 +33736,18 @@ async function createSite(cfg, name, description) {
|
|
|
33736
33736
|
}
|
|
33737
33737
|
);
|
|
33738
33738
|
}
|
|
33739
|
+
async function getDnsStatus(cfg, siteId) {
|
|
33740
|
+
return apiFetch(
|
|
33741
|
+
`${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/dns`,
|
|
33742
|
+
{ headers: adminHeaders(cfg) }
|
|
33743
|
+
);
|
|
33744
|
+
}
|
|
33745
|
+
async function reprovisionDns(cfg, siteId) {
|
|
33746
|
+
return apiFetch(
|
|
33747
|
+
`${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/dns/provision`,
|
|
33748
|
+
{ method: "POST", headers: adminHeaders(cfg), body: JSON.stringify({}) }
|
|
33749
|
+
);
|
|
33750
|
+
}
|
|
33739
33751
|
async function createDeploy(cfg, siteId, entrypoint = "index.html") {
|
|
33740
33752
|
return apiFetch(
|
|
33741
33753
|
`${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/deploys`,
|
|
@@ -34139,6 +34151,9 @@ function fmtBytes(n) {
|
|
|
34139
34151
|
if (n < 1024 * 1024) return `${(n / 1024).toFixed(1)} KB`;
|
|
34140
34152
|
return `${(n / (1024 * 1024)).toFixed(2)} MB`;
|
|
34141
34153
|
}
|
|
34154
|
+
function siteUrl(site) {
|
|
34155
|
+
return site.customDomain ? `https://${site.customDomain}` : site.previewUrl;
|
|
34156
|
+
}
|
|
34142
34157
|
async function runDeploy(opts) {
|
|
34143
34158
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
34144
34159
|
const cwd = opts.cwd ?? process.cwd();
|
|
@@ -34148,17 +34163,22 @@ async function runDeploy(opts) {
|
|
|
34148
34163
|
console.log();
|
|
34149
34164
|
let siteId = opts.site ?? ((_a = cfg.hosting) == null ? void 0 : _a.siteId) ?? "";
|
|
34150
34165
|
let siteName = ((_b = cfg.hosting) == null ? void 0 : _b.siteName) ?? "";
|
|
34166
|
+
let previewUrl = "";
|
|
34151
34167
|
if (!siteId) {
|
|
34152
|
-
|
|
34153
|
-
|
|
34154
|
-
siteName =
|
|
34168
|
+
const site = await pickOrCreateSite(cfg);
|
|
34169
|
+
siteId = site.id;
|
|
34170
|
+
siteName = site.name;
|
|
34171
|
+
previewUrl = site.previewUrl;
|
|
34155
34172
|
cfg.hosting = {
|
|
34156
34173
|
siteId,
|
|
34157
34174
|
siteName,
|
|
34158
|
-
|
|
34159
|
-
|
|
34175
|
+
previewUrl,
|
|
34176
|
+
distDir: ((_c = cfg.hosting) == null ? void 0 : _c.distDir) ?? "dist",
|
|
34177
|
+
entrypoint: ((_d = cfg.hosting) == null ? void 0 : _d.entrypoint) ?? "index.html"
|
|
34160
34178
|
};
|
|
34161
34179
|
saveConfig(cfg, cwd);
|
|
34180
|
+
} else {
|
|
34181
|
+
previewUrl = ((_e = cfg.hosting) == null ? void 0 : _e.previewUrl) ?? "";
|
|
34162
34182
|
}
|
|
34163
34183
|
const distDir = opts.dir ?? ((_f = cfg.hosting) == null ? void 0 : _f.distDir) ?? await promptDistDir(cwd);
|
|
34164
34184
|
const absDir = import_path3.default.isAbsolute(distDir) ? distDir : import_path3.default.join(cwd, distDir);
|
|
@@ -34185,9 +34205,10 @@ async function runDeploy(opts) {
|
|
|
34185
34205
|
console.warn(source_default.yellow(` \u26A0 Entrypoint "${entrypoint}" not found \u2014 is your build output correct?`));
|
|
34186
34206
|
}
|
|
34187
34207
|
console.log();
|
|
34188
|
-
console.log(` ${source_default.bold("Site:")}
|
|
34189
|
-
console.log(` ${source_default.bold("
|
|
34190
|
-
console.log(` ${source_default.bold("
|
|
34208
|
+
console.log(` ${source_default.bold("Site:")} ${siteName} ${source_default.dim(siteId)}`);
|
|
34209
|
+
console.log(` ${source_default.bold("Preview:")} ${source_default.cyan(previewUrl || "(set after deploy)")}`);
|
|
34210
|
+
console.log(` ${source_default.bold("From:")} ${import_path3.default.relative(cwd, absDir)}`);
|
|
34211
|
+
console.log(` ${source_default.bold("Files:")} ${files.length} ${source_default.dim("(" + fmtBytes(totalBytes) + ")")}`);
|
|
34191
34212
|
console.log();
|
|
34192
34213
|
const deploySpinner = ora2("Creating deploy\u2026").start();
|
|
34193
34214
|
let deploy;
|
|
@@ -34231,38 +34252,60 @@ async function runDeploy(opts) {
|
|
|
34231
34252
|
finSpinner.fail(`Finalize failed: ${err.message}`);
|
|
34232
34253
|
process.exit(1);
|
|
34233
34254
|
}
|
|
34234
|
-
|
|
34255
|
+
let canonicalUrl = previewUrl;
|
|
34256
|
+
try {
|
|
34257
|
+
const sites = await listSites(cfg);
|
|
34258
|
+
const liveSite = sites.find((s) => s.id === siteId);
|
|
34259
|
+
if (liveSite) {
|
|
34260
|
+
canonicalUrl = siteUrl(liveSite);
|
|
34261
|
+
if (cfg.hosting && liveSite.previewUrl && cfg.hosting.previewUrl !== liveSite.previewUrl) {
|
|
34262
|
+
cfg.hosting.previewUrl = liveSite.previewUrl;
|
|
34263
|
+
saveConfig(cfg, cwd);
|
|
34264
|
+
}
|
|
34265
|
+
}
|
|
34266
|
+
} catch {
|
|
34267
|
+
}
|
|
34235
34268
|
console.log();
|
|
34236
|
-
|
|
34269
|
+
if (canonicalUrl) {
|
|
34270
|
+
console.log(source_default.green.bold(` \u2713 ${canonicalUrl}`));
|
|
34271
|
+
}
|
|
34237
34272
|
console.log();
|
|
34238
34273
|
}
|
|
34239
34274
|
async function runHostingInit(cwd = process.cwd()) {
|
|
34240
|
-
var _a, _b
|
|
34275
|
+
var _a, _b;
|
|
34241
34276
|
const cfg = requireConfig(cwd);
|
|
34242
34277
|
console.log();
|
|
34243
34278
|
console.log(source_default.bold.cyan(" Hosting Setup"));
|
|
34244
34279
|
console.log();
|
|
34245
|
-
const
|
|
34246
|
-
const sites = await listSites(cfg).catch(() => []);
|
|
34247
|
-
const siteName = ((_a = sites.find((s) => s.id === siteId)) == null ? void 0 : _a.name) ?? siteId;
|
|
34280
|
+
const site = await pickOrCreateSite(cfg);
|
|
34248
34281
|
const { distDir } = await lib_default.prompt([{
|
|
34249
34282
|
type: "input",
|
|
34250
34283
|
name: "distDir",
|
|
34251
34284
|
message: "Build output directory",
|
|
34252
|
-
default: ((
|
|
34285
|
+
default: ((_a = cfg.hosting) == null ? void 0 : _a.distDir) ?? guessDistDir2(cwd),
|
|
34253
34286
|
validate: (v) => v.trim().length > 0 || "Required"
|
|
34254
34287
|
}]);
|
|
34255
34288
|
const { entrypoint } = await lib_default.prompt([{
|
|
34256
34289
|
type: "input",
|
|
34257
34290
|
name: "entrypoint",
|
|
34258
34291
|
message: "HTML entrypoint",
|
|
34259
|
-
default: ((
|
|
34292
|
+
default: ((_b = cfg.hosting) == null ? void 0 : _b.entrypoint) ?? "index.html"
|
|
34260
34293
|
}]);
|
|
34261
34294
|
cfg.services.hosting = true;
|
|
34262
|
-
cfg.hosting = {
|
|
34295
|
+
cfg.hosting = {
|
|
34296
|
+
siteId: site.id,
|
|
34297
|
+
siteName: site.name,
|
|
34298
|
+
previewUrl: site.previewUrl,
|
|
34299
|
+
distDir: distDir.trim(),
|
|
34300
|
+
entrypoint: entrypoint.trim()
|
|
34301
|
+
};
|
|
34263
34302
|
saveConfig(cfg, cwd);
|
|
34264
34303
|
console.log();
|
|
34265
|
-
console.log(source_default.green(` \u2713 Linked to "${
|
|
34304
|
+
console.log(source_default.green(` \u2713 Linked to "${site.name}"`));
|
|
34305
|
+
console.log(source_default.dim(` Preview URL: ${site.previewUrl}`));
|
|
34306
|
+
if (site.dnsWarning) {
|
|
34307
|
+
console.log(source_default.yellow(` \u26A0 ${site.dnsWarning}`));
|
|
34308
|
+
}
|
|
34266
34309
|
console.log(source_default.dim(" Run `clefbase deploy` to go live."));
|
|
34267
34310
|
console.log();
|
|
34268
34311
|
}
|
|
@@ -34284,20 +34327,87 @@ async function runStatus(cwd = process.cwd()) {
|
|
|
34284
34327
|
} else {
|
|
34285
34328
|
sp.succeed("Active deploy");
|
|
34286
34329
|
const d = active.deploy;
|
|
34287
|
-
const url = `${cfg.serverUrl.replace(/\/+$/, "")}/hosted/${cfg.projectId}/${cfg.hosting.siteId}`;
|
|
34288
34330
|
console.log();
|
|
34289
34331
|
console.log(` ${source_default.bold("Site:")} ${cfg.hosting.siteName} ${source_default.dim(cfg.hosting.siteId)}`);
|
|
34290
34332
|
console.log(` ${source_default.bold("Deploy:")} ${source_default.dim(d.id)}`);
|
|
34291
34333
|
console.log(` ${source_default.bold("Status:")} ${source_default.green(d.status)}`);
|
|
34292
34334
|
console.log(` ${source_default.bold("Files:")} ${d.fileCount} ${source_default.dim(fmtBytes(d.totalBytes ?? 0))}`);
|
|
34293
34335
|
console.log(` ${source_default.bold("Deployed:")} ${new Date(d.finishedAt ?? d.createdAt).toLocaleString()}`);
|
|
34294
|
-
|
|
34336
|
+
if (cfg.hosting.previewUrl) {
|
|
34337
|
+
console.log(` ${source_default.bold("Preview:")} ${source_default.cyan(cfg.hosting.previewUrl)}`);
|
|
34338
|
+
}
|
|
34295
34339
|
}
|
|
34296
34340
|
} catch (err) {
|
|
34297
34341
|
sp.fail(err.message);
|
|
34298
34342
|
}
|
|
34299
34343
|
console.log();
|
|
34300
34344
|
}
|
|
34345
|
+
async function runDnsStatus(cwd = process.cwd()) {
|
|
34346
|
+
var _a;
|
|
34347
|
+
const cfg = requireConfig(cwd);
|
|
34348
|
+
console.log();
|
|
34349
|
+
console.log(source_default.bold(" DNS Status"));
|
|
34350
|
+
console.log();
|
|
34351
|
+
if (!((_a = cfg.hosting) == null ? void 0 : _a.siteId)) {
|
|
34352
|
+
console.log(source_default.yellow(" No site linked. Run `clefbase hosting:init` first.\n"));
|
|
34353
|
+
return;
|
|
34354
|
+
}
|
|
34355
|
+
const sp = ora2("Checking DNS records\u2026").start();
|
|
34356
|
+
try {
|
|
34357
|
+
const dns = await getDnsStatus(cfg, cfg.hosting.siteId);
|
|
34358
|
+
sp.succeed("DNS checked");
|
|
34359
|
+
console.log();
|
|
34360
|
+
console.log(` ${source_default.bold("Preview subdomain:")}`);
|
|
34361
|
+
console.log(` URL: ${source_default.cyan(dns.previewUrl)}`);
|
|
34362
|
+
if (dns.preview.isCorrect) {
|
|
34363
|
+
console.log(` DNS: ${source_default.green("\u2713 Correctly configured")}`);
|
|
34364
|
+
} else if (dns.preview.isConflict) {
|
|
34365
|
+
console.log(` DNS: ${source_default.red("\u2717 Conflict \u2014 " + dns.preview.message)}`);
|
|
34366
|
+
console.log(source_default.dim(" Run `clefbase hosting:dns:reprovision` to fix."));
|
|
34367
|
+
} else {
|
|
34368
|
+
console.log(` DNS: ${source_default.yellow("\u26A0 Not yet provisioned")}`);
|
|
34369
|
+
console.log(source_default.dim(" Run `clefbase hosting:dns:reprovision` to create the record."));
|
|
34370
|
+
}
|
|
34371
|
+
if (dns.customDomain) {
|
|
34372
|
+
console.log();
|
|
34373
|
+
console.log(` ${source_default.bold("Custom domain:")}`);
|
|
34374
|
+
console.log(` Domain: ${dns.customDomain.domain}`);
|
|
34375
|
+
if (dns.customDomain.cnameOk) {
|
|
34376
|
+
console.log(` DNS: ${source_default.green("\u2713 CNAME correctly points to " + dns.customDomain.cnameTarget)}`);
|
|
34377
|
+
} else if (dns.customDomain.conflict) {
|
|
34378
|
+
console.log(` DNS: ${source_default.red("\u2717 Conflict \u2014 existing record points to " + dns.customDomain.cnameTarget)}`);
|
|
34379
|
+
} else {
|
|
34380
|
+
console.log(` DNS: ${source_default.yellow("\u26A0 CNAME not yet set")}`);
|
|
34381
|
+
console.log(` Add: CNAME ${dns.customDomain.instructions.name} \u2192 ${dns.customDomain.instructions.content}`);
|
|
34382
|
+
console.log(source_default.dim(` Note: ${dns.customDomain.instructions.note}`));
|
|
34383
|
+
}
|
|
34384
|
+
}
|
|
34385
|
+
} catch (err) {
|
|
34386
|
+
sp.fail(err.message);
|
|
34387
|
+
}
|
|
34388
|
+
console.log();
|
|
34389
|
+
}
|
|
34390
|
+
async function runDnsReprovision(cwd = process.cwd()) {
|
|
34391
|
+
var _a;
|
|
34392
|
+
const cfg = requireConfig(cwd);
|
|
34393
|
+
if (!((_a = cfg.hosting) == null ? void 0 : _a.siteId)) {
|
|
34394
|
+
console.error(source_default.red("\n No site linked. Run `clefbase hosting:init` first.\n"));
|
|
34395
|
+
process.exit(1);
|
|
34396
|
+
}
|
|
34397
|
+
const sp = ora2(`Provisioning DNS for ${cfg.hosting.siteName}\u2026`).start();
|
|
34398
|
+
try {
|
|
34399
|
+
const result = await reprovisionDns(cfg, cfg.hosting.siteId);
|
|
34400
|
+
if (result.created) {
|
|
34401
|
+
sp.succeed(source_default.green(`DNS record created: ${result.subdomain}`));
|
|
34402
|
+
} else {
|
|
34403
|
+
sp.succeed(source_default.dim(`DNS record already correct: ${result.subdomain}`));
|
|
34404
|
+
}
|
|
34405
|
+
console.log(source_default.cyan(` ${result.url}`));
|
|
34406
|
+
} catch (err) {
|
|
34407
|
+
sp.fail(err.message);
|
|
34408
|
+
}
|
|
34409
|
+
console.log();
|
|
34410
|
+
}
|
|
34301
34411
|
async function pickOrCreateSite(cfg) {
|
|
34302
34412
|
const sp = ora2("Fetching sites\u2026").start();
|
|
34303
34413
|
let sites = [];
|
|
@@ -34309,7 +34419,10 @@ async function pickOrCreateSite(cfg) {
|
|
|
34309
34419
|
}
|
|
34310
34420
|
if (sites.length > 0) {
|
|
34311
34421
|
const choices = [
|
|
34312
|
-
...sites.map((
|
|
34422
|
+
...sites.map((s) => ({
|
|
34423
|
+
name: `${s.name} ${source_default.dim(s.previewUrl || s.id)}`,
|
|
34424
|
+
value: s.id
|
|
34425
|
+
})),
|
|
34313
34426
|
{ name: source_default.cyan("+ Create a new site"), value: "__new__" }
|
|
34314
34427
|
];
|
|
34315
34428
|
const { chosen } = await lib_default.prompt([{
|
|
@@ -34318,18 +34431,39 @@ async function pickOrCreateSite(cfg) {
|
|
|
34318
34431
|
message: "Which site should receive this deploy?",
|
|
34319
34432
|
choices
|
|
34320
34433
|
}]);
|
|
34321
|
-
if (chosen !== "__new__")
|
|
34434
|
+
if (chosen !== "__new__") {
|
|
34435
|
+
return sites.find((s) => s.id === chosen);
|
|
34436
|
+
}
|
|
34437
|
+
}
|
|
34438
|
+
return createSiteInteractive(cfg);
|
|
34439
|
+
}
|
|
34440
|
+
async function createSiteInteractive(cfg) {
|
|
34441
|
+
while (true) {
|
|
34442
|
+
const { name } = await lib_default.prompt([{
|
|
34443
|
+
type: "input",
|
|
34444
|
+
name: "name",
|
|
34445
|
+
message: "New site name (used as subdomain, e.g. my-app \u2192 my-app.preview.cleforyx.com)",
|
|
34446
|
+
validate: (v) => v.trim().length >= 2 || "Must be at least 2 characters"
|
|
34447
|
+
}]);
|
|
34448
|
+
const s = ora2(`Creating "${name.trim()}"\u2026`).start();
|
|
34449
|
+
try {
|
|
34450
|
+
const site = await createSite(cfg, name.trim());
|
|
34451
|
+
s.succeed(source_default.green(`Created "${site.name}" \u2192 ${source_default.cyan(site.previewUrl)}`));
|
|
34452
|
+
if (site.dnsWarning) {
|
|
34453
|
+
console.log(source_default.yellow(` \u26A0 ${site.dnsWarning}`));
|
|
34454
|
+
}
|
|
34455
|
+
return site;
|
|
34456
|
+
} catch (err) {
|
|
34457
|
+
const message = err.message;
|
|
34458
|
+
if (message.toLowerCase().includes("already exists") || message.includes("409")) {
|
|
34459
|
+
s.fail(source_default.red(message));
|
|
34460
|
+
console.log(source_default.dim(" Please choose a different name.\n"));
|
|
34461
|
+
} else {
|
|
34462
|
+
s.fail(message);
|
|
34463
|
+
throw err;
|
|
34464
|
+
}
|
|
34465
|
+
}
|
|
34322
34466
|
}
|
|
34323
|
-
const { name } = await lib_default.prompt([{
|
|
34324
|
-
type: "input",
|
|
34325
|
-
name: "name",
|
|
34326
|
-
message: "New site name",
|
|
34327
|
-
validate: (v) => v.trim().length > 0 || "Required"
|
|
34328
|
-
}]);
|
|
34329
|
-
const s = ora2(`Creating "${name}"\u2026`).start();
|
|
34330
|
-
const site = await createSite(cfg, name.trim());
|
|
34331
|
-
s.succeed(source_default.green(`Created "${site.name}" ${source_default.dim(site.id)}`));
|
|
34332
|
-
return site.id;
|
|
34333
34467
|
}
|
|
34334
34468
|
async function promptDistDir(cwd) {
|
|
34335
34469
|
const { dir } = await lib_default.prompt([{
|
|
@@ -34405,7 +34539,7 @@ async function runSitesList(cwd = process.cwd()) {
|
|
|
34405
34539
|
}
|
|
34406
34540
|
|
|
34407
34541
|
// package.json
|
|
34408
|
-
var version = "1.3.
|
|
34542
|
+
var version = "1.3.6";
|
|
34409
34543
|
|
|
34410
34544
|
// src/cli/index.ts
|
|
34411
34545
|
var program2 = new Command();
|
|
@@ -34445,6 +34579,20 @@ program2.command("hosting:sites").alias("sites").description("List all hosted si
|
|
|
34445
34579
|
fatal(err);
|
|
34446
34580
|
}
|
|
34447
34581
|
});
|
|
34582
|
+
program2.command("hosting:dns").alias("dns").description("Show DNS status for the linked site's preview and custom domains").action(async () => {
|
|
34583
|
+
try {
|
|
34584
|
+
await runDnsStatus();
|
|
34585
|
+
} catch (err) {
|
|
34586
|
+
fatal(err);
|
|
34587
|
+
}
|
|
34588
|
+
});
|
|
34589
|
+
program2.command("hosting:dns:reprovision").alias("dns:reprovision").description("(Re-)provision the Cloudflare CNAME for the linked site").action(async () => {
|
|
34590
|
+
try {
|
|
34591
|
+
await runDnsReprovision();
|
|
34592
|
+
} catch (err) {
|
|
34593
|
+
fatal(err);
|
|
34594
|
+
}
|
|
34595
|
+
});
|
|
34448
34596
|
program2.command("info").description("Show project config and server connectivity").action(async () => {
|
|
34449
34597
|
try {
|
|
34450
34598
|
await runInfo();
|
|
@@ -34454,14 +34602,16 @@ program2.command("info").description("Show project config and server connectivit
|
|
|
34454
34602
|
});
|
|
34455
34603
|
program2.addHelpText("after", `
|
|
34456
34604
|
${source_default.bold("Examples:")}
|
|
34457
|
-
${source_default.cyan("clefbase init")}
|
|
34458
|
-
${source_default.cyan("clefbase deploy")}
|
|
34459
|
-
${source_default.cyan("clefbase deploy -d ./dist")}
|
|
34460
|
-
${source_default.cyan('clefbase deploy -m "v2 release"')}
|
|
34461
|
-
${source_default.cyan("clefbase hosting:init")}
|
|
34462
|
-
${source_default.cyan("clefbase hosting:status")}
|
|
34463
|
-
${source_default.cyan("clefbase hosting:sites")}
|
|
34464
|
-
${source_default.cyan("clefbase
|
|
34605
|
+
${source_default.cyan("clefbase init")} Set up a new project
|
|
34606
|
+
${source_default.cyan("clefbase deploy")} Deploy your built site
|
|
34607
|
+
${source_default.cyan("clefbase deploy -d ./dist")} Deploy from a specific directory
|
|
34608
|
+
${source_default.cyan('clefbase deploy -m "v2 release"')} Deploy with a release note
|
|
34609
|
+
${source_default.cyan("clefbase hosting:init")} Link or create a hosted site
|
|
34610
|
+
${source_default.cyan("clefbase hosting:status")} Show current live deploy
|
|
34611
|
+
${source_default.cyan("clefbase hosting:sites")} List all sites
|
|
34612
|
+
${source_default.cyan("clefbase hosting:dns")} Show DNS status
|
|
34613
|
+
${source_default.cyan("clefbase hosting:dns:reprovision")} Fix / create the preview CNAME
|
|
34614
|
+
${source_default.cyan("clefbase info")} Show config & connection status
|
|
34465
34615
|
`);
|
|
34466
34616
|
program2.parse(process.argv);
|
|
34467
34617
|
function fatal(err) {
|
package/dist/hosting/index.d.ts
CHANGED
|
@@ -5,9 +5,18 @@ export interface HostingSite {
|
|
|
5
5
|
id: string;
|
|
6
6
|
dbId: string;
|
|
7
7
|
name: string;
|
|
8
|
+
/** URL-safe slug — globally unique, used for the preview subdomain */
|
|
9
|
+
slug: string;
|
|
8
10
|
description?: string;
|
|
9
11
|
status: HostingStatus;
|
|
12
|
+
/** Auto-provisioned: {slug}.preview.cleforyx.com */
|
|
13
|
+
previewUrl: string;
|
|
14
|
+
/** Optional custom domain the user has configured */
|
|
10
15
|
customDomain?: string;
|
|
16
|
+
/** Cloudflare DNS record ID for the preview subdomain */
|
|
17
|
+
dnsRecordId?: string;
|
|
18
|
+
/** Non-fatal DNS warning set on creation if Cloudflare provisioning failed */
|
|
19
|
+
dnsWarning?: string;
|
|
11
20
|
createdAt: string;
|
|
12
21
|
updatedAt: string;
|
|
13
22
|
}
|
|
@@ -39,7 +48,10 @@ export interface DeployResult {
|
|
|
39
48
|
deploy: HostingDeploy;
|
|
40
49
|
filesUploaded: number;
|
|
41
50
|
errors: string[];
|
|
51
|
+
/** Canonical URL — custom domain if set, otherwise preview subdomain */
|
|
42
52
|
url: string;
|
|
53
|
+
/** Always the preview subdomain */
|
|
54
|
+
previewUrl: string;
|
|
43
55
|
}
|
|
44
56
|
export interface DeployOptions {
|
|
45
57
|
entrypoint?: string;
|
|
@@ -50,6 +62,32 @@ export interface DeployOptions {
|
|
|
50
62
|
/** Called after each batch with progress info. */
|
|
51
63
|
onProgress?: (uploaded: number, total: number) => void;
|
|
52
64
|
}
|
|
65
|
+
export interface DnsStatus {
|
|
66
|
+
preview: {
|
|
67
|
+
exists: boolean;
|
|
68
|
+
isCorrect: boolean;
|
|
69
|
+
isConflict: boolean;
|
|
70
|
+
message: string;
|
|
71
|
+
record?: {
|
|
72
|
+
name: string;
|
|
73
|
+
type: string;
|
|
74
|
+
content: string;
|
|
75
|
+
};
|
|
76
|
+
};
|
|
77
|
+
customDomain?: {
|
|
78
|
+
domain: string;
|
|
79
|
+
cnameOk: boolean;
|
|
80
|
+
cnameTarget?: string;
|
|
81
|
+
conflict: boolean;
|
|
82
|
+
instructions: {
|
|
83
|
+
type: string;
|
|
84
|
+
name: string;
|
|
85
|
+
content: string;
|
|
86
|
+
note: string;
|
|
87
|
+
};
|
|
88
|
+
};
|
|
89
|
+
previewUrl: string;
|
|
90
|
+
}
|
|
53
91
|
/**
|
|
54
92
|
* A reference to a hosted site.
|
|
55
93
|
*
|
|
@@ -57,6 +95,7 @@ export interface DeployOptions {
|
|
|
57
95
|
* const site = hosting.site("my-site-id");
|
|
58
96
|
* const result = await site.deployFiles({ "index.html": htmlBuffer, "app.js": jsBuffer });
|
|
59
97
|
* console.log(`Live at ${result.url}`);
|
|
98
|
+
* console.log(`Preview at ${result.previewUrl}`);
|
|
60
99
|
*/
|
|
61
100
|
export declare class SiteReference {
|
|
62
101
|
private readonly hosting;
|
|
@@ -82,9 +121,23 @@ export declare class SiteReference {
|
|
|
82
121
|
* message: "v1.2.0",
|
|
83
122
|
* onProgress: (done, total) => console.log(`${done}/${total}`),
|
|
84
123
|
* });
|
|
124
|
+
* console.log(`Live at ${result.url}`);
|
|
85
125
|
*/
|
|
86
126
|
deployFiles(files: Record<string, Buffer>, opts?: DeployOptions): Promise<DeployResult>;
|
|
87
|
-
/**
|
|
127
|
+
/** Check the DNS status of this site's preview + custom domains. */
|
|
128
|
+
getDnsStatus(): Promise<DnsStatus>;
|
|
129
|
+
/** Re-provision the preview DNS record (e.g. if it was accidentally deleted). */
|
|
130
|
+
reprovisionDns(): Promise<{
|
|
131
|
+
subdomain: string;
|
|
132
|
+
url: string;
|
|
133
|
+
created: boolean;
|
|
134
|
+
}>;
|
|
135
|
+
/** The preview URL for this site ({slug}.preview.cleforyx.com). */
|
|
136
|
+
get previewUrl(): string;
|
|
137
|
+
/**
|
|
138
|
+
* The public URL — custom domain if configured, else preview subdomain.
|
|
139
|
+
* Requires the site metadata; use `(await site.get())?.customDomain` to check.
|
|
140
|
+
*/
|
|
88
141
|
get url(): string;
|
|
89
142
|
}
|
|
90
143
|
/**
|
|
@@ -92,7 +145,12 @@ export declare class SiteReference {
|
|
|
92
145
|
*
|
|
93
146
|
* @example
|
|
94
147
|
* const hosting = getHosting(app);
|
|
148
|
+
*
|
|
149
|
+
* // Create a site — automatically provisions {name}.preview.cleforyx.com
|
|
95
150
|
* const site = await hosting.createSite("my-app");
|
|
151
|
+
* console.log(site.previewUrl); // https://my-app.preview.cleforyx.com
|
|
152
|
+
*
|
|
153
|
+
* // Deploy files
|
|
96
154
|
* const result = await hosting.site(site.id).deployFiles(files);
|
|
97
155
|
* console.log(result.url);
|
|
98
156
|
*/
|
|
@@ -103,18 +161,46 @@ export declare class ClefbaseHosting {
|
|
|
103
161
|
constructor(http: HttpClient, dbId: string, serverUrl: string);
|
|
104
162
|
/** List all sites for this project. */
|
|
105
163
|
listSites(): Promise<HostingSite[]>;
|
|
106
|
-
/**
|
|
164
|
+
/**
|
|
165
|
+
* Create a new hosted site.
|
|
166
|
+
*
|
|
167
|
+
* Site names must be globally unique across the platform.
|
|
168
|
+
* A CNAME record will be automatically provisioned on Cloudflare:
|
|
169
|
+
* {slug}.preview.cleforyx.com → cleforyx.com
|
|
170
|
+
*
|
|
171
|
+
* Throws a 409 ConflictError if the name is already taken.
|
|
172
|
+
*/
|
|
107
173
|
createSite(name: string, description?: string): Promise<HostingSite>;
|
|
108
|
-
/** Update site metadata. */
|
|
174
|
+
/** Update site metadata. Handles DNS rename if name changes. */
|
|
109
175
|
updateSite(siteId: string, patch: Partial<Pick<HostingSite, "name" | "description" | "status" | "customDomain">>): Promise<HostingSite>;
|
|
110
|
-
/**
|
|
111
|
-
|
|
176
|
+
/**
|
|
177
|
+
* Begin site deletion flow.
|
|
178
|
+
*
|
|
179
|
+
* Pass `confirm: false` (or omit) to get a confirmation prompt with DNS info.
|
|
180
|
+
* Pass `confirm: true` to actually delete. Include `deleteDns: true` to also
|
|
181
|
+
* remove the Cloudflare DNS record.
|
|
182
|
+
*/
|
|
183
|
+
deleteSite(siteId: string, opts?: {
|
|
184
|
+
confirm?: boolean;
|
|
185
|
+
deleteDns?: boolean;
|
|
186
|
+
}): Promise<{
|
|
187
|
+
requiresConfirmation?: boolean;
|
|
188
|
+
dnsRecord?: object;
|
|
189
|
+
message: string;
|
|
190
|
+
deleted?: boolean;
|
|
191
|
+
}>;
|
|
112
192
|
/** Return a SiteReference for a specific site ID. */
|
|
113
193
|
site(siteId: string): SiteReference;
|
|
114
|
-
|
|
194
|
+
_previewUrl(siteId: string): string;
|
|
115
195
|
_getSite(siteId: string): Promise<HostingSite | null>;
|
|
116
196
|
_getActiveDeploy(siteId: string): Promise<HostingDeploy | null>;
|
|
117
197
|
_listDeploys(siteId: string): Promise<HostingDeploy[]>;
|
|
198
|
+
_getDnsStatus(siteId: string): Promise<DnsStatus>;
|
|
199
|
+
_reprovisionDns(siteId: string): Promise<{
|
|
200
|
+
subdomain: string;
|
|
201
|
+
url: string;
|
|
202
|
+
created: boolean;
|
|
203
|
+
}>;
|
|
118
204
|
_deployFiles(siteId: string, files: Record<string, Buffer>, opts?: DeployOptions): Promise<DeployResult>;
|
|
119
205
|
}
|
|
120
206
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hosting/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAIrC,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC;AACnD,MAAM,MAAM,YAAY,GAAI,SAAS,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEvE,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,aAAa,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,aAAa,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hosting/index.ts"],"names":[],"mappings":"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"}
|
package/dist/hosting/index.js
CHANGED
|
@@ -42,6 +42,7 @@ exports.ClefbaseHosting = exports.SiteReference = void 0;
|
|
|
42
42
|
* const site = hosting.site("my-site-id");
|
|
43
43
|
* const result = await site.deployFiles({ "index.html": htmlBuffer, "app.js": jsBuffer });
|
|
44
44
|
* console.log(`Live at ${result.url}`);
|
|
45
|
+
* console.log(`Preview at ${result.previewUrl}`);
|
|
45
46
|
*/
|
|
46
47
|
class SiteReference {
|
|
47
48
|
constructor(hosting, siteId) {
|
|
@@ -74,13 +75,29 @@ class SiteReference {
|
|
|
74
75
|
* message: "v1.2.0",
|
|
75
76
|
* onProgress: (done, total) => console.log(`${done}/${total}`),
|
|
76
77
|
* });
|
|
78
|
+
* console.log(`Live at ${result.url}`);
|
|
77
79
|
*/
|
|
78
80
|
async deployFiles(files, opts) {
|
|
79
81
|
return this.hosting._deployFiles(this.siteId, files, opts);
|
|
80
82
|
}
|
|
81
|
-
/**
|
|
83
|
+
/** Check the DNS status of this site's preview + custom domains. */
|
|
84
|
+
async getDnsStatus() {
|
|
85
|
+
return this.hosting._getDnsStatus(this.siteId);
|
|
86
|
+
}
|
|
87
|
+
/** Re-provision the preview DNS record (e.g. if it was accidentally deleted). */
|
|
88
|
+
async reprovisionDns() {
|
|
89
|
+
return this.hosting._reprovisionDns(this.siteId);
|
|
90
|
+
}
|
|
91
|
+
/** The preview URL for this site ({slug}.preview.cleforyx.com). */
|
|
92
|
+
get previewUrl() {
|
|
93
|
+
return this.hosting._previewUrl(this.siteId);
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* The public URL — custom domain if configured, else preview subdomain.
|
|
97
|
+
* Requires the site metadata; use `(await site.get())?.customDomain` to check.
|
|
98
|
+
*/
|
|
82
99
|
get url() {
|
|
83
|
-
return this.
|
|
100
|
+
return this.previewUrl; // SDK doesn't cache site; use DeployResult.url for canonical
|
|
84
101
|
}
|
|
85
102
|
}
|
|
86
103
|
exports.SiteReference = SiteReference;
|
|
@@ -90,7 +107,12 @@ exports.SiteReference = SiteReference;
|
|
|
90
107
|
*
|
|
91
108
|
* @example
|
|
92
109
|
* const hosting = getHosting(app);
|
|
110
|
+
*
|
|
111
|
+
* // Create a site — automatically provisions {name}.preview.cleforyx.com
|
|
93
112
|
* const site = await hosting.createSite("my-app");
|
|
113
|
+
* console.log(site.previewUrl); // https://my-app.preview.cleforyx.com
|
|
114
|
+
*
|
|
115
|
+
* // Deploy files
|
|
94
116
|
* const result = await hosting.site(site.id).deployFiles(files);
|
|
95
117
|
* console.log(result.url);
|
|
96
118
|
*/
|
|
@@ -104,24 +126,45 @@ class ClefbaseHosting {
|
|
|
104
126
|
async listSites() {
|
|
105
127
|
return this.http.get(`/databases/${this.dbId}/sites`);
|
|
106
128
|
}
|
|
107
|
-
/**
|
|
129
|
+
/**
|
|
130
|
+
* Create a new hosted site.
|
|
131
|
+
*
|
|
132
|
+
* Site names must be globally unique across the platform.
|
|
133
|
+
* A CNAME record will be automatically provisioned on Cloudflare:
|
|
134
|
+
* {slug}.preview.cleforyx.com → cleforyx.com
|
|
135
|
+
*
|
|
136
|
+
* Throws a 409 ConflictError if the name is already taken.
|
|
137
|
+
*/
|
|
108
138
|
async createSite(name, description) {
|
|
109
139
|
return this.http.post(`/databases/${this.dbId}/sites`, { name, description });
|
|
110
140
|
}
|
|
111
|
-
/** Update site metadata. */
|
|
141
|
+
/** Update site metadata. Handles DNS rename if name changes. */
|
|
112
142
|
async updateSite(siteId, patch) {
|
|
113
143
|
return this.http.patch(`/databases/${this.dbId}/sites/${siteId}`, patch);
|
|
114
144
|
}
|
|
115
|
-
/**
|
|
116
|
-
|
|
117
|
-
|
|
145
|
+
/**
|
|
146
|
+
* Begin site deletion flow.
|
|
147
|
+
*
|
|
148
|
+
* Pass `confirm: false` (or omit) to get a confirmation prompt with DNS info.
|
|
149
|
+
* Pass `confirm: true` to actually delete. Include `deleteDns: true` to also
|
|
150
|
+
* remove the Cloudflare DNS record.
|
|
151
|
+
*/
|
|
152
|
+
async deleteSite(siteId, opts) {
|
|
153
|
+
const params = new URLSearchParams();
|
|
154
|
+
if (opts?.confirm)
|
|
155
|
+
params.set("confirm", "true");
|
|
156
|
+
if (opts?.deleteDns)
|
|
157
|
+
params.set("deleteDns", "true");
|
|
158
|
+
const qs = params.toString() ? `?${params}` : "";
|
|
159
|
+
return this.http.delete(`/databases/${this.dbId}/sites/${siteId}${qs}`);
|
|
118
160
|
}
|
|
119
161
|
/** Return a SiteReference for a specific site ID. */
|
|
120
162
|
site(siteId) {
|
|
121
163
|
return new SiteReference(this, siteId);
|
|
122
164
|
}
|
|
123
165
|
// ─── Internals ─────────────────────────────────────────────────────────────
|
|
124
|
-
|
|
166
|
+
_previewUrl(siteId) {
|
|
167
|
+
// Falls back to server URL path if site metadata isn't cached
|
|
125
168
|
return `${this.serverUrl.replace(/\/+$/, "")}/hosted/${this.dbId}/${siteId}`;
|
|
126
169
|
}
|
|
127
170
|
async _getSite(siteId) {
|
|
@@ -148,28 +191,35 @@ class ClefbaseHosting {
|
|
|
148
191
|
async _listDeploys(siteId) {
|
|
149
192
|
return this.http.get(`/databases/${this.dbId}/sites/${siteId}/deploys`);
|
|
150
193
|
}
|
|
194
|
+
async _getDnsStatus(siteId) {
|
|
195
|
+
return this.http.get(`/databases/${this.dbId}/sites/${siteId}/dns`);
|
|
196
|
+
}
|
|
197
|
+
async _reprovisionDns(siteId) {
|
|
198
|
+
return this.http.post(`/databases/${this.dbId}/sites/${siteId}/dns/provision`, {});
|
|
199
|
+
}
|
|
151
200
|
async _deployFiles(siteId, files, opts = {}) {
|
|
152
201
|
const { entrypoint = "index.html", deployedBy, message, batchSize = 20, onProgress } = opts;
|
|
153
202
|
// 1. Create pending deploy
|
|
154
203
|
const pending = await this.http.post(`/databases/${this.dbId}/sites/${siteId}/deploys`, { deployedBy, entrypoint });
|
|
204
|
+
// 2. Get site for canonical URL
|
|
205
|
+
const siteData = await this._getSite(siteId).catch(() => null);
|
|
155
206
|
const filePaths = Object.keys(files);
|
|
156
207
|
const fileBuffers = Object.values(files);
|
|
157
208
|
const errors = [];
|
|
158
209
|
let uploaded = 0;
|
|
159
|
-
//
|
|
210
|
+
// 3. Detect whether we have native FormData (Node 18+) or need form-data pkg
|
|
160
211
|
const hasNativeFormData = typeof FormData !== "undefined";
|
|
161
212
|
let FormDataLegacy;
|
|
162
213
|
if (!hasNativeFormData) {
|
|
163
214
|
const mod = await Promise.resolve().then(() => __importStar(require("form-data")));
|
|
164
215
|
FormDataLegacy = mod.default;
|
|
165
216
|
}
|
|
166
|
-
//
|
|
217
|
+
// 4. Upload in batches
|
|
167
218
|
for (let i = 0; i < filePaths.length; i += batchSize) {
|
|
168
219
|
const batchPaths = filePaths.slice(i, i + batchSize);
|
|
169
220
|
const batchBuffers = fileBuffers.slice(i, i + batchSize);
|
|
170
221
|
try {
|
|
171
222
|
if (hasNativeFormData) {
|
|
172
|
-
// Node 18+ native FormData: Buffers must be wrapped in Blob/File
|
|
173
223
|
const form = new FormData();
|
|
174
224
|
for (let j = 0; j < batchPaths.length; j++) {
|
|
175
225
|
const filename = batchPaths[j].split("/").pop() ?? batchPaths[j];
|
|
@@ -182,7 +232,6 @@ class ClefbaseHosting {
|
|
|
182
232
|
await this.http.request(`/databases/${this.dbId}/deploys/${pending.id}/files/batch`, { method: "POST", body: form, isFormData: true });
|
|
183
233
|
}
|
|
184
234
|
else {
|
|
185
|
-
// Older Node: form-data package accepts Buffers natively
|
|
186
235
|
const form = new FormDataLegacy();
|
|
187
236
|
for (let j = 0; j < batchPaths.length; j++) {
|
|
188
237
|
form.append("files[]", batchBuffers[j], {
|
|
@@ -200,13 +249,17 @@ class ClefbaseHosting {
|
|
|
200
249
|
}
|
|
201
250
|
onProgress?.(Math.min(i + batchSize, filePaths.length), filePaths.length);
|
|
202
251
|
}
|
|
203
|
-
//
|
|
252
|
+
// 5. Finalize → go live
|
|
204
253
|
const live = await this.http.post(`/databases/${this.dbId}/deploys/${pending.id}/finalize`, { message: message ?? "Deployed via clefbase SDK" });
|
|
254
|
+
const canonicalUrl = siteData?.customDomain
|
|
255
|
+
? `https://${siteData.customDomain}`
|
|
256
|
+
: siteData?.previewUrl ?? this._previewUrl(siteId);
|
|
205
257
|
return {
|
|
206
258
|
deploy: live,
|
|
207
259
|
filesUploaded: uploaded,
|
|
208
260
|
errors,
|
|
209
|
-
url:
|
|
261
|
+
url: canonicalUrl,
|
|
262
|
+
previewUrl: siteData?.previewUrl ?? this._previewUrl(siteId),
|
|
210
263
|
};
|
|
211
264
|
}
|
|
212
265
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hosting/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hosting/index.ts"],"names":[],"mappings":"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"}
|