@base44-preview/cli 0.1.8-pr.584.ae3c2f4 → 0.1.8-pr.589.9d22ef2
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/index.js +726 -1246
- package/dist/cli/index.js.map +17 -24
- package/package.json +1 -1
package/dist/cli/index.js
CHANGED
|
@@ -23352,15 +23352,15 @@ var require_windows = __commonJS((exports, module) => {
|
|
|
23352
23352
|
}
|
|
23353
23353
|
return false;
|
|
23354
23354
|
}
|
|
23355
|
-
function checkStat(
|
|
23356
|
-
if (!
|
|
23355
|
+
function checkStat(stat2, path11, options) {
|
|
23356
|
+
if (!stat2.isSymbolicLink() && !stat2.isFile()) {
|
|
23357
23357
|
return false;
|
|
23358
23358
|
}
|
|
23359
23359
|
return checkPathExt(path11, options);
|
|
23360
23360
|
}
|
|
23361
23361
|
function isexe(path11, options, cb) {
|
|
23362
|
-
fs14.stat(path11, function(er,
|
|
23363
|
-
cb(er, er ? false : checkStat(
|
|
23362
|
+
fs14.stat(path11, function(er, stat2) {
|
|
23363
|
+
cb(er, er ? false : checkStat(stat2, path11, options));
|
|
23364
23364
|
});
|
|
23365
23365
|
}
|
|
23366
23366
|
function sync(path11, options) {
|
|
@@ -23374,20 +23374,20 @@ var require_mode = __commonJS((exports, module) => {
|
|
|
23374
23374
|
isexe.sync = sync;
|
|
23375
23375
|
var fs14 = __require("fs");
|
|
23376
23376
|
function isexe(path11, options, cb) {
|
|
23377
|
-
fs14.stat(path11, function(er,
|
|
23378
|
-
cb(er, er ? false : checkStat(
|
|
23377
|
+
fs14.stat(path11, function(er, stat2) {
|
|
23378
|
+
cb(er, er ? false : checkStat(stat2, options));
|
|
23379
23379
|
});
|
|
23380
23380
|
}
|
|
23381
23381
|
function sync(path11, options) {
|
|
23382
23382
|
return checkStat(fs14.statSync(path11), options);
|
|
23383
23383
|
}
|
|
23384
|
-
function checkStat(
|
|
23385
|
-
return
|
|
23384
|
+
function checkStat(stat2, options) {
|
|
23385
|
+
return stat2.isFile() && checkMode(stat2, options);
|
|
23386
23386
|
}
|
|
23387
|
-
function checkMode(
|
|
23388
|
-
var mod =
|
|
23389
|
-
var uid =
|
|
23390
|
-
var gid =
|
|
23387
|
+
function checkMode(stat2, options) {
|
|
23388
|
+
var mod = stat2.mode;
|
|
23389
|
+
var uid = stat2.uid;
|
|
23390
|
+
var gid = stat2.gid;
|
|
23391
23391
|
var myUid = options.uid !== undefined ? options.uid : process.getuid && process.getuid();
|
|
23392
23392
|
var myGid = options.gid !== undefined ? options.gid : process.getgid && process.getgid();
|
|
23393
23393
|
var u = parseInt("100", 8);
|
|
@@ -23419,12 +23419,12 @@ var require_isexe = __commonJS((exports, module) => {
|
|
|
23419
23419
|
if (typeof Promise !== "function") {
|
|
23420
23420
|
throw new TypeError("callback not provided");
|
|
23421
23421
|
}
|
|
23422
|
-
return new Promise(function(
|
|
23422
|
+
return new Promise(function(resolve4, reject) {
|
|
23423
23423
|
isexe(path11, options || {}, function(er, is) {
|
|
23424
23424
|
if (er) {
|
|
23425
23425
|
reject(er);
|
|
23426
23426
|
} else {
|
|
23427
|
-
|
|
23427
|
+
resolve4(is);
|
|
23428
23428
|
}
|
|
23429
23429
|
});
|
|
23430
23430
|
});
|
|
@@ -23486,27 +23486,27 @@ var require_which = __commonJS((exports, module) => {
|
|
|
23486
23486
|
opt = {};
|
|
23487
23487
|
const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
|
|
23488
23488
|
const found = [];
|
|
23489
|
-
const step = (i) => new Promise((
|
|
23489
|
+
const step = (i) => new Promise((resolve4, reject) => {
|
|
23490
23490
|
if (i === pathEnv.length)
|
|
23491
|
-
return opt.all && found.length ?
|
|
23491
|
+
return opt.all && found.length ? resolve4(found) : reject(getNotFoundError(cmd));
|
|
23492
23492
|
const ppRaw = pathEnv[i];
|
|
23493
23493
|
const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
|
|
23494
23494
|
const pCmd = path11.join(pathPart, cmd);
|
|
23495
23495
|
const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
|
|
23496
|
-
|
|
23496
|
+
resolve4(subStep(p, i, 0));
|
|
23497
23497
|
});
|
|
23498
|
-
const subStep = (p, i, ii) => new Promise((
|
|
23498
|
+
const subStep = (p, i, ii) => new Promise((resolve4, reject) => {
|
|
23499
23499
|
if (ii === pathExt.length)
|
|
23500
|
-
return
|
|
23500
|
+
return resolve4(step(i + 1));
|
|
23501
23501
|
const ext = pathExt[ii];
|
|
23502
23502
|
isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
|
|
23503
23503
|
if (!er && is) {
|
|
23504
23504
|
if (opt.all)
|
|
23505
23505
|
found.push(p + ext);
|
|
23506
23506
|
else
|
|
23507
|
-
return
|
|
23507
|
+
return resolve4(p + ext);
|
|
23508
23508
|
}
|
|
23509
|
-
return
|
|
23509
|
+
return resolve4(subStep(p, i, ii + 1));
|
|
23510
23510
|
});
|
|
23511
23511
|
});
|
|
23512
23512
|
return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
|
|
@@ -27034,7 +27034,7 @@ var require_lodash8 = __commonJS((exports, module) => {
|
|
|
27034
27034
|
}
|
|
27035
27035
|
return mapped.length && mapped[0] === arrays[0] ? baseIntersection(mapped, undefined2, comparator) : [];
|
|
27036
27036
|
});
|
|
27037
|
-
function
|
|
27037
|
+
function join17(array2, separator) {
|
|
27038
27038
|
return array2 == null ? "" : nativeJoin.call(array2, separator);
|
|
27039
27039
|
}
|
|
27040
27040
|
function last(array2) {
|
|
@@ -28966,7 +28966,7 @@ __p += '`;
|
|
|
28966
28966
|
lodash.isUndefined = isUndefined;
|
|
28967
28967
|
lodash.isWeakMap = isWeakMap;
|
|
28968
28968
|
lodash.isWeakSet = isWeakSet;
|
|
28969
|
-
lodash.join =
|
|
28969
|
+
lodash.join = join17;
|
|
28970
28970
|
lodash.kebabCase = kebabCase;
|
|
28971
28971
|
lodash.last = last;
|
|
28972
28972
|
lodash.lastIndexOf = lastIndexOf;
|
|
@@ -31176,7 +31176,7 @@ function cleanDoc(doc2) {
|
|
|
31176
31176
|
return mapDoc(doc2, (currentDoc) => cleanDocFn(currentDoc));
|
|
31177
31177
|
}
|
|
31178
31178
|
function replaceEndOfLine(doc2, replacement = literalline) {
|
|
31179
|
-
return mapDoc(doc2, (currentDoc) => typeof currentDoc === "string" ?
|
|
31179
|
+
return mapDoc(doc2, (currentDoc) => typeof currentDoc === "string" ? join26(replacement, currentDoc.split(`
|
|
31180
31180
|
`)) : currentDoc);
|
|
31181
31181
|
}
|
|
31182
31182
|
function canBreakFn(doc2) {
|
|
@@ -31256,7 +31256,7 @@ function indentIfBreak(contents, options) {
|
|
|
31256
31256
|
negate: options.negate
|
|
31257
31257
|
};
|
|
31258
31258
|
}
|
|
31259
|
-
function
|
|
31259
|
+
function join26(separator, docs) {
|
|
31260
31260
|
assertDoc(separator);
|
|
31261
31261
|
assertDocArray(docs);
|
|
31262
31262
|
const parts = [];
|
|
@@ -31967,7 +31967,7 @@ var init_doc = __esm(() => {
|
|
|
31967
31967
|
MODE_FLAT = Symbol("MODE_FLAT");
|
|
31968
31968
|
DOC_FILL_PRINTED_LENGTH = Symbol("DOC_FILL_PRINTED_LENGTH");
|
|
31969
31969
|
builders = {
|
|
31970
|
-
join:
|
|
31970
|
+
join: join26,
|
|
31971
31971
|
line,
|
|
31972
31972
|
softline,
|
|
31973
31973
|
hardline,
|
|
@@ -120385,7 +120385,7 @@ function skipVoid(str, ptr, banNewLines, banComments) {
|
|
|
120385
120385
|
ptr++;
|
|
120386
120386
|
return banComments || c24 !== "#" ? ptr : skipVoid(str, skipComment(str, ptr), banNewLines);
|
|
120387
120387
|
}
|
|
120388
|
-
function skipUntil(str, ptr,
|
|
120388
|
+
function skipUntil(str, ptr, sep, end, banNewLines = false) {
|
|
120389
120389
|
if (!end) {
|
|
120390
120390
|
ptr = indexOfNewline(str, ptr);
|
|
120391
120391
|
return ptr < 0 ? str.length : ptr;
|
|
@@ -120394,7 +120394,7 @@ function skipUntil(str, ptr, sep2, end, banNewLines = false) {
|
|
|
120394
120394
|
let c24 = str[i5];
|
|
120395
120395
|
if (c24 === "#") {
|
|
120396
120396
|
i5 = indexOfNewline(str, i5);
|
|
120397
|
-
} else if (c24 ===
|
|
120397
|
+
} else if (c24 === sep) {
|
|
120398
120398
|
return i5 + 1;
|
|
120399
120399
|
} else if (c24 === end || banNewLines && (c24 === `
|
|
120400
120400
|
` || c24 === "\r" && str[i5 + 1] === `
|
|
@@ -121174,7 +121174,7 @@ function getDataProtocolModuleFormat(parsed) {
|
|
|
121174
121174
|
const { 1: mime } = /^([^/]+\/[^;,]+)[^,]*?(;base64)?,/.exec(parsed.pathname) || [null, null, null];
|
|
121175
121175
|
return mimeToFormat(mime);
|
|
121176
121176
|
}
|
|
121177
|
-
function
|
|
121177
|
+
function extname(url3) {
|
|
121178
121178
|
const pathname = url3.pathname;
|
|
121179
121179
|
let index = pathname.length;
|
|
121180
121180
|
while (index--) {
|
|
@@ -121189,7 +121189,7 @@ function extname2(url3) {
|
|
|
121189
121189
|
return "";
|
|
121190
121190
|
}
|
|
121191
121191
|
function getFileProtocolModuleFormat(url3, _context, ignoreErrors) {
|
|
121192
|
-
const value =
|
|
121192
|
+
const value = extname(url3);
|
|
121193
121193
|
if (value === ".js") {
|
|
121194
121194
|
const packageType = getPackageType(url3);
|
|
121195
121195
|
if (packageType !== "none") {
|
|
@@ -123904,14 +123904,14 @@ async function printToDoc(originalText, options8) {
|
|
|
123904
123904
|
async function printDocToString2(doc2, options8) {
|
|
123905
123905
|
return printDocToStringWithoutNormalizeOptions(doc2, await normalize_format_options_default(options8));
|
|
123906
123906
|
}
|
|
123907
|
-
function createParsersAndPrinters(
|
|
123907
|
+
function createParsersAndPrinters(modules) {
|
|
123908
123908
|
const parsers2 = /* @__PURE__ */ Object.create(null);
|
|
123909
123909
|
const printers2 = /* @__PURE__ */ Object.create(null);
|
|
123910
123910
|
for (const {
|
|
123911
123911
|
importPlugin: importPlugin2,
|
|
123912
123912
|
parsers: parserNames = [],
|
|
123913
123913
|
printers: printerNames = []
|
|
123914
|
-
} of
|
|
123914
|
+
} of modules) {
|
|
123915
123915
|
const loadPlugin2 = async () => {
|
|
123916
123916
|
const plugin = await importPlugin2();
|
|
123917
123917
|
Object.assign(parsers2, plugin.parsers);
|
|
@@ -136881,7 +136881,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
|
|
|
136881
136881
|
return mapDoc2(doc2, (currentDoc) => cleanDocFn2(currentDoc));
|
|
136882
136882
|
}
|
|
136883
136883
|
function replaceEndOfLine2(doc2, replacement = literalline2) {
|
|
136884
|
-
return mapDoc2(doc2, (currentDoc) => typeof currentDoc === "string" ?
|
|
136884
|
+
return mapDoc2(doc2, (currentDoc) => typeof currentDoc === "string" ? join28(replacement, currentDoc.split(`
|
|
136885
136885
|
`)) : currentDoc);
|
|
136886
136886
|
}
|
|
136887
136887
|
function canBreakFn2(doc2) {
|
|
@@ -136967,7 +136967,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
|
|
|
136967
136967
|
negate: options8.negate
|
|
136968
136968
|
};
|
|
136969
136969
|
}
|
|
136970
|
-
function
|
|
136970
|
+
function join28(separator, docs) {
|
|
136971
136971
|
assertDoc2(separator);
|
|
136972
136972
|
assertDocArray2(docs);
|
|
136973
136973
|
const parts = [];
|
|
@@ -137632,7 +137632,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
|
|
|
137632
137632
|
}
|
|
137633
137633
|
}
|
|
137634
137634
|
var builders2 = {
|
|
137635
|
-
join:
|
|
137635
|
+
join: join28,
|
|
137636
137636
|
line: line3,
|
|
137637
137637
|
softline: softline2,
|
|
137638
137638
|
hardline: hardline4,
|
|
@@ -138287,11 +138287,11 @@ var require_prettier = __commonJS((exports, module) => {
|
|
|
138287
138287
|
var require_formatter = __commonJS((exports) => {
|
|
138288
138288
|
var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P9, generator) {
|
|
138289
138289
|
function adopt(value) {
|
|
138290
|
-
return value instanceof P9 ? value : new P9(function(
|
|
138291
|
-
|
|
138290
|
+
return value instanceof P9 ? value : new P9(function(resolve13) {
|
|
138291
|
+
resolve13(value);
|
|
138292
138292
|
});
|
|
138293
138293
|
}
|
|
138294
|
-
return new (P9 || (P9 = Promise))(function(
|
|
138294
|
+
return new (P9 || (P9 = Promise))(function(resolve13, reject) {
|
|
138295
138295
|
function fulfilled(value) {
|
|
138296
138296
|
try {
|
|
138297
138297
|
step(generator.next(value));
|
|
@@ -138307,7 +138307,7 @@ var require_formatter = __commonJS((exports) => {
|
|
|
138307
138307
|
}
|
|
138308
138308
|
}
|
|
138309
138309
|
function step(result) {
|
|
138310
|
-
result.done ?
|
|
138310
|
+
result.done ? resolve13(result.value) : adopt(result.value).then(fulfilled, rejected);
|
|
138311
138311
|
}
|
|
138312
138312
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
138313
138313
|
});
|
|
@@ -142960,7 +142960,7 @@ var require_url = __commonJS((exports) => {
|
|
|
142960
142960
|
};
|
|
142961
142961
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
142962
142962
|
exports.parse = undefined;
|
|
142963
|
-
exports.resolve =
|
|
142963
|
+
exports.resolve = resolve13;
|
|
142964
142964
|
exports.cwd = cwd;
|
|
142965
142965
|
exports.getProtocol = getProtocol;
|
|
142966
142966
|
exports.getExtension = getExtension;
|
|
@@ -142972,7 +142972,7 @@ var require_url = __commonJS((exports) => {
|
|
|
142972
142972
|
exports.fromFileSystemPath = fromFileSystemPath;
|
|
142973
142973
|
exports.toFileSystemPath = toFileSystemPath;
|
|
142974
142974
|
exports.safePointerToPath = safePointerToPath;
|
|
142975
|
-
exports.relative =
|
|
142975
|
+
exports.relative = relative4;
|
|
142976
142976
|
var convert_path_to_posix_1 = __importDefault(require_convert_path_to_posix());
|
|
142977
142977
|
var path_1 = __importStar(__require("path"));
|
|
142978
142978
|
var forwardSlashPattern = /\//g;
|
|
@@ -142988,7 +142988,7 @@ var require_url = __commonJS((exports) => {
|
|
|
142988
142988
|
var urlDecodePatterns = [/%23/g, "#", /%24/g, "$", /%26/g, "&", /%2C/g, ",", /%40/g, "@"];
|
|
142989
142989
|
var parse11 = (u4) => new URL(u4);
|
|
142990
142990
|
exports.parse = parse11;
|
|
142991
|
-
function
|
|
142991
|
+
function resolve13(from, to5) {
|
|
142992
142992
|
const fromUrl = new URL((0, convert_path_to_posix_1.default)(from), "https://aaa.nonexistanturl.com");
|
|
142993
142993
|
const resolvedUrl = new URL((0, convert_path_to_posix_1.default)(to5), fromUrl);
|
|
142994
142994
|
const endSpaces = to5.match(/(\s*)$/)?.[1] || "";
|
|
@@ -143122,9 +143122,9 @@ var require_url = __commonJS((exports) => {
|
|
|
143122
143122
|
return decodeURIComponent(value).replace(jsonPointerSlash, "/").replace(jsonPointerTilde, "~");
|
|
143123
143123
|
});
|
|
143124
143124
|
}
|
|
143125
|
-
function
|
|
143125
|
+
function relative4(from, to5) {
|
|
143126
143126
|
if (!isFileSystemPath(from) || !isFileSystemPath(to5)) {
|
|
143127
|
-
return
|
|
143127
|
+
return resolve13(from, to5);
|
|
143128
143128
|
}
|
|
143129
143129
|
const fromDir = path_1.default.dirname(stripHash(from));
|
|
143130
143130
|
const toPath4 = stripHash(to5);
|
|
@@ -143800,7 +143800,7 @@ var require_plugins = __commonJS((exports) => {
|
|
|
143800
143800
|
let plugin;
|
|
143801
143801
|
let lastError;
|
|
143802
143802
|
let index = 0;
|
|
143803
|
-
return new Promise((
|
|
143803
|
+
return new Promise((resolve13, reject) => {
|
|
143804
143804
|
runNextPlugin();
|
|
143805
143805
|
function runNextPlugin() {
|
|
143806
143806
|
plugin = plugins[index++];
|
|
@@ -143828,7 +143828,7 @@ var require_plugins = __commonJS((exports) => {
|
|
|
143828
143828
|
}
|
|
143829
143829
|
}
|
|
143830
143830
|
function onSuccess(result) {
|
|
143831
|
-
|
|
143831
|
+
resolve13({
|
|
143832
143832
|
plugin,
|
|
143833
143833
|
result
|
|
143834
143834
|
});
|
|
@@ -145161,11 +145161,11 @@ var require_lib3 = __commonJS((exports) => {
|
|
|
145161
145161
|
var require_resolver = __commonJS((exports) => {
|
|
145162
145162
|
var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P9, generator) {
|
|
145163
145163
|
function adopt(value) {
|
|
145164
|
-
return value instanceof P9 ? value : new P9(function(
|
|
145165
|
-
|
|
145164
|
+
return value instanceof P9 ? value : new P9(function(resolve13) {
|
|
145165
|
+
resolve13(value);
|
|
145166
145166
|
});
|
|
145167
145167
|
}
|
|
145168
|
-
return new (P9 || (P9 = Promise))(function(
|
|
145168
|
+
return new (P9 || (P9 = Promise))(function(resolve13, reject) {
|
|
145169
145169
|
function fulfilled(value) {
|
|
145170
145170
|
try {
|
|
145171
145171
|
step(generator.next(value));
|
|
@@ -145181,7 +145181,7 @@ var require_resolver = __commonJS((exports) => {
|
|
|
145181
145181
|
}
|
|
145182
145182
|
}
|
|
145183
145183
|
function step(result) {
|
|
145184
|
-
result.done ?
|
|
145184
|
+
result.done ? resolve13(result.value) : adopt(result.value).then(fulfilled, rejected);
|
|
145185
145185
|
}
|
|
145186
145186
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
145187
145187
|
});
|
|
@@ -145302,11 +145302,11 @@ var require_optionValidator = __commonJS((exports) => {
|
|
|
145302
145302
|
var require_src3 = __commonJS((exports) => {
|
|
145303
145303
|
var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P9, generator) {
|
|
145304
145304
|
function adopt(value) {
|
|
145305
|
-
return value instanceof P9 ? value : new P9(function(
|
|
145306
|
-
|
|
145305
|
+
return value instanceof P9 ? value : new P9(function(resolve13) {
|
|
145306
|
+
resolve13(value);
|
|
145307
145307
|
});
|
|
145308
145308
|
}
|
|
145309
|
-
return new (P9 || (P9 = Promise))(function(
|
|
145309
|
+
return new (P9 || (P9 = Promise))(function(resolve13, reject) {
|
|
145310
145310
|
function fulfilled(value) {
|
|
145311
145311
|
try {
|
|
145312
145312
|
step(generator.next(value));
|
|
@@ -145322,7 +145322,7 @@ var require_src3 = __commonJS((exports) => {
|
|
|
145322
145322
|
}
|
|
145323
145323
|
}
|
|
145324
145324
|
function step(result) {
|
|
145325
|
-
result.done ?
|
|
145325
|
+
result.done ? resolve13(result.value) : adopt(result.value).then(fulfilled, rejected);
|
|
145326
145326
|
}
|
|
145327
145327
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
145328
145328
|
});
|
|
@@ -146451,7 +146451,7 @@ var require_depd = __commonJS((exports, module) => {
|
|
|
146451
146451
|
* Copyright(c) 2014-2018 Douglas Christopher Wilson
|
|
146452
146452
|
* MIT Licensed
|
|
146453
146453
|
*/
|
|
146454
|
-
var
|
|
146454
|
+
var relative4 = __require("path").relative;
|
|
146455
146455
|
module.exports = depd;
|
|
146456
146456
|
var basePath = process.cwd();
|
|
146457
146457
|
function containsNamespace(str, namespace) {
|
|
@@ -146647,7 +146647,7 @@ var require_depd = __commonJS((exports, module) => {
|
|
|
146647
146647
|
return formatted;
|
|
146648
146648
|
}
|
|
146649
146649
|
function formatLocation(callSite) {
|
|
146650
|
-
return
|
|
146650
|
+
return relative4(basePath, callSite[0]) + ":" + callSite[1] + ":" + callSite[2];
|
|
146651
146651
|
}
|
|
146652
146652
|
function getStack() {
|
|
146653
146653
|
var limit = Error.stackTraceLimit;
|
|
@@ -150643,7 +150643,7 @@ var require_dbcs_data = __commonJS((exports, module) => {
|
|
|
150643
150643
|
// ../../node_modules/iconv-lite/encodings/index.js
|
|
150644
150644
|
var require_encodings = __commonJS((exports, module) => {
|
|
150645
150645
|
var mergeModules = require_merge_exports();
|
|
150646
|
-
var
|
|
150646
|
+
var modules = [
|
|
150647
150647
|
require_internal(),
|
|
150648
150648
|
require_utf32(),
|
|
150649
150649
|
require_utf16(),
|
|
@@ -150654,8 +150654,8 @@ var require_encodings = __commonJS((exports, module) => {
|
|
|
150654
150654
|
require_dbcs_codec(),
|
|
150655
150655
|
require_dbcs_data()
|
|
150656
150656
|
];
|
|
150657
|
-
for (i5 = 0;i5 <
|
|
150658
|
-
module =
|
|
150657
|
+
for (i5 = 0;i5 < modules.length; i5++) {
|
|
150658
|
+
module = modules[i5];
|
|
150659
150659
|
mergeModules(exports, module);
|
|
150660
150660
|
}
|
|
150661
150661
|
var module;
|
|
@@ -150984,11 +150984,11 @@ var require_raw_body = __commonJS((exports, module) => {
|
|
|
150984
150984
|
if (done) {
|
|
150985
150985
|
return readStream(stream, encoding, length, limit, wrap(done));
|
|
150986
150986
|
}
|
|
150987
|
-
return new Promise(function executor(
|
|
150987
|
+
return new Promise(function executor(resolve13, reject) {
|
|
150988
150988
|
readStream(stream, encoding, length, limit, function onRead2(err, buf) {
|
|
150989
150989
|
if (err)
|
|
150990
150990
|
return reject(err);
|
|
150991
|
-
|
|
150991
|
+
resolve13(buf);
|
|
150992
150992
|
});
|
|
150993
150993
|
});
|
|
150994
150994
|
}
|
|
@@ -160792,7 +160792,7 @@ var require_mime_types = __commonJS((exports) => {
|
|
|
160792
160792
|
* MIT Licensed
|
|
160793
160793
|
*/
|
|
160794
160794
|
var db2 = require_db();
|
|
160795
|
-
var
|
|
160795
|
+
var extname2 = __require("path").extname;
|
|
160796
160796
|
var mimeScore = require_mimeScore();
|
|
160797
160797
|
var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/;
|
|
160798
160798
|
var TEXT_TYPE_REGEXP = /^text\//i;
|
|
@@ -160849,7 +160849,7 @@ var require_mime_types = __commonJS((exports) => {
|
|
|
160849
160849
|
if (!path18 || typeof path18 !== "string") {
|
|
160850
160850
|
return false;
|
|
160851
160851
|
}
|
|
160852
|
-
var extension2 =
|
|
160852
|
+
var extension2 = extname2("x." + path18).toLowerCase().slice(1);
|
|
160853
160853
|
if (!extension2) {
|
|
160854
160854
|
return false;
|
|
160855
160855
|
}
|
|
@@ -164109,16 +164109,16 @@ var require_view = __commonJS((exports, module) => {
|
|
|
164109
164109
|
var debug = require_src4()("express:view");
|
|
164110
164110
|
var path18 = __require("node:path");
|
|
164111
164111
|
var fs28 = __require("node:fs");
|
|
164112
|
-
var
|
|
164112
|
+
var dirname20 = path18.dirname;
|
|
164113
164113
|
var basename7 = path18.basename;
|
|
164114
|
-
var
|
|
164115
|
-
var
|
|
164116
|
-
var
|
|
164114
|
+
var extname2 = path18.extname;
|
|
164115
|
+
var join29 = path18.join;
|
|
164116
|
+
var resolve13 = path18.resolve;
|
|
164117
164117
|
module.exports = View;
|
|
164118
164118
|
function View(name2, options8) {
|
|
164119
164119
|
var opts = options8 || {};
|
|
164120
164120
|
this.defaultEngine = opts.defaultEngine;
|
|
164121
|
-
this.ext =
|
|
164121
|
+
this.ext = extname2(name2);
|
|
164122
164122
|
this.name = name2;
|
|
164123
164123
|
this.root = opts.root;
|
|
164124
164124
|
if (!this.ext && !this.defaultEngine) {
|
|
@@ -164147,8 +164147,8 @@ var require_view = __commonJS((exports, module) => {
|
|
|
164147
164147
|
debug('lookup "%s"', name2);
|
|
164148
164148
|
for (var i5 = 0;i5 < roots.length && !path19; i5++) {
|
|
164149
164149
|
var root2 = roots[i5];
|
|
164150
|
-
var loc =
|
|
164151
|
-
var dir =
|
|
164150
|
+
var loc = resolve13(root2, name2);
|
|
164151
|
+
var dir = dirname20(loc);
|
|
164152
164152
|
var file2 = basename7(loc);
|
|
164153
164153
|
path19 = this.resolve(dir, file2);
|
|
164154
164154
|
}
|
|
@@ -164172,16 +164172,16 @@ var require_view = __commonJS((exports, module) => {
|
|
|
164172
164172
|
});
|
|
164173
164173
|
sync = false;
|
|
164174
164174
|
};
|
|
164175
|
-
View.prototype.resolve = function
|
|
164175
|
+
View.prototype.resolve = function resolve14(dir, file2) {
|
|
164176
164176
|
var ext = this.ext;
|
|
164177
|
-
var path19 =
|
|
164178
|
-
var
|
|
164179
|
-
if (
|
|
164177
|
+
var path19 = join29(dir, file2);
|
|
164178
|
+
var stat3 = tryStat(path19);
|
|
164179
|
+
if (stat3 && stat3.isFile()) {
|
|
164180
164180
|
return path19;
|
|
164181
164181
|
}
|
|
164182
|
-
path19 =
|
|
164183
|
-
|
|
164184
|
-
if (
|
|
164182
|
+
path19 = join29(dir, basename7(file2, ext), "index" + ext);
|
|
164183
|
+
stat3 = tryStat(path19);
|
|
164184
|
+
if (stat3 && stat3.isFile()) {
|
|
164185
164185
|
return path19;
|
|
164186
164186
|
}
|
|
164187
164187
|
};
|
|
@@ -164232,9 +164232,9 @@ var require_etag = __commonJS((exports, module) => {
|
|
|
164232
164232
|
}
|
|
164233
164233
|
return obj && typeof obj === "object" && "ctime" in obj && toString2.call(obj.ctime) === "[object Date]" && "mtime" in obj && toString2.call(obj.mtime) === "[object Date]" && "ino" in obj && typeof obj.ino === "number" && "size" in obj && typeof obj.size === "number";
|
|
164234
164234
|
}
|
|
164235
|
-
function stattag(
|
|
164236
|
-
var mtime =
|
|
164237
|
-
var size =
|
|
164235
|
+
function stattag(stat3) {
|
|
164236
|
+
var mtime = stat3.mtime.getTime().toString(16);
|
|
164237
|
+
var size = stat3.size.toString(16);
|
|
164238
164238
|
return '"' + size + "-" + mtime + '"';
|
|
164239
164239
|
}
|
|
164240
164240
|
});
|
|
@@ -166331,7 +166331,7 @@ var require_application = __commonJS((exports, module) => {
|
|
|
166331
166331
|
var compileETag = require_utils10().compileETag;
|
|
166332
166332
|
var compileQueryParser = require_utils10().compileQueryParser;
|
|
166333
166333
|
var compileTrust = require_utils10().compileTrust;
|
|
166334
|
-
var
|
|
166334
|
+
var resolve13 = __require("node:path").resolve;
|
|
166335
166335
|
var once9 = require_once();
|
|
166336
166336
|
var Router = require_router();
|
|
166337
166337
|
var slice = Array.prototype.slice;
|
|
@@ -166385,7 +166385,7 @@ var require_application = __commonJS((exports, module) => {
|
|
|
166385
166385
|
this.mountpath = "/";
|
|
166386
166386
|
this.locals.settings = this.settings;
|
|
166387
166387
|
this.set("view", View);
|
|
166388
|
-
this.set("views",
|
|
166388
|
+
this.set("views", resolve13("views"));
|
|
166389
166389
|
this.set("jsonp callback name", "callback");
|
|
166390
166390
|
if (env4 === "production") {
|
|
166391
166391
|
this.enable("view cache");
|
|
@@ -167873,11 +167873,11 @@ var require_send = __commonJS((exports, module) => {
|
|
|
167873
167873
|
var statuses = require_statuses();
|
|
167874
167874
|
var Stream2 = __require("stream");
|
|
167875
167875
|
var util2 = __require("util");
|
|
167876
|
-
var
|
|
167877
|
-
var
|
|
167876
|
+
var extname2 = path18.extname;
|
|
167877
|
+
var join29 = path18.join;
|
|
167878
167878
|
var normalize2 = path18.normalize;
|
|
167879
|
-
var
|
|
167880
|
-
var
|
|
167879
|
+
var resolve13 = path18.resolve;
|
|
167880
|
+
var sep = path18.sep;
|
|
167881
167881
|
var BYTES_RANGE_REGEXP = /^ *bytes=/;
|
|
167882
167882
|
var MAX_MAXAGE = 60 * 60 * 24 * 365 * 1000;
|
|
167883
167883
|
var UP_PATH_REGEXP = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
|
|
@@ -167905,7 +167905,7 @@ var require_send = __commonJS((exports, module) => {
|
|
|
167905
167905
|
this._maxage = opts.maxAge || opts.maxage;
|
|
167906
167906
|
this._maxage = typeof this._maxage === "string" ? ms9(this._maxage) : Number(this._maxage);
|
|
167907
167907
|
this._maxage = !isNaN(this._maxage) ? Math.min(Math.max(0, this._maxage), MAX_MAXAGE) : 0;
|
|
167908
|
-
this._root = opts.root ?
|
|
167908
|
+
this._root = opts.root ? resolve13(opts.root) : null;
|
|
167909
167909
|
}
|
|
167910
167910
|
util2.inherits(SendStream, Stream2);
|
|
167911
167911
|
SendStream.prototype.error = function error48(status, err) {
|
|
@@ -168038,23 +168038,23 @@ var require_send = __commonJS((exports, module) => {
|
|
|
168038
168038
|
var parts;
|
|
168039
168039
|
if (root2 !== null) {
|
|
168040
168040
|
if (path19) {
|
|
168041
|
-
path19 = normalize2("." +
|
|
168041
|
+
path19 = normalize2("." + sep + path19);
|
|
168042
168042
|
}
|
|
168043
168043
|
if (UP_PATH_REGEXP.test(path19)) {
|
|
168044
168044
|
debug('malicious path "%s"', path19);
|
|
168045
168045
|
this.error(403);
|
|
168046
168046
|
return res;
|
|
168047
168047
|
}
|
|
168048
|
-
parts = path19.split(
|
|
168049
|
-
path19 = normalize2(
|
|
168048
|
+
parts = path19.split(sep);
|
|
168049
|
+
path19 = normalize2(join29(root2, path19));
|
|
168050
168050
|
} else {
|
|
168051
168051
|
if (UP_PATH_REGEXP.test(path19)) {
|
|
168052
168052
|
debug('malicious path "%s"', path19);
|
|
168053
168053
|
this.error(403);
|
|
168054
168054
|
return res;
|
|
168055
168055
|
}
|
|
168056
|
-
parts = normalize2(path19).split(
|
|
168057
|
-
path19 =
|
|
168056
|
+
parts = normalize2(path19).split(sep);
|
|
168057
|
+
path19 = resolve13(path19);
|
|
168058
168058
|
}
|
|
168059
168059
|
if (containsDotFile(parts)) {
|
|
168060
168060
|
debug('%s dotfile "%s"', this._dotfiles, path19);
|
|
@@ -168077,8 +168077,8 @@ var require_send = __commonJS((exports, module) => {
|
|
|
168077
168077
|
this.sendFile(path19);
|
|
168078
168078
|
return res;
|
|
168079
168079
|
};
|
|
168080
|
-
SendStream.prototype.send = function send2(path19,
|
|
168081
|
-
var len =
|
|
168080
|
+
SendStream.prototype.send = function send2(path19, stat3) {
|
|
168081
|
+
var len = stat3.size;
|
|
168082
168082
|
var options8 = this.options;
|
|
168083
168083
|
var opts = {};
|
|
168084
168084
|
var res = this.res;
|
|
@@ -168090,7 +168090,7 @@ var require_send = __commonJS((exports, module) => {
|
|
|
168090
168090
|
return;
|
|
168091
168091
|
}
|
|
168092
168092
|
debug('pipe "%s"', path19);
|
|
168093
|
-
this.setHeader(path19,
|
|
168093
|
+
this.setHeader(path19, stat3);
|
|
168094
168094
|
this.type(path19);
|
|
168095
168095
|
if (this.isConditionalGET()) {
|
|
168096
168096
|
if (this.isPreconditionFailure()) {
|
|
@@ -168147,19 +168147,19 @@ var require_send = __commonJS((exports, module) => {
|
|
|
168147
168147
|
var i5 = 0;
|
|
168148
168148
|
var self2 = this;
|
|
168149
168149
|
debug('stat "%s"', path19);
|
|
168150
|
-
fs28.stat(path19, function onstat(err,
|
|
168151
|
-
var pathEndsWithSep = path19[path19.length - 1] ===
|
|
168152
|
-
if (err && err.code === "ENOENT" && !
|
|
168150
|
+
fs28.stat(path19, function onstat(err, stat3) {
|
|
168151
|
+
var pathEndsWithSep = path19[path19.length - 1] === sep;
|
|
168152
|
+
if (err && err.code === "ENOENT" && !extname2(path19) && !pathEndsWithSep) {
|
|
168153
168153
|
return next(err);
|
|
168154
168154
|
}
|
|
168155
168155
|
if (err)
|
|
168156
168156
|
return self2.onStatError(err);
|
|
168157
|
-
if (
|
|
168157
|
+
if (stat3.isDirectory())
|
|
168158
168158
|
return self2.redirect(path19);
|
|
168159
168159
|
if (pathEndsWithSep)
|
|
168160
168160
|
return self2.error(404);
|
|
168161
|
-
self2.emit("file", path19,
|
|
168162
|
-
self2.send(path19,
|
|
168161
|
+
self2.emit("file", path19, stat3);
|
|
168162
|
+
self2.send(path19, stat3);
|
|
168163
168163
|
});
|
|
168164
168164
|
function next(err) {
|
|
168165
168165
|
if (self2._extensions.length <= i5) {
|
|
@@ -168167,13 +168167,13 @@ var require_send = __commonJS((exports, module) => {
|
|
|
168167
168167
|
}
|
|
168168
168168
|
var p4 = path19 + "." + self2._extensions[i5++];
|
|
168169
168169
|
debug('stat "%s"', p4);
|
|
168170
|
-
fs28.stat(p4, function(err2,
|
|
168170
|
+
fs28.stat(p4, function(err2, stat3) {
|
|
168171
168171
|
if (err2)
|
|
168172
168172
|
return next(err2);
|
|
168173
|
-
if (
|
|
168173
|
+
if (stat3.isDirectory())
|
|
168174
168174
|
return next();
|
|
168175
|
-
self2.emit("file", p4,
|
|
168176
|
-
self2.send(p4,
|
|
168175
|
+
self2.emit("file", p4, stat3);
|
|
168176
|
+
self2.send(p4, stat3);
|
|
168177
168177
|
});
|
|
168178
168178
|
}
|
|
168179
168179
|
};
|
|
@@ -168186,15 +168186,15 @@ var require_send = __commonJS((exports, module) => {
|
|
|
168186
168186
|
return self2.onStatError(err);
|
|
168187
168187
|
return self2.error(404);
|
|
168188
168188
|
}
|
|
168189
|
-
var p4 =
|
|
168189
|
+
var p4 = join29(path19, self2._index[i5]);
|
|
168190
168190
|
debug('stat "%s"', p4);
|
|
168191
|
-
fs28.stat(p4, function(err2,
|
|
168191
|
+
fs28.stat(p4, function(err2, stat3) {
|
|
168192
168192
|
if (err2)
|
|
168193
168193
|
return next(err2);
|
|
168194
|
-
if (
|
|
168194
|
+
if (stat3.isDirectory())
|
|
168195
168195
|
return next();
|
|
168196
|
-
self2.emit("file", p4,
|
|
168197
|
-
self2.send(p4,
|
|
168196
|
+
self2.emit("file", p4, stat3);
|
|
168197
|
+
self2.send(p4, stat3);
|
|
168198
168198
|
});
|
|
168199
168199
|
}
|
|
168200
168200
|
next();
|
|
@@ -168221,14 +168221,14 @@ var require_send = __commonJS((exports, module) => {
|
|
|
168221
168221
|
var res = this.res;
|
|
168222
168222
|
if (res.getHeader("Content-Type"))
|
|
168223
168223
|
return;
|
|
168224
|
-
var ext =
|
|
168224
|
+
var ext = extname2(path19);
|
|
168225
168225
|
var type2 = mime.contentType(ext) || "application/octet-stream";
|
|
168226
168226
|
debug("content-type %s", type2);
|
|
168227
168227
|
res.setHeader("Content-Type", type2);
|
|
168228
168228
|
};
|
|
168229
|
-
SendStream.prototype.setHeader = function setHeader(path19,
|
|
168229
|
+
SendStream.prototype.setHeader = function setHeader(path19, stat3) {
|
|
168230
168230
|
var res = this.res;
|
|
168231
|
-
this.emit("headers", res, path19,
|
|
168231
|
+
this.emit("headers", res, path19, stat3);
|
|
168232
168232
|
if (this._acceptRanges && !res.getHeader("Accept-Ranges")) {
|
|
168233
168233
|
debug("accept ranges");
|
|
168234
168234
|
res.setHeader("Accept-Ranges", "bytes");
|
|
@@ -168242,12 +168242,12 @@ var require_send = __commonJS((exports, module) => {
|
|
|
168242
168242
|
res.setHeader("Cache-Control", cacheControl);
|
|
168243
168243
|
}
|
|
168244
168244
|
if (this._lastModified && !res.getHeader("Last-Modified")) {
|
|
168245
|
-
var modified =
|
|
168245
|
+
var modified = stat3.mtime.toUTCString();
|
|
168246
168246
|
debug("modified %s", modified);
|
|
168247
168247
|
res.setHeader("Last-Modified", modified);
|
|
168248
168248
|
}
|
|
168249
168249
|
if (this._etag && !res.getHeader("ETag")) {
|
|
168250
|
-
var val = etag(
|
|
168250
|
+
var val = etag(stat3);
|
|
168251
168251
|
debug("etag %s", val);
|
|
168252
168252
|
res.setHeader("ETag", val);
|
|
168253
168253
|
}
|
|
@@ -168381,8 +168381,8 @@ var require_response = __commonJS((exports, module) => {
|
|
|
168381
168381
|
var setCharset = require_utils10().setCharset;
|
|
168382
168382
|
var cookie = require_cookie();
|
|
168383
168383
|
var send = require_send();
|
|
168384
|
-
var
|
|
168385
|
-
var
|
|
168384
|
+
var extname2 = path18.extname;
|
|
168385
|
+
var resolve13 = path18.resolve;
|
|
168386
168386
|
var vary = require_vary();
|
|
168387
168387
|
var { Buffer: Buffer7 } = __require("node:buffer");
|
|
168388
168388
|
var res = Object.create(http.ServerResponse.prototype);
|
|
@@ -168591,7 +168591,7 @@ var require_response = __commonJS((exports, module) => {
|
|
|
168591
168591
|
}
|
|
168592
168592
|
opts = Object.create(opts);
|
|
168593
168593
|
opts.headers = headers;
|
|
168594
|
-
var fullPath = !opts.root ?
|
|
168594
|
+
var fullPath = !opts.root ? resolve13(path19) : path19;
|
|
168595
168595
|
return this.sendFile(fullPath, opts, done);
|
|
168596
168596
|
};
|
|
168597
168597
|
res.contentType = res.type = function contentType(type) {
|
|
@@ -168622,7 +168622,7 @@ var require_response = __commonJS((exports, module) => {
|
|
|
168622
168622
|
};
|
|
168623
168623
|
res.attachment = function attachment(filename) {
|
|
168624
168624
|
if (filename) {
|
|
168625
|
-
this.type(
|
|
168625
|
+
this.type(extname2(filename));
|
|
168626
168626
|
}
|
|
168627
168627
|
this.set("Content-Disposition", contentDisposition(filename));
|
|
168628
168628
|
return this;
|
|
@@ -168852,7 +168852,7 @@ var require_serve_static = __commonJS((exports, module) => {
|
|
|
168852
168852
|
var encodeUrl = require_encodeurl();
|
|
168853
168853
|
var escapeHtml = require_escape_html();
|
|
168854
168854
|
var parseUrl = require_parseurl();
|
|
168855
|
-
var
|
|
168855
|
+
var resolve13 = __require("path").resolve;
|
|
168856
168856
|
var send = require_send();
|
|
168857
168857
|
var url3 = __require("url");
|
|
168858
168858
|
module.exports = serveStatic;
|
|
@@ -168871,7 +168871,7 @@ var require_serve_static = __commonJS((exports, module) => {
|
|
|
168871
168871
|
throw new TypeError("option setHeaders must be function");
|
|
168872
168872
|
}
|
|
168873
168873
|
opts.maxage = opts.maxage || opts.maxAge || 0;
|
|
168874
|
-
opts.root =
|
|
168874
|
+
opts.root = resolve13(root2);
|
|
168875
168875
|
var onDirectory = redirect ? createRedirectDirectoryListener() : createNotFoundDirectoryListener();
|
|
168876
168876
|
return function serveStatic2(req, res, next) {
|
|
168877
168877
|
if (req.method !== "GET" && req.method !== "HEAD") {
|
|
@@ -169795,8 +169795,8 @@ var require_follow_redirects = __commonJS((exports, module) => {
|
|
|
169795
169795
|
}
|
|
169796
169796
|
return parsed;
|
|
169797
169797
|
}
|
|
169798
|
-
function resolveUrl(
|
|
169799
|
-
return useNativeURL ? new URL2(
|
|
169798
|
+
function resolveUrl(relative4, base) {
|
|
169799
|
+
return useNativeURL ? new URL2(relative4, base) : parseUrl(url3.resolve(base, relative4));
|
|
169800
169800
|
}
|
|
169801
169801
|
function validateUrl(input) {
|
|
169802
169802
|
if (/^\[/.test(input.hostname) && !/^\[[:0-9a-f]+\]$/i.test(input.hostname)) {
|
|
@@ -172245,8 +172245,8 @@ var require_executor = __commonJS((exports, module) => {
|
|
|
172245
172245
|
}
|
|
172246
172246
|
resetBuffer() {
|
|
172247
172247
|
this.buffer = new Waterfall;
|
|
172248
|
-
this.buffer.chain(new Promise((
|
|
172249
|
-
this._triggerBuffer =
|
|
172248
|
+
this.buffer.chain(new Promise((resolve13) => {
|
|
172249
|
+
this._triggerBuffer = resolve13;
|
|
172250
172250
|
}));
|
|
172251
172251
|
if (this.ready)
|
|
172252
172252
|
this._triggerBuffer();
|
|
@@ -173266,7 +173266,7 @@ var require_storage = __commonJS((exports, module) => {
|
|
|
173266
173266
|
throw e8;
|
|
173267
173267
|
}
|
|
173268
173268
|
};
|
|
173269
|
-
var writeFileLinesAsync = (filename, lines, mode = DEFAULT_FILE_MODE) => new Promise((
|
|
173269
|
+
var writeFileLinesAsync = (filename, lines, mode = DEFAULT_FILE_MODE) => new Promise((resolve13, reject) => {
|
|
173270
173270
|
try {
|
|
173271
173271
|
const stream = writeFileStream(filename, { mode });
|
|
173272
173272
|
const readable2 = Readable6.from(lines);
|
|
@@ -173283,7 +173283,7 @@ var require_storage = __commonJS((exports, module) => {
|
|
|
173283
173283
|
if (err)
|
|
173284
173284
|
reject(err);
|
|
173285
173285
|
else
|
|
173286
|
-
|
|
173286
|
+
resolve13();
|
|
173287
173287
|
});
|
|
173288
173288
|
});
|
|
173289
173289
|
readable2.on("error", (err) => {
|
|
@@ -173454,7 +173454,7 @@ var require_persistence = __commonJS((exports, module) => {
|
|
|
173454
173454
|
return { data: tdata, indexes };
|
|
173455
173455
|
}
|
|
173456
173456
|
treatRawStreamAsync(rawStream) {
|
|
173457
|
-
return new Promise((
|
|
173457
|
+
return new Promise((resolve13, reject) => {
|
|
173458
173458
|
const dataById = {};
|
|
173459
173459
|
const indexes = {};
|
|
173460
173460
|
let corruptItems = 0;
|
|
@@ -173497,7 +173497,7 @@ var require_persistence = __commonJS((exports, module) => {
|
|
|
173497
173497
|
}
|
|
173498
173498
|
}
|
|
173499
173499
|
const data = Object.values(dataById);
|
|
173500
|
-
|
|
173500
|
+
resolve13({ data, indexes });
|
|
173501
173501
|
});
|
|
173502
173502
|
lineStream.on("error", function(err) {
|
|
173503
173503
|
reject(err, null);
|
|
@@ -183030,7 +183030,7 @@ var require_mime_types2 = __commonJS((exports) => {
|
|
|
183030
183030
|
* MIT Licensed
|
|
183031
183031
|
*/
|
|
183032
183032
|
var db2 = require_db2();
|
|
183033
|
-
var
|
|
183033
|
+
var extname2 = __require("path").extname;
|
|
183034
183034
|
var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/;
|
|
183035
183035
|
var TEXT_TYPE_REGEXP = /^text\//i;
|
|
183036
183036
|
exports.charset = charset;
|
|
@@ -183085,7 +183085,7 @@ var require_mime_types2 = __commonJS((exports) => {
|
|
|
183085
183085
|
if (!path18 || typeof path18 !== "string") {
|
|
183086
183086
|
return false;
|
|
183087
183087
|
}
|
|
183088
|
-
var extension2 =
|
|
183088
|
+
var extension2 = extname2("x." + path18).toLowerCase().substr(1);
|
|
183089
183089
|
if (!extension2) {
|
|
183090
183090
|
return false;
|
|
183091
183091
|
}
|
|
@@ -193077,7 +193077,7 @@ var require_mime_types3 = __commonJS((exports) => {
|
|
|
193077
193077
|
* MIT Licensed
|
|
193078
193078
|
*/
|
|
193079
193079
|
var db2 = require_db3();
|
|
193080
|
-
var
|
|
193080
|
+
var extname2 = __require("path").extname;
|
|
193081
193081
|
var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/;
|
|
193082
193082
|
var TEXT_TYPE_REGEXP = /^text\//i;
|
|
193083
193083
|
exports.charset = charset;
|
|
@@ -193132,7 +193132,7 @@ var require_mime_types3 = __commonJS((exports) => {
|
|
|
193132
193132
|
if (!path18 || typeof path18 !== "string") {
|
|
193133
193133
|
return false;
|
|
193134
193134
|
}
|
|
193135
|
-
var extension2 =
|
|
193135
|
+
var extension2 = extname2("x." + path18).toLowerCase().substr(1);
|
|
193136
193136
|
if (!extension2) {
|
|
193137
193137
|
return false;
|
|
193138
193138
|
}
|
|
@@ -199108,13 +199108,13 @@ var require_broadcast_operator = __commonJS((exports) => {
|
|
|
199108
199108
|
return true;
|
|
199109
199109
|
}
|
|
199110
199110
|
emitWithAck(ev2, ...args) {
|
|
199111
|
-
return new Promise((
|
|
199111
|
+
return new Promise((resolve13, reject) => {
|
|
199112
199112
|
args.push((err, responses) => {
|
|
199113
199113
|
if (err) {
|
|
199114
199114
|
err.responses = responses;
|
|
199115
199115
|
return reject(err);
|
|
199116
199116
|
} else {
|
|
199117
|
-
return
|
|
199117
|
+
return resolve13(responses);
|
|
199118
199118
|
}
|
|
199119
199119
|
});
|
|
199120
199120
|
this.emit(ev2, ...args);
|
|
@@ -199302,12 +199302,12 @@ var require_socket2 = __commonJS((exports) => {
|
|
|
199302
199302
|
}
|
|
199303
199303
|
emitWithAck(ev2, ...args) {
|
|
199304
199304
|
const withErr = this.flags.timeout !== undefined;
|
|
199305
|
-
return new Promise((
|
|
199305
|
+
return new Promise((resolve13, reject) => {
|
|
199306
199306
|
args.push((arg1, arg2) => {
|
|
199307
199307
|
if (withErr) {
|
|
199308
|
-
return arg1 ? reject(arg1) :
|
|
199308
|
+
return arg1 ? reject(arg1) : resolve13(arg2);
|
|
199309
199309
|
} else {
|
|
199310
|
-
return
|
|
199310
|
+
return resolve13(arg1);
|
|
199311
199311
|
}
|
|
199312
199312
|
});
|
|
199313
199313
|
this.emit(ev2, ...args);
|
|
@@ -199762,13 +199762,13 @@ var require_namespace = __commonJS((exports) => {
|
|
|
199762
199762
|
return true;
|
|
199763
199763
|
}
|
|
199764
199764
|
serverSideEmitWithAck(ev2, ...args) {
|
|
199765
|
-
return new Promise((
|
|
199765
|
+
return new Promise((resolve13, reject) => {
|
|
199766
199766
|
args.push((err, responses) => {
|
|
199767
199767
|
if (err) {
|
|
199768
199768
|
err.responses = responses;
|
|
199769
199769
|
return reject(err);
|
|
199770
199770
|
} else {
|
|
199771
|
-
return
|
|
199771
|
+
return resolve13(responses);
|
|
199772
199772
|
}
|
|
199773
199773
|
});
|
|
199774
199774
|
this.serverSideEmit(ev2, ...args);
|
|
@@ -203303,7 +203303,7 @@ var require_cluster_adapter = __commonJS((exports) => {
|
|
|
203303
203303
|
return localSockets;
|
|
203304
203304
|
}
|
|
203305
203305
|
const requestId = randomId();
|
|
203306
|
-
return new Promise((
|
|
203306
|
+
return new Promise((resolve13, reject) => {
|
|
203307
203307
|
const timeout3 = setTimeout(() => {
|
|
203308
203308
|
const storedRequest2 = this.requests.get(requestId);
|
|
203309
203309
|
if (storedRequest2) {
|
|
@@ -203313,7 +203313,7 @@ var require_cluster_adapter = __commonJS((exports) => {
|
|
|
203313
203313
|
}, opts.flags.timeout || DEFAULT_TIMEOUT);
|
|
203314
203314
|
const storedRequest = {
|
|
203315
203315
|
type: MessageType.FETCH_SOCKETS,
|
|
203316
|
-
resolve:
|
|
203316
|
+
resolve: resolve13,
|
|
203317
203317
|
timeout: timeout3,
|
|
203318
203318
|
current: 0,
|
|
203319
203319
|
expected: expectedResponseCount,
|
|
@@ -203523,7 +203523,7 @@ var require_cluster_adapter = __commonJS((exports) => {
|
|
|
203523
203523
|
return localSockets;
|
|
203524
203524
|
}
|
|
203525
203525
|
const requestId = randomId();
|
|
203526
|
-
return new Promise((
|
|
203526
|
+
return new Promise((resolve13, reject) => {
|
|
203527
203527
|
const timeout3 = setTimeout(() => {
|
|
203528
203528
|
const storedRequest2 = this.customRequests.get(requestId);
|
|
203529
203529
|
if (storedRequest2) {
|
|
@@ -203533,7 +203533,7 @@ var require_cluster_adapter = __commonJS((exports) => {
|
|
|
203533
203533
|
}, opts.flags.timeout || DEFAULT_TIMEOUT);
|
|
203534
203534
|
const storedRequest = {
|
|
203535
203535
|
type: MessageType.FETCH_SOCKETS,
|
|
203536
|
-
resolve:
|
|
203536
|
+
resolve: resolve13,
|
|
203537
203537
|
timeout: timeout3,
|
|
203538
203538
|
missingUids: new Set([...this.nodesMap.keys()]),
|
|
203539
203539
|
responses: localSockets
|
|
@@ -204262,13 +204262,13 @@ var require_dist4 = __commonJS((exports, module) => {
|
|
|
204262
204262
|
this.engine.close();
|
|
204263
204263
|
(0, uws_1.restoreAdapter)();
|
|
204264
204264
|
if (this.httpServer) {
|
|
204265
|
-
return new Promise((
|
|
204265
|
+
return new Promise((resolve13) => {
|
|
204266
204266
|
this.httpServer.close((err) => {
|
|
204267
204267
|
fn9 && fn9(err);
|
|
204268
204268
|
if (err) {
|
|
204269
204269
|
debug("server was not running");
|
|
204270
204270
|
}
|
|
204271
|
-
|
|
204271
|
+
resolve13();
|
|
204272
204272
|
});
|
|
204273
204273
|
});
|
|
204274
204274
|
} else {
|
|
@@ -213004,7 +213004,7 @@ var require_mime_types4 = __commonJS((exports) => {
|
|
|
213004
213004
|
* MIT Licensed
|
|
213005
213005
|
*/
|
|
213006
213006
|
var db2 = require_db4();
|
|
213007
|
-
var
|
|
213007
|
+
var extname2 = __require("path").extname;
|
|
213008
213008
|
var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/;
|
|
213009
213009
|
var TEXT_TYPE_REGEXP = /^text\//i;
|
|
213010
213010
|
exports.charset = charset;
|
|
@@ -213059,7 +213059,7 @@ var require_mime_types4 = __commonJS((exports) => {
|
|
|
213059
213059
|
if (!path18 || typeof path18 !== "string") {
|
|
213060
213060
|
return false;
|
|
213061
213061
|
}
|
|
213062
|
-
var extension2 =
|
|
213062
|
+
var extension2 = extname2("x." + path18).toLowerCase().substr(1);
|
|
213063
213063
|
if (!extension2) {
|
|
213064
213064
|
return false;
|
|
213065
213065
|
}
|
|
@@ -217391,8 +217391,8 @@ var require_mkdirp = __commonJS((exports, module) => {
|
|
|
217391
217391
|
});
|
|
217392
217392
|
break;
|
|
217393
217393
|
default:
|
|
217394
|
-
xfs.stat(p4, function(er22,
|
|
217395
|
-
if (er22 || !
|
|
217394
|
+
xfs.stat(p4, function(er22, stat3) {
|
|
217395
|
+
if (er22 || !stat3.isDirectory())
|
|
217396
217396
|
cb2(er10, made);
|
|
217397
217397
|
else
|
|
217398
217398
|
cb2(null, made);
|
|
@@ -217423,13 +217423,13 @@ var require_mkdirp = __commonJS((exports, module) => {
|
|
|
217423
217423
|
sync(p4, opts, made);
|
|
217424
217424
|
break;
|
|
217425
217425
|
default:
|
|
217426
|
-
var
|
|
217426
|
+
var stat3;
|
|
217427
217427
|
try {
|
|
217428
|
-
|
|
217428
|
+
stat3 = xfs.statSync(p4);
|
|
217429
217429
|
} catch (err1) {
|
|
217430
217430
|
throw err0;
|
|
217431
217431
|
}
|
|
217432
|
-
if (!
|
|
217432
|
+
if (!stat3.isDirectory())
|
|
217433
217433
|
throw err0;
|
|
217434
217434
|
break;
|
|
217435
217435
|
}
|
|
@@ -217632,7 +217632,7 @@ var require_buffer_list = __commonJS((exports, module) => {
|
|
|
217632
217632
|
}
|
|
217633
217633
|
}, {
|
|
217634
217634
|
key: "join",
|
|
217635
|
-
value: function
|
|
217635
|
+
value: function join31(s5) {
|
|
217636
217636
|
if (this.length === 0)
|
|
217637
217637
|
return "";
|
|
217638
217638
|
var p4 = this.head;
|
|
@@ -218930,14 +218930,14 @@ var require_async_iterator = __commonJS((exports, module) => {
|
|
|
218930
218930
|
};
|
|
218931
218931
|
}
|
|
218932
218932
|
function readAndResolve(iter) {
|
|
218933
|
-
var
|
|
218934
|
-
if (
|
|
218933
|
+
var resolve13 = iter[kLastResolve];
|
|
218934
|
+
if (resolve13 !== null) {
|
|
218935
218935
|
var data = iter[kStream].read();
|
|
218936
218936
|
if (data !== null) {
|
|
218937
218937
|
iter[kLastPromise] = null;
|
|
218938
218938
|
iter[kLastResolve] = null;
|
|
218939
218939
|
iter[kLastReject] = null;
|
|
218940
|
-
|
|
218940
|
+
resolve13(createIterResult(data, false));
|
|
218941
218941
|
}
|
|
218942
218942
|
}
|
|
218943
218943
|
}
|
|
@@ -218945,13 +218945,13 @@ var require_async_iterator = __commonJS((exports, module) => {
|
|
|
218945
218945
|
process.nextTick(readAndResolve, iter);
|
|
218946
218946
|
}
|
|
218947
218947
|
function wrapForNext(lastPromise, iter) {
|
|
218948
|
-
return function(
|
|
218948
|
+
return function(resolve13, reject) {
|
|
218949
218949
|
lastPromise.then(function() {
|
|
218950
218950
|
if (iter[kEnded]) {
|
|
218951
|
-
|
|
218951
|
+
resolve13(createIterResult(undefined, true));
|
|
218952
218952
|
return;
|
|
218953
218953
|
}
|
|
218954
|
-
iter[kHandlePromise](
|
|
218954
|
+
iter[kHandlePromise](resolve13, reject);
|
|
218955
218955
|
}, reject);
|
|
218956
218956
|
};
|
|
218957
218957
|
}
|
|
@@ -218970,12 +218970,12 @@ var require_async_iterator = __commonJS((exports, module) => {
|
|
|
218970
218970
|
return Promise.resolve(createIterResult(undefined, true));
|
|
218971
218971
|
}
|
|
218972
218972
|
if (this[kStream].destroyed) {
|
|
218973
|
-
return new Promise(function(
|
|
218973
|
+
return new Promise(function(resolve13, reject) {
|
|
218974
218974
|
process.nextTick(function() {
|
|
218975
218975
|
if (_this[kError]) {
|
|
218976
218976
|
reject(_this[kError]);
|
|
218977
218977
|
} else {
|
|
218978
|
-
|
|
218978
|
+
resolve13(createIterResult(undefined, true));
|
|
218979
218979
|
}
|
|
218980
218980
|
});
|
|
218981
218981
|
});
|
|
@@ -218998,13 +218998,13 @@ var require_async_iterator = __commonJS((exports, module) => {
|
|
|
218998
218998
|
return this;
|
|
218999
218999
|
}), _defineProperty(_Object$setPrototypeO, "return", function _return() {
|
|
219000
219000
|
var _this2 = this;
|
|
219001
|
-
return new Promise(function(
|
|
219001
|
+
return new Promise(function(resolve13, reject) {
|
|
219002
219002
|
_this2[kStream].destroy(null, function(err) {
|
|
219003
219003
|
if (err) {
|
|
219004
219004
|
reject(err);
|
|
219005
219005
|
return;
|
|
219006
219006
|
}
|
|
219007
|
-
|
|
219007
|
+
resolve13(createIterResult(undefined, true));
|
|
219008
219008
|
});
|
|
219009
219009
|
});
|
|
219010
219010
|
}), _Object$setPrototypeO), AsyncIteratorPrototype);
|
|
@@ -219026,15 +219026,15 @@ var require_async_iterator = __commonJS((exports, module) => {
|
|
|
219026
219026
|
value: stream._readableState.endEmitted,
|
|
219027
219027
|
writable: true
|
|
219028
219028
|
}), _defineProperty(_Object$create, kHandlePromise, {
|
|
219029
|
-
value: function value(
|
|
219029
|
+
value: function value(resolve13, reject) {
|
|
219030
219030
|
var data = iterator[kStream].read();
|
|
219031
219031
|
if (data) {
|
|
219032
219032
|
iterator[kLastPromise] = null;
|
|
219033
219033
|
iterator[kLastResolve] = null;
|
|
219034
219034
|
iterator[kLastReject] = null;
|
|
219035
|
-
|
|
219035
|
+
resolve13(createIterResult(data, false));
|
|
219036
219036
|
} else {
|
|
219037
|
-
iterator[kLastResolve] =
|
|
219037
|
+
iterator[kLastResolve] = resolve13;
|
|
219038
219038
|
iterator[kLastReject] = reject;
|
|
219039
219039
|
}
|
|
219040
219040
|
},
|
|
@@ -219053,12 +219053,12 @@ var require_async_iterator = __commonJS((exports, module) => {
|
|
|
219053
219053
|
iterator[kError] = err;
|
|
219054
219054
|
return;
|
|
219055
219055
|
}
|
|
219056
|
-
var
|
|
219057
|
-
if (
|
|
219056
|
+
var resolve13 = iterator[kLastResolve];
|
|
219057
|
+
if (resolve13 !== null) {
|
|
219058
219058
|
iterator[kLastPromise] = null;
|
|
219059
219059
|
iterator[kLastResolve] = null;
|
|
219060
219060
|
iterator[kLastReject] = null;
|
|
219061
|
-
|
|
219061
|
+
resolve13(createIterResult(undefined, true));
|
|
219062
219062
|
}
|
|
219063
219063
|
iterator[kEnded] = true;
|
|
219064
219064
|
});
|
|
@@ -219070,7 +219070,7 @@ var require_async_iterator = __commonJS((exports, module) => {
|
|
|
219070
219070
|
|
|
219071
219071
|
// ../../node_modules/readable-stream/lib/internal/streams/from.js
|
|
219072
219072
|
var require_from = __commonJS((exports, module) => {
|
|
219073
|
-
function asyncGeneratorStep(gen,
|
|
219073
|
+
function asyncGeneratorStep(gen, resolve13, reject, _next, _throw, key2, arg) {
|
|
219074
219074
|
try {
|
|
219075
219075
|
var info = gen[key2](arg);
|
|
219076
219076
|
var value = info.value;
|
|
@@ -219079,7 +219079,7 @@ var require_from = __commonJS((exports, module) => {
|
|
|
219079
219079
|
return;
|
|
219080
219080
|
}
|
|
219081
219081
|
if (info.done) {
|
|
219082
|
-
|
|
219082
|
+
resolve13(value);
|
|
219083
219083
|
} else {
|
|
219084
219084
|
Promise.resolve(value).then(_next, _throw);
|
|
219085
219085
|
}
|
|
@@ -219087,13 +219087,13 @@ var require_from = __commonJS((exports, module) => {
|
|
|
219087
219087
|
function _asyncToGenerator(fn9) {
|
|
219088
219088
|
return function() {
|
|
219089
219089
|
var self2 = this, args = arguments;
|
|
219090
|
-
return new Promise(function(
|
|
219090
|
+
return new Promise(function(resolve13, reject) {
|
|
219091
219091
|
var gen = fn9.apply(self2, args);
|
|
219092
219092
|
function _next(value) {
|
|
219093
|
-
asyncGeneratorStep(gen,
|
|
219093
|
+
asyncGeneratorStep(gen, resolve13, reject, _next, _throw, "next", value);
|
|
219094
219094
|
}
|
|
219095
219095
|
function _throw(err) {
|
|
219096
|
-
asyncGeneratorStep(gen,
|
|
219096
|
+
asyncGeneratorStep(gen, resolve13, reject, _next, _throw, "throw", err);
|
|
219097
219097
|
}
|
|
219098
219098
|
_next(undefined);
|
|
219099
219099
|
});
|
|
@@ -221220,7 +221220,7 @@ var require_dist5 = __commonJS((exports, module) => {
|
|
|
221220
221220
|
determineAgent: () => determineAgent
|
|
221221
221221
|
});
|
|
221222
221222
|
module.exports = __toCommonJS2(src_exports);
|
|
221223
|
-
var
|
|
221223
|
+
var import_promises25 = __require("node:fs/promises");
|
|
221224
221224
|
var import_node_fs24 = __require("node:fs");
|
|
221225
221225
|
var DEVIN_LOCAL_PATH = "/opt/.devin";
|
|
221226
221226
|
var CURSOR2 = "cursor";
|
|
@@ -221278,7 +221278,7 @@ var require_dist5 = __commonJS((exports, module) => {
|
|
|
221278
221278
|
return { isAgent: true, agent: { name: REPLIT } };
|
|
221279
221279
|
}
|
|
221280
221280
|
try {
|
|
221281
|
-
await (0,
|
|
221281
|
+
await (0, import_promises25.access)(DEVIN_LOCAL_PATH, import_node_fs24.constants.F_OK);
|
|
221282
221282
|
return { isAgent: true, agent: { name: DEVIN } };
|
|
221283
221283
|
} catch (error48) {}
|
|
221284
221284
|
return { isAgent: false, agent: undefined };
|
|
@@ -237840,7 +237840,7 @@ function normalizeBase44Env() {
|
|
|
237840
237840
|
loadProjectEnvFiles();
|
|
237841
237841
|
|
|
237842
237842
|
// src/cli/index.ts
|
|
237843
|
-
import { dirname as
|
|
237843
|
+
import { dirname as dirname25, join as join36 } from "node:path";
|
|
237844
237844
|
import { fileURLToPath as fileURLToPath6 } from "node:url";
|
|
237845
237845
|
|
|
237846
237846
|
// ../../node_modules/@clack/core/dist/index.mjs
|
|
@@ -239048,7 +239048,7 @@ var {
|
|
|
239048
239048
|
} = import__.default;
|
|
239049
239049
|
|
|
239050
239050
|
// src/cli/commands/agent-skills/pull.ts
|
|
239051
|
-
import { dirname as
|
|
239051
|
+
import { dirname as dirname10, join as join17 } from "node:path";
|
|
239052
239052
|
// ../../node_modules/chalk/source/vendor/ansi-styles/index.js
|
|
239053
239053
|
var ANSI_BACKGROUND_OFFSET = 10;
|
|
239054
239054
|
var wrapAnsi16 = (offset = 0) => (code) => `\x1B[${code + offset}m`;
|
|
@@ -245663,26 +245663,18 @@ var PublishedUrlResponseSchema = exports_external.object({
|
|
|
245663
245663
|
});
|
|
245664
245664
|
var CreateDeploymentResponseSchema = exports_external.object({
|
|
245665
245665
|
deployment_id: exports_external.string(),
|
|
245666
|
-
asset_uploads: exports_external.
|
|
245667
|
-
exports_external.
|
|
245668
|
-
|
|
245669
|
-
|
|
245670
|
-
|
|
245671
|
-
|
|
245672
|
-
|
|
245673
|
-
|
|
245674
|
-
|
|
245675
|
-
uploads: exports_external.array(exports_external.object({
|
|
245676
|
-
path: exports_external.string(),
|
|
245677
|
-
content_type: exports_external.string(),
|
|
245678
|
-
content_length: exports_external.number(),
|
|
245679
|
-
url: exports_external.string()
|
|
245680
|
-
}))
|
|
245681
|
-
})
|
|
245682
|
-
]).nullable().optional()
|
|
245666
|
+
asset_uploads: exports_external.object({
|
|
245667
|
+
type: exports_external.literal("s3"),
|
|
245668
|
+
uploads: exports_external.array(exports_external.object({
|
|
245669
|
+
path: exports_external.string(),
|
|
245670
|
+
content_type: exports_external.string(),
|
|
245671
|
+
content_length: exports_external.number(),
|
|
245672
|
+
url: exports_external.string()
|
|
245673
|
+
}))
|
|
245674
|
+
}).nullable().optional()
|
|
245683
245675
|
}).transform((data) => ({
|
|
245684
245676
|
deploymentId: data.deployment_id,
|
|
245685
|
-
assetUploads: data.asset_uploads == null ? null :
|
|
245677
|
+
assetUploads: data.asset_uploads == null ? null : {
|
|
245686
245678
|
type: "s3",
|
|
245687
245679
|
uploads: data.asset_uploads.uploads.map((upload) => ({
|
|
245688
245680
|
path: upload.path,
|
|
@@ -245692,9 +245684,6 @@ var CreateDeploymentResponseSchema = exports_external.object({
|
|
|
245692
245684
|
}))
|
|
245693
245685
|
}
|
|
245694
245686
|
}));
|
|
245695
|
-
var AssetUploadResponseSchema = exports_external.looseObject({
|
|
245696
|
-
result: exports_external.looseObject({ jwt: exports_external.string().nullable().optional() }).nullable().optional()
|
|
245697
|
-
});
|
|
245698
245687
|
var FinalizeDeploymentResponseSchema = exports_external.object({
|
|
245699
245688
|
deployment_id: exports_external.string()
|
|
245700
245689
|
}).transform((data) => ({
|
|
@@ -248270,7 +248259,7 @@ async function createProjectFilesForExistingProject(options) {
|
|
|
248270
248259
|
};
|
|
248271
248260
|
}
|
|
248272
248261
|
// src/core/project/deploy.ts
|
|
248273
|
-
import { resolve as
|
|
248262
|
+
import { resolve as resolve3 } from "node:path";
|
|
248274
248263
|
|
|
248275
248264
|
// src/core/site/api.ts
|
|
248276
248265
|
async function uploadSite(archivePath) {
|
|
@@ -248294,13 +248283,6 @@ async function uploadSite(archivePath) {
|
|
|
248294
248283
|
}
|
|
248295
248284
|
return result.data;
|
|
248296
248285
|
}
|
|
248297
|
-
var MODULE_CONTENT_TYPES = {
|
|
248298
|
-
esm: "application/javascript+module",
|
|
248299
|
-
sourcemap: "application/source-map",
|
|
248300
|
-
wasm: "application/wasm",
|
|
248301
|
-
text: "text/plain",
|
|
248302
|
-
data: "application/octet-stream"
|
|
248303
|
-
};
|
|
248304
248286
|
async function createDeployment(request) {
|
|
248305
248287
|
const appClient = getAppClient();
|
|
248306
248288
|
let response;
|
|
@@ -248318,29 +248300,6 @@ async function createDeployment(request) {
|
|
|
248318
248300
|
}
|
|
248319
248301
|
return result.data;
|
|
248320
248302
|
}
|
|
248321
|
-
async function uploadAssetBucket(target, formData) {
|
|
248322
|
-
const response = await distribution_default.post(target.url, {
|
|
248323
|
-
searchParams: { base64: "true" },
|
|
248324
|
-
headers: { Authorization: `Bearer ${target.jwt}` },
|
|
248325
|
-
body: formData,
|
|
248326
|
-
timeout: 120000,
|
|
248327
|
-
retry: 0
|
|
248328
|
-
});
|
|
248329
|
-
const parsed = AssetUploadResponseSchema.safeParse(await response.json());
|
|
248330
|
-
const jwt3 = parsed.success ? parsed.data.result?.jwt : null;
|
|
248331
|
-
return jwt3 || null;
|
|
248332
|
-
}
|
|
248333
|
-
async function finalizeDeployment(deploymentId, completionJwt, modules) {
|
|
248334
|
-
const formData = new FormData;
|
|
248335
|
-
formData.append("payload", JSON.stringify({ completion_jwt: completionJwt }));
|
|
248336
|
-
for (const module of modules) {
|
|
248337
|
-
const content = await readFile(module.absolutePath);
|
|
248338
|
-
formData.append(module.name, new File([new Uint8Array(content)], module.name, {
|
|
248339
|
-
type: MODULE_CONTENT_TYPES[module.type]
|
|
248340
|
-
}));
|
|
248341
|
-
}
|
|
248342
|
-
return await postFinalize(deploymentId, formData);
|
|
248343
|
-
}
|
|
248344
248303
|
async function finalizeStaticDeployment(deploymentId, indexHtml) {
|
|
248345
248304
|
const formData = new FormData;
|
|
248346
248305
|
formData.append("index.html", new File([indexHtml], "index.html", { type: "text/html" }));
|
|
@@ -248403,13 +248362,10 @@ async function createArchive(pathToArchive, targetArchivePath) {
|
|
|
248403
248362
|
cwd: pathToArchive
|
|
248404
248363
|
}, ["."]);
|
|
248405
248364
|
}
|
|
248406
|
-
// src/core/site/deploy-app.ts
|
|
248407
|
-
import { resolve as resolve5 } from "node:path";
|
|
248408
|
-
|
|
248409
248365
|
// src/core/site/manifest.ts
|
|
248410
248366
|
import { createHash } from "node:crypto";
|
|
248411
248367
|
import { readFile as readFile2, stat } from "node:fs/promises";
|
|
248412
|
-
import { basename as basename4,
|
|
248368
|
+
import { basename as basename4, join as join15 } from "node:path";
|
|
248413
248369
|
var MAX_ASSET_SIZE_BYTES = 25 * 1024 * 1024;
|
|
248414
248370
|
var MAX_ASSET_COUNT = 1e5;
|
|
248415
248371
|
var ASSETS_IGNORE_FILE = ".assetsignore";
|
|
@@ -248418,39 +248374,6 @@ var ALWAYS_IGNORED = new Set([
|
|
|
248418
248374
|
"wrangler.json",
|
|
248419
248375
|
".dev.vars"
|
|
248420
248376
|
]);
|
|
248421
|
-
var MIME_TYPES = {
|
|
248422
|
-
".html": "text/html",
|
|
248423
|
-
".htm": "text/html",
|
|
248424
|
-
".css": "text/css",
|
|
248425
|
-
".js": "text/javascript",
|
|
248426
|
-
".mjs": "text/javascript",
|
|
248427
|
-
".json": "application/json",
|
|
248428
|
-
".map": "application/json",
|
|
248429
|
-
".txt": "text/plain",
|
|
248430
|
-
".xml": "application/xml",
|
|
248431
|
-
".svg": "image/svg+xml",
|
|
248432
|
-
".png": "image/png",
|
|
248433
|
-
".jpg": "image/jpeg",
|
|
248434
|
-
".jpeg": "image/jpeg",
|
|
248435
|
-
".gif": "image/gif",
|
|
248436
|
-
".webp": "image/webp",
|
|
248437
|
-
".avif": "image/avif",
|
|
248438
|
-
".ico": "image/x-icon",
|
|
248439
|
-
".woff": "font/woff",
|
|
248440
|
-
".woff2": "font/woff2",
|
|
248441
|
-
".ttf": "font/ttf",
|
|
248442
|
-
".otf": "font/otf",
|
|
248443
|
-
".eot": "application/vnd.ms-fontobject",
|
|
248444
|
-
".mp3": "audio/mpeg",
|
|
248445
|
-
".mp4": "video/mp4",
|
|
248446
|
-
".webm": "video/webm",
|
|
248447
|
-
".pdf": "application/pdf",
|
|
248448
|
-
".wasm": "application/wasm",
|
|
248449
|
-
".webmanifest": "application/manifest+json"
|
|
248450
|
-
};
|
|
248451
|
-
function getAssetContentType(filePath) {
|
|
248452
|
-
return MIME_TYPES[extname(filePath).toLowerCase()] ?? "application/octet-stream";
|
|
248453
|
-
}
|
|
248454
248377
|
function hashAsset(appId, content) {
|
|
248455
248378
|
return createHash("sha256").update(Buffer.from(appId, "utf8")).update(content).digest("hex").slice(0, 32);
|
|
248456
248379
|
}
|
|
@@ -248478,111 +248401,14 @@ async function buildAssetManifest(assetsDir, appId) {
|
|
|
248478
248401
|
const hash2 = hashAsset(appId, content);
|
|
248479
248402
|
manifest[`/${relativePath}`] = { hash: hash2, size };
|
|
248480
248403
|
if (!filesByHash.has(hash2)) {
|
|
248481
|
-
filesByHash.set(hash2, {
|
|
248482
|
-
absolutePath,
|
|
248483
|
-
hash: hash2,
|
|
248484
|
-
size,
|
|
248485
|
-
contentType: getAssetContentType(absolutePath)
|
|
248486
|
-
});
|
|
248404
|
+
filesByHash.set(hash2, { absolutePath, hash: hash2, size });
|
|
248487
248405
|
}
|
|
248488
248406
|
}
|
|
248489
248407
|
return { manifest, filesByHash };
|
|
248490
248408
|
}
|
|
248491
|
-
|
|
248492
|
-
|
|
248493
|
-
import {
|
|
248494
|
-
import { relative as relative3, resolve as resolve3, sep } from "node:path";
|
|
248495
|
-
var MAX_TOTAL_MODULE_BYTES = 40 * 1024 * 1024;
|
|
248496
|
-
var MODULE_IGNORE = ["wrangler.json", ".dev.vars"];
|
|
248497
|
-
var RULE_TYPE_TO_MODULE_TYPE = {
|
|
248498
|
-
ESModule: "esm",
|
|
248499
|
-
CompiledWasm: "wasm",
|
|
248500
|
-
Text: "text",
|
|
248501
|
-
Data: "data"
|
|
248502
|
-
};
|
|
248503
|
-
function toPosix(path11) {
|
|
248504
|
-
return path11.split(sep).join("/");
|
|
248505
|
-
}
|
|
248506
|
-
async function collectModules(config9) {
|
|
248507
|
-
const entryPath = resolve3(config9.configDir, config9.main);
|
|
248508
|
-
if (!await pathExists(entryPath)) {
|
|
248509
|
-
throw new InvalidInputError(`Worker entry module does not exist: ${entryPath} (from "main" in ${config9.configPath})`, {
|
|
248510
|
-
hints: [{ message: "Rebuild the project to regenerate the artifact" }]
|
|
248511
|
-
});
|
|
248512
|
-
}
|
|
248513
|
-
const modulesByName = new Map;
|
|
248514
|
-
const entryName = toPosix(relative3(config9.configDir, entryPath));
|
|
248515
|
-
modulesByName.set(entryName, {
|
|
248516
|
-
name: entryName,
|
|
248517
|
-
absolutePath: entryPath,
|
|
248518
|
-
size: 0,
|
|
248519
|
-
type: "esm"
|
|
248520
|
-
});
|
|
248521
|
-
const ignore = [...MODULE_IGNORE];
|
|
248522
|
-
if (config9.assetsDirectory?.startsWith(config9.configDir + sep)) {
|
|
248523
|
-
ignore.push(`${toPosix(relative3(config9.configDir, config9.assetsDirectory))}/**`);
|
|
248524
|
-
}
|
|
248525
|
-
for (const rule of config9.rules) {
|
|
248526
|
-
const type = RULE_TYPE_TO_MODULE_TYPE[rule.type];
|
|
248527
|
-
if (!type) {
|
|
248528
|
-
throw new InvalidInputError(`Unsupported module rule type "${rule.type}" in ${config9.configPath}. Supported: ${Object.keys(RULE_TYPE_TO_MODULE_TYPE).join(", ")}.`);
|
|
248529
|
-
}
|
|
248530
|
-
const matches = await globby(rule.globs, {
|
|
248531
|
-
cwd: config9.configDir,
|
|
248532
|
-
onlyFiles: true,
|
|
248533
|
-
dot: true,
|
|
248534
|
-
ignore
|
|
248535
|
-
});
|
|
248536
|
-
for (const match of matches.sort()) {
|
|
248537
|
-
if (!modulesByName.has(match)) {
|
|
248538
|
-
modulesByName.set(match, {
|
|
248539
|
-
name: match,
|
|
248540
|
-
absolutePath: resolve3(config9.configDir, match),
|
|
248541
|
-
size: 0,
|
|
248542
|
-
type
|
|
248543
|
-
});
|
|
248544
|
-
}
|
|
248545
|
-
}
|
|
248546
|
-
}
|
|
248547
|
-
if (config9.uploadSourceMaps) {
|
|
248548
|
-
const maps = await globby("**/*.map", {
|
|
248549
|
-
cwd: config9.configDir,
|
|
248550
|
-
onlyFiles: true,
|
|
248551
|
-
dot: true,
|
|
248552
|
-
ignore
|
|
248553
|
-
});
|
|
248554
|
-
for (const map2 of maps.sort()) {
|
|
248555
|
-
addSourcemap(modulesByName, config9.configDir, map2);
|
|
248556
|
-
}
|
|
248557
|
-
} else {
|
|
248558
|
-
for (const name2 of [...modulesByName.keys()]) {
|
|
248559
|
-
const mapName = `${name2}.map`;
|
|
248560
|
-
if (await pathExists(resolve3(config9.configDir, mapName))) {
|
|
248561
|
-
addSourcemap(modulesByName, config9.configDir, mapName);
|
|
248562
|
-
}
|
|
248563
|
-
}
|
|
248564
|
-
}
|
|
248565
|
-
const modules = [...modulesByName.values()];
|
|
248566
|
-
let totalBytes = 0;
|
|
248567
|
-
for (const module of modules) {
|
|
248568
|
-
module.size = (await stat2(module.absolutePath)).size;
|
|
248569
|
-
totalBytes += module.size;
|
|
248570
|
-
}
|
|
248571
|
-
if (totalBytes > MAX_TOTAL_MODULE_BYTES) {
|
|
248572
|
-
throw new InvalidInputError(`Worker modules total ${totalBytes} bytes, which exceeds the 40 MB limit for Base44 full-stack deploys.`);
|
|
248573
|
-
}
|
|
248574
|
-
return modules;
|
|
248575
|
-
}
|
|
248576
|
-
function addSourcemap(modulesByName, configDir, name2) {
|
|
248577
|
-
if (modulesByName.has(name2))
|
|
248578
|
-
return;
|
|
248579
|
-
modulesByName.set(name2, {
|
|
248580
|
-
name: name2,
|
|
248581
|
-
absolutePath: resolve3(configDir, name2),
|
|
248582
|
-
size: 0,
|
|
248583
|
-
type: "sourcemap"
|
|
248584
|
-
});
|
|
248585
|
-
}
|
|
248409
|
+
// src/core/site/static-site.ts
|
|
248410
|
+
import { readFile as readFile4 } from "node:fs/promises";
|
|
248411
|
+
import { join as join16 } from "node:path";
|
|
248586
248412
|
|
|
248587
248413
|
// src/core/site/upload.ts
|
|
248588
248414
|
import { readFile as readFile3 } from "node:fs/promises";
|
|
@@ -248618,7 +248444,7 @@ async function pMap(iterable, mapper, {
|
|
|
248618
248444
|
const cleanup = () => {
|
|
248619
248445
|
signal?.removeEventListener("abort", signalListener);
|
|
248620
248446
|
};
|
|
248621
|
-
const
|
|
248447
|
+
const resolve3 = (value) => {
|
|
248622
248448
|
resolve_(value);
|
|
248623
248449
|
cleanup();
|
|
248624
248450
|
};
|
|
@@ -248651,7 +248477,7 @@ async function pMap(iterable, mapper, {
|
|
|
248651
248477
|
}
|
|
248652
248478
|
isResolved = true;
|
|
248653
248479
|
if (skippedIndexesMap.size === 0) {
|
|
248654
|
-
|
|
248480
|
+
resolve3(result);
|
|
248655
248481
|
return;
|
|
248656
248482
|
}
|
|
248657
248483
|
const pureResult = [];
|
|
@@ -248661,7 +248487,7 @@ async function pMap(iterable, mapper, {
|
|
|
248661
248487
|
}
|
|
248662
248488
|
pureResult.push(value);
|
|
248663
248489
|
}
|
|
248664
|
-
|
|
248490
|
+
resolve3(pureResult);
|
|
248665
248491
|
}
|
|
248666
248492
|
return;
|
|
248667
248493
|
}
|
|
@@ -248716,64 +248542,6 @@ var DEFAULT_UPLOAD_CONCURRENCY = 3;
|
|
|
248716
248542
|
var MAX_UPLOAD_CONCURRENCY = 50;
|
|
248717
248543
|
var MAX_UPLOAD_ATTEMPTS = 3;
|
|
248718
248544
|
var RETRY_BASE_DELAY_MS = 500;
|
|
248719
|
-
var MAX_RATE_LIMIT_WAITS = 10;
|
|
248720
|
-
var RATE_LIMIT_DELAY_MS = 15000;
|
|
248721
|
-
async function uploadAssetBuckets(target, filesByHash, options = {}) {
|
|
248722
|
-
const { concurrency = DEFAULT_UPLOAD_CONCURRENCY, onProgress } = options;
|
|
248723
|
-
const { buckets } = target;
|
|
248724
|
-
const totalFiles = buckets.reduce((sum, bucket) => sum + bucket.length, 0);
|
|
248725
|
-
let uploadedFiles = 0;
|
|
248726
|
-
let completionJwt = null;
|
|
248727
|
-
await pMap(buckets, async (bucket) => {
|
|
248728
|
-
const jwt3 = await uploadBucketWithRetry(target, bucket, filesByHash);
|
|
248729
|
-
if (jwt3) {
|
|
248730
|
-
completionJwt = jwt3;
|
|
248731
|
-
}
|
|
248732
|
-
uploadedFiles += bucket.length;
|
|
248733
|
-
onProgress?.({ uploadedFiles, totalFiles });
|
|
248734
|
-
}, { concurrency });
|
|
248735
|
-
if (!completionJwt) {
|
|
248736
|
-
throw new ApiError("Asset upload finished but the server did not return a completion token.");
|
|
248737
|
-
}
|
|
248738
|
-
return completionJwt;
|
|
248739
|
-
}
|
|
248740
|
-
async function uploadBucketWithRetry(target, bucket, filesByHash) {
|
|
248741
|
-
let lastError;
|
|
248742
|
-
let rateLimitWaits = 0;
|
|
248743
|
-
const formData = await buildBucketForm(bucket, filesByHash);
|
|
248744
|
-
for (let attempt = 0;attempt < MAX_UPLOAD_ATTEMPTS; attempt++) {
|
|
248745
|
-
if (attempt > 0) {
|
|
248746
|
-
await sleep3(RETRY_BASE_DELAY_MS * 2 ** (attempt - 1));
|
|
248747
|
-
}
|
|
248748
|
-
try {
|
|
248749
|
-
return await uploadAssetBucket(target, formData);
|
|
248750
|
-
} catch (error48) {
|
|
248751
|
-
if (error48 instanceof HTTPError && error48.response.status === 429 && rateLimitWaits < MAX_RATE_LIMIT_WAITS) {
|
|
248752
|
-
rateLimitWaits++;
|
|
248753
|
-
attempt--;
|
|
248754
|
-
await sleep3(RATE_LIMIT_DELAY_MS);
|
|
248755
|
-
continue;
|
|
248756
|
-
}
|
|
248757
|
-
lastError = error48;
|
|
248758
|
-
}
|
|
248759
|
-
}
|
|
248760
|
-
if (lastError instanceof HTTPError && (lastError.response.status === 401 || lastError.response.status === 403)) {
|
|
248761
|
-
throw new ApiError("This deploy's upload session has expired — rerun deploy. Already-uploaded assets are skipped on the next attempt.", { statusCode: lastError.response.status, cause: lastError });
|
|
248762
|
-
}
|
|
248763
|
-
throw await ApiError.fromHttpError(lastError, "uploading assets to Cloudflare");
|
|
248764
|
-
}
|
|
248765
|
-
async function buildBucketForm(bucket, filesByHash) {
|
|
248766
|
-
const formData = new FormData;
|
|
248767
|
-
for (const hash2 of bucket) {
|
|
248768
|
-
const file2 = filesByHash.get(hash2);
|
|
248769
|
-
if (!file2) {
|
|
248770
|
-
throw new InternalError(`Server requested upload of unknown asset hash: ${hash2}`);
|
|
248771
|
-
}
|
|
248772
|
-
const content = await readFile3(file2.absolutePath);
|
|
248773
|
-
formData.append(hash2, new File([content.toString("base64")], hash2, { type: file2.contentType }));
|
|
248774
|
-
}
|
|
248775
|
-
return formData;
|
|
248776
|
-
}
|
|
248777
248545
|
async function uploadPresignedAssets(uploads, assets, options = {}) {
|
|
248778
248546
|
const { concurrency = DEFAULT_UPLOAD_CONCURRENCY, onProgress } = options;
|
|
248779
248547
|
let uploadedFiles = 0;
|
|
@@ -248804,154 +248572,366 @@ async function uploadPresignedAsset(upload, assets) {
|
|
|
248804
248572
|
throw await ApiError.fromHttpError(error48, "uploading static assets");
|
|
248805
248573
|
}
|
|
248806
248574
|
}
|
|
248807
|
-
function sleep3(ms) {
|
|
248808
|
-
return new Promise((resolve4) => setTimeout(resolve4, ms));
|
|
248809
|
-
}
|
|
248810
248575
|
|
|
248811
|
-
// src/core/site/
|
|
248812
|
-
|
|
248813
|
-
|
|
248814
|
-
|
|
248815
|
-
|
|
248816
|
-
});
|
|
248817
|
-
|
|
248818
|
-
|
|
248819
|
-
|
|
248820
|
-
|
|
248821
|
-
|
|
248822
|
-
|
|
248823
|
-
|
|
248824
|
-
|
|
248825
|
-
|
|
248826
|
-
|
|
248827
|
-
|
|
248828
|
-
|
|
248829
|
-
|
|
248830
|
-
compatibility_flags: exports_external.array(exports_external.string()).optional(),
|
|
248831
|
-
vars: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
|
|
248832
|
-
upload_source_maps: exports_external.boolean().optional()
|
|
248833
|
-
});
|
|
248834
|
-
async function detectFullStackArtifact(projectRoot) {
|
|
248835
|
-
const redirectPath = join16(projectRoot, WRANGLER_REDIRECT_PATH);
|
|
248836
|
-
return await pathExists(redirectPath) ? redirectPath : null;
|
|
248837
|
-
}
|
|
248838
|
-
async function resolveWranglerConfig(projectRoot) {
|
|
248839
|
-
const redirectPath = await detectFullStackArtifact(projectRoot);
|
|
248840
|
-
if (!redirectPath) {
|
|
248841
|
-
throw new InvalidInputError("No full-stack build artifact found. Expected a .wrangler/deploy/config.json redirect file.", {
|
|
248842
|
-
hints: [{ message: "Run your framework's build command first" }]
|
|
248576
|
+
// src/core/site/static-site.ts
|
|
248577
|
+
async function deployStaticSite(options) {
|
|
248578
|
+
const { outputDir, gitHash, concurrency, progress } = options;
|
|
248579
|
+
const assets = await buildAssetManifest(outputDir, getAppContext().id);
|
|
248580
|
+
if (!assets.manifest["/index.html"]) {
|
|
248581
|
+
throw new InvalidInputError(`No index.html found in "${outputDir}" — a static site needs one at the output directory root.`);
|
|
248582
|
+
}
|
|
248583
|
+
const created = await createDeployment({
|
|
248584
|
+
git_hash: gitHash,
|
|
248585
|
+
asset_manifest: assets.manifest
|
|
248586
|
+
});
|
|
248587
|
+
progress?.onAssets?.({
|
|
248588
|
+
totalAssets: Object.keys(assets.manifest).length,
|
|
248589
|
+
newAssets: created.assetUploads?.uploads.length ?? 0
|
|
248590
|
+
});
|
|
248591
|
+
if (created.assetUploads) {
|
|
248592
|
+
await uploadPresignedAssets(created.assetUploads.uploads, assets, {
|
|
248593
|
+
concurrency,
|
|
248594
|
+
onProgress: progress?.onAssetUpload
|
|
248843
248595
|
});
|
|
248844
248596
|
}
|
|
248845
|
-
const
|
|
248846
|
-
const
|
|
248847
|
-
|
|
248848
|
-
|
|
248849
|
-
|
|
248597
|
+
const indexHtml = await readFile4(join16(outputDir, "index.html"));
|
|
248598
|
+
const finalized = await finalizeStaticDeployment(created.deploymentId, new Uint8Array(indexHtml));
|
|
248599
|
+
return { deploymentId: finalized.deploymentId };
|
|
248600
|
+
}
|
|
248601
|
+
// src/core/project/deploy.ts
|
|
248602
|
+
function hasResourcesToDeploy(projectData) {
|
|
248603
|
+
const {
|
|
248604
|
+
project,
|
|
248605
|
+
entities,
|
|
248606
|
+
functions,
|
|
248607
|
+
agents,
|
|
248608
|
+
agentSkills,
|
|
248609
|
+
connectors,
|
|
248610
|
+
authConfig
|
|
248611
|
+
} = projectData;
|
|
248612
|
+
const hasSite = Boolean(project.site?.outputDirectory);
|
|
248613
|
+
const hasEntities = entities.length > 0;
|
|
248614
|
+
const hasFunctions = functions.length > 0;
|
|
248615
|
+
const hasAgents = agents.length > 0;
|
|
248616
|
+
const hasAgentSkills = agentSkills.length > 0;
|
|
248617
|
+
const hasConnectors = connectors.length > 0;
|
|
248618
|
+
const hasAuthConfig = authConfig.length > 0;
|
|
248619
|
+
const hasVisibility = Boolean(project.visibility);
|
|
248620
|
+
return hasEntities || hasFunctions || hasAgents || hasAgentSkills || hasConnectors || hasAuthConfig || hasVisibility || hasSite;
|
|
248621
|
+
}
|
|
248622
|
+
async function deployAll(projectData, options) {
|
|
248623
|
+
const {
|
|
248624
|
+
project,
|
|
248625
|
+
entities,
|
|
248626
|
+
functions,
|
|
248627
|
+
agents,
|
|
248628
|
+
agentSkills,
|
|
248629
|
+
connectors,
|
|
248630
|
+
authConfig
|
|
248631
|
+
} = projectData;
|
|
248632
|
+
await setAppVisibility(project.visibility);
|
|
248633
|
+
if (project.visibility) {
|
|
248634
|
+
options?.onVisibilitySet?.(project.visibility);
|
|
248635
|
+
}
|
|
248636
|
+
await entityResource.push(entities);
|
|
248637
|
+
await deployFunctionsSequentially(functions, {
|
|
248638
|
+
onStart: options?.onFunctionStart,
|
|
248639
|
+
onResult: options?.onFunctionResult
|
|
248640
|
+
});
|
|
248641
|
+
await agentSkillResource.push(agentSkills);
|
|
248642
|
+
await agentResource.push(agents);
|
|
248643
|
+
await authConfigResource.push(authConfig);
|
|
248644
|
+
const skipConnectorSync = connectors.length === 0 && hasWorkspaceApiKeyAuth();
|
|
248645
|
+
const connectorResults = skipConnectorSync ? [] : (await pushConnectors(connectors)).results;
|
|
248646
|
+
if (project.site?.outputDirectory) {
|
|
248647
|
+
const outputDir = resolve3(project.root, project.site.outputDirectory);
|
|
248648
|
+
const { appUrl } = await deploySite(outputDir);
|
|
248649
|
+
return { appUrl, connectorResults };
|
|
248850
248650
|
}
|
|
248851
|
-
|
|
248852
|
-
|
|
248853
|
-
|
|
248651
|
+
return { connectorResults };
|
|
248652
|
+
}
|
|
248653
|
+
// src/core/clients/base44-client.ts
|
|
248654
|
+
var retriedRequests = new WeakSet;
|
|
248655
|
+
async function captureRequestBody(request, options) {
|
|
248656
|
+
if (request.body == null) {
|
|
248657
|
+
return;
|
|
248854
248658
|
}
|
|
248855
|
-
|
|
248856
|
-
|
|
248857
|
-
|
|
248858
|
-
|
|
248859
|
-
|
|
248860
|
-
main: config9.main,
|
|
248861
|
-
assetsDirectory,
|
|
248862
|
-
assetsConfig: config9.assets ? toResolvedAssetsConfig(config9.assets) : null,
|
|
248863
|
-
compatibilityDate: config9.compatibility_date ?? null,
|
|
248864
|
-
compatibilityFlags: config9.compatibility_flags ?? [],
|
|
248865
|
-
vars: config9.vars ?? {},
|
|
248866
|
-
rules: (config9.rules ?? []).map((rule) => ({
|
|
248867
|
-
type: rule.type,
|
|
248868
|
-
globs: rule.globs
|
|
248869
|
-
})),
|
|
248870
|
-
uploadSourceMaps: config9.upload_source_maps ?? false
|
|
248871
|
-
};
|
|
248659
|
+
try {
|
|
248660
|
+
const cloned = request.clone();
|
|
248661
|
+
const text = await cloned.text();
|
|
248662
|
+
options.context.__requestBody = text;
|
|
248663
|
+
} catch {}
|
|
248872
248664
|
}
|
|
248873
|
-
async function
|
|
248874
|
-
|
|
248875
|
-
|
|
248876
|
-
if (!result.success) {
|
|
248877
|
-
throw new ConfigInvalidError(`Invalid deploy redirect file: ${exports_external.prettifyError(result.error)}`, redirectPath);
|
|
248665
|
+
async function handleUnauthorized(request, _options, response) {
|
|
248666
|
+
if (response.status !== 401) {
|
|
248667
|
+
return;
|
|
248878
248668
|
}
|
|
248879
|
-
|
|
248880
|
-
|
|
248881
|
-
throw new ConfigInvalidError(`Wrangler config referenced by ${redirectPath} does not exist: ${configPath}`, redirectPath, {
|
|
248882
|
-
hints: [{ message: "Rebuild the project to regenerate the artifact" }]
|
|
248883
|
-
});
|
|
248669
|
+
if (hasWorkspaceApiKeyAuth()) {
|
|
248670
|
+
return;
|
|
248884
248671
|
}
|
|
248885
|
-
|
|
248672
|
+
if (retriedRequests.has(request)) {
|
|
248673
|
+
return;
|
|
248674
|
+
}
|
|
248675
|
+
const newAccessToken = await refreshAndSaveTokens();
|
|
248676
|
+
if (!newAccessToken) {
|
|
248677
|
+
return;
|
|
248678
|
+
}
|
|
248679
|
+
retriedRequests.add(request);
|
|
248680
|
+
const requestId = request.headers.get("X-Request-ID");
|
|
248681
|
+
return distribution_default(request.clone(), {
|
|
248682
|
+
headers: {
|
|
248683
|
+
...requestId && { "X-Request-ID": requestId },
|
|
248684
|
+
Authorization: `Bearer ${newAccessToken}`
|
|
248685
|
+
}
|
|
248686
|
+
});
|
|
248886
248687
|
}
|
|
248887
|
-
|
|
248888
|
-
|
|
248889
|
-
|
|
248890
|
-
|
|
248891
|
-
|
|
248892
|
-
|
|
248893
|
-
|
|
248894
|
-
|
|
248688
|
+
var base44Client = distribution_default.create({
|
|
248689
|
+
prefixUrl: getBase44ApiUrl(),
|
|
248690
|
+
headers: {
|
|
248691
|
+
"User-Agent": "Base44 CLI"
|
|
248692
|
+
},
|
|
248693
|
+
hooks: {
|
|
248694
|
+
beforeRequest: [
|
|
248695
|
+
(request) => {
|
|
248696
|
+
request.headers.set("X-Request-ID", randomUUID2());
|
|
248697
|
+
},
|
|
248698
|
+
captureRequestBody,
|
|
248699
|
+
async (request) => {
|
|
248700
|
+
const workspaceApiKey = getWorkspaceApiKeyFromEnv();
|
|
248701
|
+
if (workspaceApiKey && isWorkspaceApiKey(workspaceApiKey)) {
|
|
248702
|
+
request.headers.set("api_key", workspaceApiKey);
|
|
248703
|
+
return;
|
|
248704
|
+
}
|
|
248705
|
+
try {
|
|
248706
|
+
const auth = await readAuth();
|
|
248707
|
+
if (isTokenExpired(auth)) {
|
|
248708
|
+
const newAccessToken = await refreshAndSaveTokens();
|
|
248709
|
+
if (newAccessToken) {
|
|
248710
|
+
request.headers.set("Authorization", `Bearer ${newAccessToken}`);
|
|
248711
|
+
return;
|
|
248712
|
+
}
|
|
248713
|
+
}
|
|
248714
|
+
request.headers.set("Authorization", `Bearer ${auth.accessToken}`);
|
|
248715
|
+
} catch {}
|
|
248716
|
+
}
|
|
248717
|
+
],
|
|
248718
|
+
afterResponse: [handleUnauthorized]
|
|
248719
|
+
}
|
|
248720
|
+
});
|
|
248721
|
+
function getAppClient() {
|
|
248722
|
+
const { id } = getAppContext();
|
|
248723
|
+
return base44Client.extend({
|
|
248724
|
+
prefixUrl: new URL(`/api/apps/${id}/`, getBase44ApiUrl()).href
|
|
248725
|
+
});
|
|
248895
248726
|
}
|
|
248896
|
-
|
|
248897
|
-
|
|
248898
|
-
|
|
248899
|
-
|
|
248900
|
-
|
|
248901
|
-
|
|
248902
|
-
|
|
248727
|
+
function getSandboxClient(appId) {
|
|
248728
|
+
return base44Client.extend({
|
|
248729
|
+
prefixUrl: new URL(`/api/apps/${appId}/sandbox-bridge/`, getBase44ApiUrl()).href
|
|
248730
|
+
});
|
|
248731
|
+
}
|
|
248732
|
+
// src/core/clients/oauth-client.ts
|
|
248733
|
+
import { randomUUID as randomUUID3 } from "node:crypto";
|
|
248734
|
+
var oauthClient = distribution_default.create({
|
|
248735
|
+
prefixUrl: getBase44ApiUrl(),
|
|
248736
|
+
headers: {
|
|
248737
|
+
"User-Agent": "Base44 CLI"
|
|
248738
|
+
},
|
|
248739
|
+
hooks: {
|
|
248740
|
+
beforeRequest: [
|
|
248741
|
+
(request) => {
|
|
248742
|
+
request.headers.set("X-Request-ID", randomUUID3());
|
|
248743
|
+
}
|
|
248744
|
+
]
|
|
248903
248745
|
}
|
|
248904
|
-
|
|
248905
|
-
|
|
248746
|
+
});
|
|
248747
|
+
// src/core/auth/api.ts
|
|
248748
|
+
async function generateDeviceCode() {
|
|
248749
|
+
const response = await oauthClient.post("oauth/device/code", {
|
|
248750
|
+
json: {
|
|
248751
|
+
client_id: AUTH_CLIENT_ID,
|
|
248752
|
+
scope: "apps:read apps:write sandbox:write"
|
|
248753
|
+
},
|
|
248754
|
+
throwHttpErrors: false
|
|
248755
|
+
});
|
|
248756
|
+
if (!response.ok) {
|
|
248757
|
+
throw new ApiError(`Failed to generate device code: ${response.status} ${response.statusText}`, { statusCode: response.status });
|
|
248906
248758
|
}
|
|
248907
|
-
const
|
|
248908
|
-
|
|
248909
|
-
|
|
248910
|
-
assets = await buildAssetManifest(config9.assetsDirectory, getAppContext().id);
|
|
248759
|
+
const result = DeviceCodeResponseSchema.safeParse(await response.json());
|
|
248760
|
+
if (!result.success) {
|
|
248761
|
+
throw new SchemaValidationError("Invalid device code response from server", result.error);
|
|
248911
248762
|
}
|
|
248912
|
-
|
|
248913
|
-
|
|
248914
|
-
|
|
248915
|
-
|
|
248916
|
-
|
|
248917
|
-
|
|
248918
|
-
|
|
248763
|
+
return result.data;
|
|
248764
|
+
}
|
|
248765
|
+
async function getTokenFromDeviceCode(deviceCode) {
|
|
248766
|
+
const searchParams = new URLSearchParams;
|
|
248767
|
+
searchParams.set("grant_type", "urn:ietf:params:oauth:grant-type:device_code");
|
|
248768
|
+
searchParams.set("device_code", deviceCode);
|
|
248769
|
+
searchParams.set("client_id", AUTH_CLIENT_ID);
|
|
248770
|
+
const response = await oauthClient.post("oauth/token", {
|
|
248771
|
+
body: searchParams.toString(),
|
|
248772
|
+
headers: {
|
|
248773
|
+
"Content-Type": "application/x-www-form-urlencoded"
|
|
248919
248774
|
},
|
|
248920
|
-
|
|
248775
|
+
throwHttpErrors: false
|
|
248921
248776
|
});
|
|
248922
|
-
|
|
248923
|
-
|
|
248777
|
+
const json2 = await response.json();
|
|
248778
|
+
if (!response.ok) {
|
|
248779
|
+
const errorResult = OAuthErrorSchema.safeParse(json2);
|
|
248780
|
+
if (!errorResult.success) {
|
|
248781
|
+
throw new SchemaValidationError("Token request failed", errorResult.error);
|
|
248782
|
+
}
|
|
248783
|
+
const { error: error48, error_description } = errorResult.data;
|
|
248784
|
+
if (error48 === "authorization_pending" || error48 === "slow_down") {
|
|
248785
|
+
return null;
|
|
248786
|
+
}
|
|
248787
|
+
throw new ApiError(error_description ?? `OAuth error: ${error48}`, {
|
|
248788
|
+
statusCode: response.status
|
|
248789
|
+
});
|
|
248924
248790
|
}
|
|
248925
|
-
const
|
|
248926
|
-
|
|
248927
|
-
|
|
248928
|
-
|
|
248929
|
-
|
|
248930
|
-
onProgress: progress?.onAssetUpload
|
|
248931
|
-
}) : null;
|
|
248932
|
-
progress?.onWorker?.({ moduleCount: modules.length });
|
|
248933
|
-
const finalized = await finalizeDeployment(created.deploymentId, completionJwt, modules);
|
|
248934
|
-
return { deploymentId: finalized.deploymentId, gitHash };
|
|
248791
|
+
const result = TokenResponseSchema.safeParse(json2);
|
|
248792
|
+
if (!result.success) {
|
|
248793
|
+
throw new SchemaValidationError("Invalid token response from server", result.error);
|
|
248794
|
+
}
|
|
248795
|
+
return result.data;
|
|
248935
248796
|
}
|
|
248936
|
-
function
|
|
248937
|
-
|
|
248938
|
-
|
|
248939
|
-
|
|
248940
|
-
|
|
248797
|
+
async function renewAccessToken(refreshToken) {
|
|
248798
|
+
const searchParams = new URLSearchParams;
|
|
248799
|
+
searchParams.set("grant_type", "refresh_token");
|
|
248800
|
+
searchParams.set("refresh_token", refreshToken);
|
|
248801
|
+
searchParams.set("client_id", AUTH_CLIENT_ID);
|
|
248802
|
+
const response = await oauthClient.post("oauth/token", {
|
|
248803
|
+
body: searchParams.toString(),
|
|
248804
|
+
headers: {
|
|
248805
|
+
"Content-Type": "application/x-www-form-urlencoded"
|
|
248806
|
+
},
|
|
248807
|
+
throwHttpErrors: false
|
|
248808
|
+
});
|
|
248809
|
+
const json2 = await response.json();
|
|
248810
|
+
if (!response.ok) {
|
|
248811
|
+
const errorResult = OAuthErrorSchema.safeParse(json2);
|
|
248812
|
+
if (!errorResult.success) {
|
|
248813
|
+
throw new ApiError(`Token refresh failed: ${response.statusText}`, {
|
|
248814
|
+
statusCode: response.status
|
|
248815
|
+
});
|
|
248816
|
+
}
|
|
248817
|
+
const { error: error48, error_description } = errorResult.data;
|
|
248818
|
+
throw new ApiError(error_description ?? `OAuth error: ${error48}`, {
|
|
248819
|
+
statusCode: response.status
|
|
248820
|
+
});
|
|
248941
248821
|
}
|
|
248942
|
-
|
|
248943
|
-
if (
|
|
248944
|
-
|
|
248945
|
-
} else {
|
|
248946
|
-
runWorkerFirst = assetsConfig.runWorkerFirst;
|
|
248822
|
+
const result = TokenResponseSchema.safeParse(json2);
|
|
248823
|
+
if (!result.success) {
|
|
248824
|
+
throw new SchemaValidationError("Invalid token response from server", result.error);
|
|
248947
248825
|
}
|
|
248826
|
+
return result.data;
|
|
248827
|
+
}
|
|
248828
|
+
async function getUserInfo(accessToken) {
|
|
248829
|
+
const response = await oauthClient.get("oauth/userinfo", {
|
|
248830
|
+
headers: { Authorization: `Bearer ${accessToken}` }
|
|
248831
|
+
});
|
|
248832
|
+
if (!response.ok) {
|
|
248833
|
+
throw new ApiError(`Failed to fetch user info: ${response.status}`, {
|
|
248834
|
+
statusCode: response.status
|
|
248835
|
+
});
|
|
248836
|
+
}
|
|
248837
|
+
const result = UserInfoSchema.safeParse(await response.json());
|
|
248838
|
+
if (!result.success) {
|
|
248839
|
+
throw new SchemaValidationError("Invalid UserInfo response from server", result.error);
|
|
248840
|
+
}
|
|
248841
|
+
return result.data;
|
|
248842
|
+
}
|
|
248843
|
+
// src/cli/commands/auth/login-flow.ts
|
|
248844
|
+
async function generateAndDisplayDeviceCode(log, runTask) {
|
|
248845
|
+
const deviceCodeResponse = await runTask("Generating device code...", async () => {
|
|
248846
|
+
return await generateDeviceCode();
|
|
248847
|
+
}, {
|
|
248848
|
+
successMessage: "Device code generated",
|
|
248849
|
+
errorMessage: "Failed to generate device code"
|
|
248850
|
+
});
|
|
248851
|
+
log.info(`Verification code: ${theme.styles.bold(deviceCodeResponse.userCode)}` + `
|
|
248852
|
+
Please confirm this code at: ${deviceCodeResponse.verificationUri}`);
|
|
248853
|
+
return deviceCodeResponse;
|
|
248854
|
+
}
|
|
248855
|
+
async function waitForAuthentication(deviceCode, expiresIn, interval, runTask) {
|
|
248856
|
+
let tokenResponse;
|
|
248857
|
+
try {
|
|
248858
|
+
await runTask("Waiting for authentication...", async () => {
|
|
248859
|
+
await pWaitFor(async () => {
|
|
248860
|
+
const result = await getTokenFromDeviceCode(deviceCode);
|
|
248861
|
+
if (result !== null) {
|
|
248862
|
+
tokenResponse = result;
|
|
248863
|
+
return true;
|
|
248864
|
+
}
|
|
248865
|
+
return false;
|
|
248866
|
+
}, {
|
|
248867
|
+
interval: interval * 1000,
|
|
248868
|
+
timeout: expiresIn * 1000
|
|
248869
|
+
});
|
|
248870
|
+
}, {
|
|
248871
|
+
successMessage: "Authentication completed!",
|
|
248872
|
+
errorMessage: "Authentication failed"
|
|
248873
|
+
});
|
|
248874
|
+
} catch (error48) {
|
|
248875
|
+
if (error48 instanceof Error && error48.message.includes("timed out")) {
|
|
248876
|
+
throw new AuthExpiredError("Authentication timed out. Please try again.");
|
|
248877
|
+
}
|
|
248878
|
+
throw error48;
|
|
248879
|
+
}
|
|
248880
|
+
if (tokenResponse === undefined) {
|
|
248881
|
+
throw new InternalError("Failed to retrieve authentication token.");
|
|
248882
|
+
}
|
|
248883
|
+
return tokenResponse;
|
|
248884
|
+
}
|
|
248885
|
+
async function saveAuthData(response, userInfo) {
|
|
248886
|
+
const expiresAt = Date.now() + response.expiresIn * 1000;
|
|
248887
|
+
await writeAuth({
|
|
248888
|
+
accessToken: response.accessToken,
|
|
248889
|
+
refreshToken: response.refreshToken,
|
|
248890
|
+
expiresAt,
|
|
248891
|
+
email: userInfo.email,
|
|
248892
|
+
name: userInfo.name
|
|
248893
|
+
});
|
|
248894
|
+
}
|
|
248895
|
+
async function login({
|
|
248896
|
+
log,
|
|
248897
|
+
runTask
|
|
248898
|
+
}) {
|
|
248899
|
+
const deviceCodeResponse = await generateAndDisplayDeviceCode(log, runTask);
|
|
248900
|
+
const token = await waitForAuthentication(deviceCodeResponse.deviceCode, deviceCodeResponse.expiresIn, deviceCodeResponse.interval, runTask);
|
|
248901
|
+
const userInfo = await getUserInfo(token.accessToken);
|
|
248902
|
+
await saveAuthData(token, userInfo);
|
|
248948
248903
|
return {
|
|
248949
|
-
|
|
248950
|
-
not_found_handling: assetsConfig.notFoundHandling,
|
|
248951
|
-
run_worker_first: runWorkerFirst
|
|
248904
|
+
outroMessage: `Successfully logged in as ${theme.styles.bold(userInfo.email)}`
|
|
248952
248905
|
};
|
|
248953
248906
|
}
|
|
248954
248907
|
|
|
248908
|
+
// src/cli/utils/command/middleware.ts
|
|
248909
|
+
async function ensureAuth(ctx) {
|
|
248910
|
+
if (hasWorkspaceApiKeyAuth()) {
|
|
248911
|
+
ctx.errorReporter.setContext({
|
|
248912
|
+
user: { email: "workspace-api-key", name: "Workspace API key" }
|
|
248913
|
+
});
|
|
248914
|
+
return;
|
|
248915
|
+
}
|
|
248916
|
+
await seedAuthFromEnv();
|
|
248917
|
+
const loggedIn = await isLoggedIn();
|
|
248918
|
+
if (!loggedIn) {
|
|
248919
|
+
ctx.log.info("You need to login first to continue.");
|
|
248920
|
+
await login(ctx);
|
|
248921
|
+
}
|
|
248922
|
+
try {
|
|
248923
|
+
const userInfo = await readAuth();
|
|
248924
|
+
ctx.errorReporter.setContext({
|
|
248925
|
+
user: { email: userInfo.email, name: userInfo.name }
|
|
248926
|
+
});
|
|
248927
|
+
} catch {}
|
|
248928
|
+
}
|
|
248929
|
+
async function ensureAppContext(ctx, options = {}) {
|
|
248930
|
+
const appContext = await initAppContext(options);
|
|
248931
|
+
ctx.app = appContext;
|
|
248932
|
+
ctx.errorReporter.setContext({ appId: appContext.id });
|
|
248933
|
+
}
|
|
248934
|
+
|
|
248955
248935
|
// ../../node_modules/is-plain-obj/index.js
|
|
248956
248936
|
function isPlainObject2(value) {
|
|
248957
248937
|
if (typeof value !== "object" || value === null) {
|
|
@@ -249049,13 +249029,13 @@ var getJoinLength = (uint8Arrays) => {
|
|
|
249049
249029
|
var isTemplateString = (templates) => Array.isArray(templates) && Array.isArray(templates.raw);
|
|
249050
249030
|
var parseTemplates = (templates, expressions) => {
|
|
249051
249031
|
let tokens = [];
|
|
249052
|
-
for (const [index,
|
|
249032
|
+
for (const [index, template2] of templates.entries()) {
|
|
249053
249033
|
tokens = parseTemplate({
|
|
249054
249034
|
templates,
|
|
249055
249035
|
expressions,
|
|
249056
249036
|
tokens,
|
|
249057
249037
|
index,
|
|
249058
|
-
template
|
|
249038
|
+
template: template2
|
|
249059
249039
|
});
|
|
249060
249040
|
}
|
|
249061
249041
|
if (tokens.length === 0) {
|
|
@@ -249064,11 +249044,11 @@ var parseTemplates = (templates, expressions) => {
|
|
|
249064
249044
|
const [file2, ...commandArguments] = tokens;
|
|
249065
249045
|
return [file2, commandArguments, {}];
|
|
249066
249046
|
};
|
|
249067
|
-
var parseTemplate = ({ templates, expressions, tokens, index, template }) => {
|
|
249068
|
-
if (
|
|
249047
|
+
var parseTemplate = ({ templates, expressions, tokens, index, template: template2 }) => {
|
|
249048
|
+
if (template2 === undefined) {
|
|
249069
249049
|
throw new TypeError(`Invalid backslash sequence: ${templates.raw[index]}`);
|
|
249070
249050
|
}
|
|
249071
|
-
const { nextTokens, leadingWhitespaces, trailingWhitespaces } = splitByWhitespaces(
|
|
249051
|
+
const { nextTokens, leadingWhitespaces, trailingWhitespaces } = splitByWhitespaces(template2, templates.raw[index]);
|
|
249072
249052
|
const newTokens = concatTokens(tokens, nextTokens, leadingWhitespaces);
|
|
249073
249053
|
if (index === expressions.length) {
|
|
249074
249054
|
return newTokens;
|
|
@@ -249077,18 +249057,18 @@ var parseTemplate = ({ templates, expressions, tokens, index, template }) => {
|
|
|
249077
249057
|
const expressionTokens = Array.isArray(expression) ? expression.map((expression2) => parseExpression(expression2)) : [parseExpression(expression)];
|
|
249078
249058
|
return concatTokens(newTokens, expressionTokens, trailingWhitespaces);
|
|
249079
249059
|
};
|
|
249080
|
-
var splitByWhitespaces = (
|
|
249060
|
+
var splitByWhitespaces = (template2, rawTemplate) => {
|
|
249081
249061
|
if (rawTemplate.length === 0) {
|
|
249082
249062
|
return { nextTokens: [], leadingWhitespaces: false, trailingWhitespaces: false };
|
|
249083
249063
|
}
|
|
249084
249064
|
const nextTokens = [];
|
|
249085
249065
|
let templateStart = 0;
|
|
249086
249066
|
const leadingWhitespaces = DELIMITERS.has(rawTemplate[0]);
|
|
249087
|
-
for (let templateIndex = 0, rawIndex = 0;templateIndex <
|
|
249067
|
+
for (let templateIndex = 0, rawIndex = 0;templateIndex < template2.length; templateIndex += 1, rawIndex += 1) {
|
|
249088
249068
|
const rawCharacter = rawTemplate[rawIndex];
|
|
249089
249069
|
if (DELIMITERS.has(rawCharacter)) {
|
|
249090
249070
|
if (templateStart !== templateIndex) {
|
|
249091
|
-
nextTokens.push(
|
|
249071
|
+
nextTokens.push(template2.slice(templateStart, templateIndex));
|
|
249092
249072
|
}
|
|
249093
249073
|
templateStart = templateIndex + 1;
|
|
249094
249074
|
} else if (rawCharacter === "\\") {
|
|
@@ -249104,9 +249084,9 @@ var splitByWhitespaces = (template, rawTemplate) => {
|
|
|
249104
249084
|
}
|
|
249105
249085
|
}
|
|
249106
249086
|
}
|
|
249107
|
-
const trailingWhitespaces = templateStart ===
|
|
249087
|
+
const trailingWhitespaces = templateStart === template2.length;
|
|
249108
249088
|
if (!trailingWhitespaces) {
|
|
249109
|
-
nextTokens.push(
|
|
249089
|
+
nextTokens.push(template2.slice(templateStart));
|
|
249110
249090
|
}
|
|
249111
249091
|
return { nextTokens, leadingWhitespaces, trailingWhitespaces };
|
|
249112
249092
|
};
|
|
@@ -250500,8 +250480,8 @@ var disconnect = (anyProcess) => {
|
|
|
250500
250480
|
// ../../node_modules/execa/lib/utils/deferred.js
|
|
250501
250481
|
var createDeferred = () => {
|
|
250502
250482
|
const methods = {};
|
|
250503
|
-
const promise2 = new Promise((
|
|
250504
|
-
Object.assign(methods, { resolve:
|
|
250483
|
+
const promise2 = new Promise((resolve4, reject) => {
|
|
250484
|
+
Object.assign(methods, { resolve: resolve4, reject });
|
|
250505
250485
|
});
|
|
250506
250486
|
return Object.assign(promise2, methods);
|
|
250507
250487
|
};
|
|
@@ -254865,11 +254845,11 @@ var addConcurrentStream = (concurrentStreams, stream, waitName) => {
|
|
|
254865
254845
|
const promises = weakMap.get(stream);
|
|
254866
254846
|
const promise2 = createDeferred();
|
|
254867
254847
|
promises.push(promise2);
|
|
254868
|
-
const
|
|
254869
|
-
return { resolve:
|
|
254848
|
+
const resolve4 = promise2.resolve.bind(promise2);
|
|
254849
|
+
return { resolve: resolve4, promises };
|
|
254870
254850
|
};
|
|
254871
|
-
var waitForConcurrentStreams = async ({ resolve:
|
|
254872
|
-
|
|
254851
|
+
var waitForConcurrentStreams = async ({ resolve: resolve4, promises }, subprocess) => {
|
|
254852
|
+
resolve4();
|
|
254873
254853
|
const [isSubprocessExit] = await Promise.race([
|
|
254874
254854
|
Promise.allSettled([true, subprocess]),
|
|
254875
254855
|
Promise.all([false, ...promises])
|
|
@@ -255448,454 +255428,6 @@ var {
|
|
|
255448
255428
|
getCancelSignal: getCancelSignal2
|
|
255449
255429
|
} = getIpcExport();
|
|
255450
255430
|
|
|
255451
|
-
// src/core/utils/git.ts
|
|
255452
|
-
var GIT_HASH_PATTERN = /^[a-fA-F0-9]{7,64}$/;
|
|
255453
|
-
function isGitCommitHash(value) {
|
|
255454
|
-
return GIT_HASH_PATTERN.test(value);
|
|
255455
|
-
}
|
|
255456
|
-
|
|
255457
|
-
// src/core/site/git-hash.ts
|
|
255458
|
-
async function resolveGitHash(projectRoot, explicit) {
|
|
255459
|
-
const hash2 = explicit ?? await gitHead(projectRoot);
|
|
255460
|
-
if (!hash2 || !isGitCommitHash(hash2)) {
|
|
255461
|
-
throw new InvalidInputError(explicit ? `'${explicit}' is not a git commit hash.` : "Deployments are addressed by the commit that produced the build, and no git commit was found.", {
|
|
255462
|
-
hints: [
|
|
255463
|
-
{
|
|
255464
|
-
message: "Run the deploy from a git checkout, or pass the commit explicitly with --git-hash."
|
|
255465
|
-
}
|
|
255466
|
-
]
|
|
255467
|
-
});
|
|
255468
|
-
}
|
|
255469
|
-
return hash2;
|
|
255470
|
-
}
|
|
255471
|
-
async function gitHead(projectRoot) {
|
|
255472
|
-
try {
|
|
255473
|
-
const { stdout } = await execa("git", ["rev-parse", "HEAD"], {
|
|
255474
|
-
cwd: projectRoot
|
|
255475
|
-
});
|
|
255476
|
-
return stdout.trim();
|
|
255477
|
-
} catch {
|
|
255478
|
-
return null;
|
|
255479
|
-
}
|
|
255480
|
-
}
|
|
255481
|
-
|
|
255482
|
-
// src/core/site/static-site.ts
|
|
255483
|
-
import { readFile as readFile4 } from "node:fs/promises";
|
|
255484
|
-
import { join as join17 } from "node:path";
|
|
255485
|
-
var STATIC_DEPLOYMENTS_ENV = "BASE44_STATIC_DEPLOYMENTS";
|
|
255486
|
-
function staticDeploymentsEnabled(env2 = process.env) {
|
|
255487
|
-
const value = env2[STATIC_DEPLOYMENTS_ENV];
|
|
255488
|
-
return value === "1" || value === "true";
|
|
255489
|
-
}
|
|
255490
|
-
async function deployStaticSite(options) {
|
|
255491
|
-
const { outputDir, gitHash, concurrency, progress } = options;
|
|
255492
|
-
const assets = await buildAssetManifest(outputDir, getAppContext().id);
|
|
255493
|
-
if (!assets.manifest["/index.html"]) {
|
|
255494
|
-
throw new InvalidInputError(`No index.html found in "${outputDir}" — a static site needs one at the output directory root.`);
|
|
255495
|
-
}
|
|
255496
|
-
const created = await createDeployment({
|
|
255497
|
-
git_hash: gitHash,
|
|
255498
|
-
asset_manifest: assets.manifest
|
|
255499
|
-
});
|
|
255500
|
-
if (created.assetUploads && created.assetUploads.type !== "s3") {
|
|
255501
|
-
throw new ApiError(`The server answered a static-site deploy with the "${created.assetUploads.type}" upload target.`);
|
|
255502
|
-
}
|
|
255503
|
-
const totalAssets = Object.keys(assets.manifest).length;
|
|
255504
|
-
progress?.onAssets?.({
|
|
255505
|
-
totalAssets,
|
|
255506
|
-
newAssets: created.assetUploads?.uploads.length ?? 0
|
|
255507
|
-
});
|
|
255508
|
-
if (created.assetUploads) {
|
|
255509
|
-
await uploadPresignedAssets(created.assetUploads.uploads, assets, {
|
|
255510
|
-
concurrency,
|
|
255511
|
-
onProgress: progress?.onAssetUpload
|
|
255512
|
-
});
|
|
255513
|
-
}
|
|
255514
|
-
const indexHtml = await readFile4(join17(outputDir, "index.html"));
|
|
255515
|
-
const finalized = await finalizeStaticDeployment(created.deploymentId, new Uint8Array(indexHtml));
|
|
255516
|
-
return { deploymentId: finalized.deploymentId, gitHash };
|
|
255517
|
-
}
|
|
255518
|
-
|
|
255519
|
-
// src/core/site/deploy-app.ts
|
|
255520
|
-
async function planAppDeploy(target) {
|
|
255521
|
-
if (await detectFullStackArtifact(target.root)) {
|
|
255522
|
-
return { kind: "full-stack" };
|
|
255523
|
-
}
|
|
255524
|
-
const outputDirectory = target.site?.outputDirectory;
|
|
255525
|
-
if (!outputDirectory) {
|
|
255526
|
-
return { kind: "none" };
|
|
255527
|
-
}
|
|
255528
|
-
const outputDir = resolve5(target.root, outputDirectory);
|
|
255529
|
-
return staticDeploymentsEnabled() ? { kind: "static-deployment", outputDir } : { kind: "static", outputDir };
|
|
255530
|
-
}
|
|
255531
|
-
async function detectAppDeployKind(target) {
|
|
255532
|
-
return (await planAppDeploy(target)).kind;
|
|
255533
|
-
}
|
|
255534
|
-
async function deployAppSite(target, options = {}) {
|
|
255535
|
-
const plan = await planAppDeploy(target);
|
|
255536
|
-
switch (plan.kind) {
|
|
255537
|
-
case "full-stack": {
|
|
255538
|
-
const gitHash = await resolveGitHash(target.root, options.gitHash);
|
|
255539
|
-
const { deploymentId } = await deployFullStack({
|
|
255540
|
-
projectRoot: target.root,
|
|
255541
|
-
gitHash,
|
|
255542
|
-
concurrency: options.concurrency,
|
|
255543
|
-
progress: options.progress
|
|
255544
|
-
});
|
|
255545
|
-
return { kind: "full-stack", deploymentId, gitHash };
|
|
255546
|
-
}
|
|
255547
|
-
case "static-deployment": {
|
|
255548
|
-
const gitHash = await resolveGitHash(target.root, options.gitHash);
|
|
255549
|
-
const { deploymentId } = await deployStaticSite({
|
|
255550
|
-
outputDir: plan.outputDir,
|
|
255551
|
-
gitHash,
|
|
255552
|
-
concurrency: options.concurrency,
|
|
255553
|
-
progress: options.progress
|
|
255554
|
-
});
|
|
255555
|
-
return { kind: "static-deployment", deploymentId, gitHash };
|
|
255556
|
-
}
|
|
255557
|
-
case "static": {
|
|
255558
|
-
const { appUrl } = await deploySite(plan.outputDir);
|
|
255559
|
-
return { kind: "static", appUrl };
|
|
255560
|
-
}
|
|
255561
|
-
case "none":
|
|
255562
|
-
return { kind: "none" };
|
|
255563
|
-
}
|
|
255564
|
-
}
|
|
255565
|
-
// src/core/project/deploy.ts
|
|
255566
|
-
function hasResourcesToDeploy(projectData) {
|
|
255567
|
-
const {
|
|
255568
|
-
project,
|
|
255569
|
-
entities,
|
|
255570
|
-
functions,
|
|
255571
|
-
agents,
|
|
255572
|
-
agentSkills,
|
|
255573
|
-
connectors,
|
|
255574
|
-
authConfig
|
|
255575
|
-
} = projectData;
|
|
255576
|
-
const hasSite = Boolean(project.site?.outputDirectory || project.site?.buildCommand);
|
|
255577
|
-
const hasEntities = entities.length > 0;
|
|
255578
|
-
const hasFunctions = functions.length > 0;
|
|
255579
|
-
const hasAgents = agents.length > 0;
|
|
255580
|
-
const hasAgentSkills = agentSkills.length > 0;
|
|
255581
|
-
const hasConnectors = connectors.length > 0;
|
|
255582
|
-
const hasAuthConfig = authConfig.length > 0;
|
|
255583
|
-
const hasVisibility = Boolean(project.visibility);
|
|
255584
|
-
return hasEntities || hasFunctions || hasAgents || hasAgentSkills || hasConnectors || hasAuthConfig || hasVisibility || hasSite;
|
|
255585
|
-
}
|
|
255586
|
-
async function deployAll(projectData, options) {
|
|
255587
|
-
const {
|
|
255588
|
-
project,
|
|
255589
|
-
entities,
|
|
255590
|
-
functions,
|
|
255591
|
-
agents,
|
|
255592
|
-
agentSkills,
|
|
255593
|
-
connectors,
|
|
255594
|
-
authConfig
|
|
255595
|
-
} = projectData;
|
|
255596
|
-
await setAppVisibility(project.visibility);
|
|
255597
|
-
if (project.visibility) {
|
|
255598
|
-
options?.onVisibilitySet?.(project.visibility);
|
|
255599
|
-
}
|
|
255600
|
-
await entityResource.push(entities);
|
|
255601
|
-
await deployFunctionsSequentially(functions, {
|
|
255602
|
-
onStart: options?.onFunctionStart,
|
|
255603
|
-
onResult: options?.onFunctionResult
|
|
255604
|
-
});
|
|
255605
|
-
await agentSkillResource.push(agentSkills);
|
|
255606
|
-
await agentResource.push(agents);
|
|
255607
|
-
await authConfigResource.push(authConfig);
|
|
255608
|
-
const skipConnectorSync = connectors.length === 0 && hasWorkspaceApiKeyAuth();
|
|
255609
|
-
const connectorResults = skipConnectorSync ? [] : (await pushConnectors(connectors)).results;
|
|
255610
|
-
if ((options?.site ?? true) && project.site?.outputDirectory) {
|
|
255611
|
-
const outputDir = resolve6(project.root, project.site.outputDirectory);
|
|
255612
|
-
const { appUrl } = await deploySite(outputDir);
|
|
255613
|
-
return { appUrl, connectorResults };
|
|
255614
|
-
}
|
|
255615
|
-
return { connectorResults };
|
|
255616
|
-
}
|
|
255617
|
-
// src/core/clients/base44-client.ts
|
|
255618
|
-
var retriedRequests = new WeakSet;
|
|
255619
|
-
async function captureRequestBody(request, options) {
|
|
255620
|
-
if (request.body == null) {
|
|
255621
|
-
return;
|
|
255622
|
-
}
|
|
255623
|
-
try {
|
|
255624
|
-
const cloned = request.clone();
|
|
255625
|
-
const text = await cloned.text();
|
|
255626
|
-
options.context.__requestBody = text;
|
|
255627
|
-
} catch {}
|
|
255628
|
-
}
|
|
255629
|
-
async function handleUnauthorized(request, _options, response) {
|
|
255630
|
-
if (response.status !== 401) {
|
|
255631
|
-
return;
|
|
255632
|
-
}
|
|
255633
|
-
if (hasWorkspaceApiKeyAuth()) {
|
|
255634
|
-
return;
|
|
255635
|
-
}
|
|
255636
|
-
if (retriedRequests.has(request)) {
|
|
255637
|
-
return;
|
|
255638
|
-
}
|
|
255639
|
-
const newAccessToken = await refreshAndSaveTokens();
|
|
255640
|
-
if (!newAccessToken) {
|
|
255641
|
-
return;
|
|
255642
|
-
}
|
|
255643
|
-
retriedRequests.add(request);
|
|
255644
|
-
const requestId = request.headers.get("X-Request-ID");
|
|
255645
|
-
return distribution_default(request.clone(), {
|
|
255646
|
-
headers: {
|
|
255647
|
-
...requestId && { "X-Request-ID": requestId },
|
|
255648
|
-
Authorization: `Bearer ${newAccessToken}`
|
|
255649
|
-
}
|
|
255650
|
-
});
|
|
255651
|
-
}
|
|
255652
|
-
var base44Client = distribution_default.create({
|
|
255653
|
-
prefixUrl: getBase44ApiUrl(),
|
|
255654
|
-
headers: {
|
|
255655
|
-
"User-Agent": "Base44 CLI"
|
|
255656
|
-
},
|
|
255657
|
-
hooks: {
|
|
255658
|
-
beforeRequest: [
|
|
255659
|
-
(request) => {
|
|
255660
|
-
request.headers.set("X-Request-ID", randomUUID2());
|
|
255661
|
-
},
|
|
255662
|
-
captureRequestBody,
|
|
255663
|
-
async (request) => {
|
|
255664
|
-
const workspaceApiKey = getWorkspaceApiKeyFromEnv();
|
|
255665
|
-
if (workspaceApiKey && isWorkspaceApiKey(workspaceApiKey)) {
|
|
255666
|
-
request.headers.set("api_key", workspaceApiKey);
|
|
255667
|
-
return;
|
|
255668
|
-
}
|
|
255669
|
-
try {
|
|
255670
|
-
const auth = await readAuth();
|
|
255671
|
-
if (isTokenExpired(auth)) {
|
|
255672
|
-
const newAccessToken = await refreshAndSaveTokens();
|
|
255673
|
-
if (newAccessToken) {
|
|
255674
|
-
request.headers.set("Authorization", `Bearer ${newAccessToken}`);
|
|
255675
|
-
return;
|
|
255676
|
-
}
|
|
255677
|
-
}
|
|
255678
|
-
request.headers.set("Authorization", `Bearer ${auth.accessToken}`);
|
|
255679
|
-
} catch {}
|
|
255680
|
-
}
|
|
255681
|
-
],
|
|
255682
|
-
afterResponse: [handleUnauthorized]
|
|
255683
|
-
}
|
|
255684
|
-
});
|
|
255685
|
-
function getAppClient() {
|
|
255686
|
-
const { id } = getAppContext();
|
|
255687
|
-
return base44Client.extend({
|
|
255688
|
-
prefixUrl: new URL(`/api/apps/${id}/`, getBase44ApiUrl()).href
|
|
255689
|
-
});
|
|
255690
|
-
}
|
|
255691
|
-
function getSandboxClient(appId) {
|
|
255692
|
-
return base44Client.extend({
|
|
255693
|
-
prefixUrl: new URL(`/api/apps/${appId}/sandbox-bridge/`, getBase44ApiUrl()).href
|
|
255694
|
-
});
|
|
255695
|
-
}
|
|
255696
|
-
// src/core/clients/oauth-client.ts
|
|
255697
|
-
import { randomUUID as randomUUID3 } from "node:crypto";
|
|
255698
|
-
var oauthClient = distribution_default.create({
|
|
255699
|
-
prefixUrl: getBase44ApiUrl(),
|
|
255700
|
-
headers: {
|
|
255701
|
-
"User-Agent": "Base44 CLI"
|
|
255702
|
-
},
|
|
255703
|
-
hooks: {
|
|
255704
|
-
beforeRequest: [
|
|
255705
|
-
(request) => {
|
|
255706
|
-
request.headers.set("X-Request-ID", randomUUID3());
|
|
255707
|
-
}
|
|
255708
|
-
]
|
|
255709
|
-
}
|
|
255710
|
-
});
|
|
255711
|
-
// src/core/auth/api.ts
|
|
255712
|
-
async function generateDeviceCode() {
|
|
255713
|
-
const response = await oauthClient.post("oauth/device/code", {
|
|
255714
|
-
json: {
|
|
255715
|
-
client_id: AUTH_CLIENT_ID,
|
|
255716
|
-
scope: "apps:read apps:write sandbox:write"
|
|
255717
|
-
},
|
|
255718
|
-
throwHttpErrors: false
|
|
255719
|
-
});
|
|
255720
|
-
if (!response.ok) {
|
|
255721
|
-
throw new ApiError(`Failed to generate device code: ${response.status} ${response.statusText}`, { statusCode: response.status });
|
|
255722
|
-
}
|
|
255723
|
-
const result = DeviceCodeResponseSchema.safeParse(await response.json());
|
|
255724
|
-
if (!result.success) {
|
|
255725
|
-
throw new SchemaValidationError("Invalid device code response from server", result.error);
|
|
255726
|
-
}
|
|
255727
|
-
return result.data;
|
|
255728
|
-
}
|
|
255729
|
-
async function getTokenFromDeviceCode(deviceCode) {
|
|
255730
|
-
const searchParams = new URLSearchParams;
|
|
255731
|
-
searchParams.set("grant_type", "urn:ietf:params:oauth:grant-type:device_code");
|
|
255732
|
-
searchParams.set("device_code", deviceCode);
|
|
255733
|
-
searchParams.set("client_id", AUTH_CLIENT_ID);
|
|
255734
|
-
const response = await oauthClient.post("oauth/token", {
|
|
255735
|
-
body: searchParams.toString(),
|
|
255736
|
-
headers: {
|
|
255737
|
-
"Content-Type": "application/x-www-form-urlencoded"
|
|
255738
|
-
},
|
|
255739
|
-
throwHttpErrors: false
|
|
255740
|
-
});
|
|
255741
|
-
const json2 = await response.json();
|
|
255742
|
-
if (!response.ok) {
|
|
255743
|
-
const errorResult = OAuthErrorSchema.safeParse(json2);
|
|
255744
|
-
if (!errorResult.success) {
|
|
255745
|
-
throw new SchemaValidationError("Token request failed", errorResult.error);
|
|
255746
|
-
}
|
|
255747
|
-
const { error: error48, error_description } = errorResult.data;
|
|
255748
|
-
if (error48 === "authorization_pending" || error48 === "slow_down") {
|
|
255749
|
-
return null;
|
|
255750
|
-
}
|
|
255751
|
-
throw new ApiError(error_description ?? `OAuth error: ${error48}`, {
|
|
255752
|
-
statusCode: response.status
|
|
255753
|
-
});
|
|
255754
|
-
}
|
|
255755
|
-
const result = TokenResponseSchema.safeParse(json2);
|
|
255756
|
-
if (!result.success) {
|
|
255757
|
-
throw new SchemaValidationError("Invalid token response from server", result.error);
|
|
255758
|
-
}
|
|
255759
|
-
return result.data;
|
|
255760
|
-
}
|
|
255761
|
-
async function renewAccessToken(refreshToken) {
|
|
255762
|
-
const searchParams = new URLSearchParams;
|
|
255763
|
-
searchParams.set("grant_type", "refresh_token");
|
|
255764
|
-
searchParams.set("refresh_token", refreshToken);
|
|
255765
|
-
searchParams.set("client_id", AUTH_CLIENT_ID);
|
|
255766
|
-
const response = await oauthClient.post("oauth/token", {
|
|
255767
|
-
body: searchParams.toString(),
|
|
255768
|
-
headers: {
|
|
255769
|
-
"Content-Type": "application/x-www-form-urlencoded"
|
|
255770
|
-
},
|
|
255771
|
-
throwHttpErrors: false
|
|
255772
|
-
});
|
|
255773
|
-
const json2 = await response.json();
|
|
255774
|
-
if (!response.ok) {
|
|
255775
|
-
const errorResult = OAuthErrorSchema.safeParse(json2);
|
|
255776
|
-
if (!errorResult.success) {
|
|
255777
|
-
throw new ApiError(`Token refresh failed: ${response.statusText}`, {
|
|
255778
|
-
statusCode: response.status
|
|
255779
|
-
});
|
|
255780
|
-
}
|
|
255781
|
-
const { error: error48, error_description } = errorResult.data;
|
|
255782
|
-
throw new ApiError(error_description ?? `OAuth error: ${error48}`, {
|
|
255783
|
-
statusCode: response.status
|
|
255784
|
-
});
|
|
255785
|
-
}
|
|
255786
|
-
const result = TokenResponseSchema.safeParse(json2);
|
|
255787
|
-
if (!result.success) {
|
|
255788
|
-
throw new SchemaValidationError("Invalid token response from server", result.error);
|
|
255789
|
-
}
|
|
255790
|
-
return result.data;
|
|
255791
|
-
}
|
|
255792
|
-
async function getUserInfo(accessToken) {
|
|
255793
|
-
const response = await oauthClient.get("oauth/userinfo", {
|
|
255794
|
-
headers: { Authorization: `Bearer ${accessToken}` }
|
|
255795
|
-
});
|
|
255796
|
-
if (!response.ok) {
|
|
255797
|
-
throw new ApiError(`Failed to fetch user info: ${response.status}`, {
|
|
255798
|
-
statusCode: response.status
|
|
255799
|
-
});
|
|
255800
|
-
}
|
|
255801
|
-
const result = UserInfoSchema.safeParse(await response.json());
|
|
255802
|
-
if (!result.success) {
|
|
255803
|
-
throw new SchemaValidationError("Invalid UserInfo response from server", result.error);
|
|
255804
|
-
}
|
|
255805
|
-
return result.data;
|
|
255806
|
-
}
|
|
255807
|
-
// src/cli/commands/auth/login-flow.ts
|
|
255808
|
-
async function generateAndDisplayDeviceCode(log, runTask) {
|
|
255809
|
-
const deviceCodeResponse = await runTask("Generating device code...", async () => {
|
|
255810
|
-
return await generateDeviceCode();
|
|
255811
|
-
}, {
|
|
255812
|
-
successMessage: "Device code generated",
|
|
255813
|
-
errorMessage: "Failed to generate device code"
|
|
255814
|
-
});
|
|
255815
|
-
log.info(`Verification code: ${theme.styles.bold(deviceCodeResponse.userCode)}` + `
|
|
255816
|
-
Please confirm this code at: ${deviceCodeResponse.verificationUri}`);
|
|
255817
|
-
return deviceCodeResponse;
|
|
255818
|
-
}
|
|
255819
|
-
async function waitForAuthentication(deviceCode, expiresIn, interval, runTask) {
|
|
255820
|
-
let tokenResponse;
|
|
255821
|
-
try {
|
|
255822
|
-
await runTask("Waiting for authentication...", async () => {
|
|
255823
|
-
await pWaitFor(async () => {
|
|
255824
|
-
const result = await getTokenFromDeviceCode(deviceCode);
|
|
255825
|
-
if (result !== null) {
|
|
255826
|
-
tokenResponse = result;
|
|
255827
|
-
return true;
|
|
255828
|
-
}
|
|
255829
|
-
return false;
|
|
255830
|
-
}, {
|
|
255831
|
-
interval: interval * 1000,
|
|
255832
|
-
timeout: expiresIn * 1000
|
|
255833
|
-
});
|
|
255834
|
-
}, {
|
|
255835
|
-
successMessage: "Authentication completed!",
|
|
255836
|
-
errorMessage: "Authentication failed"
|
|
255837
|
-
});
|
|
255838
|
-
} catch (error48) {
|
|
255839
|
-
if (error48 instanceof Error && error48.message.includes("timed out")) {
|
|
255840
|
-
throw new AuthExpiredError("Authentication timed out. Please try again.");
|
|
255841
|
-
}
|
|
255842
|
-
throw error48;
|
|
255843
|
-
}
|
|
255844
|
-
if (tokenResponse === undefined) {
|
|
255845
|
-
throw new InternalError("Failed to retrieve authentication token.");
|
|
255846
|
-
}
|
|
255847
|
-
return tokenResponse;
|
|
255848
|
-
}
|
|
255849
|
-
async function saveAuthData(response, userInfo) {
|
|
255850
|
-
const expiresAt = Date.now() + response.expiresIn * 1000;
|
|
255851
|
-
await writeAuth({
|
|
255852
|
-
accessToken: response.accessToken,
|
|
255853
|
-
refreshToken: response.refreshToken,
|
|
255854
|
-
expiresAt,
|
|
255855
|
-
email: userInfo.email,
|
|
255856
|
-
name: userInfo.name
|
|
255857
|
-
});
|
|
255858
|
-
}
|
|
255859
|
-
async function login({
|
|
255860
|
-
log,
|
|
255861
|
-
runTask
|
|
255862
|
-
}) {
|
|
255863
|
-
const deviceCodeResponse = await generateAndDisplayDeviceCode(log, runTask);
|
|
255864
|
-
const token = await waitForAuthentication(deviceCodeResponse.deviceCode, deviceCodeResponse.expiresIn, deviceCodeResponse.interval, runTask);
|
|
255865
|
-
const userInfo = await getUserInfo(token.accessToken);
|
|
255866
|
-
await saveAuthData(token, userInfo);
|
|
255867
|
-
return {
|
|
255868
|
-
outroMessage: `Successfully logged in as ${theme.styles.bold(userInfo.email)}`
|
|
255869
|
-
};
|
|
255870
|
-
}
|
|
255871
|
-
|
|
255872
|
-
// src/cli/utils/command/middleware.ts
|
|
255873
|
-
async function ensureAuth(ctx) {
|
|
255874
|
-
if (hasWorkspaceApiKeyAuth()) {
|
|
255875
|
-
ctx.errorReporter.setContext({
|
|
255876
|
-
user: { email: "workspace-api-key", name: "Workspace API key" }
|
|
255877
|
-
});
|
|
255878
|
-
return;
|
|
255879
|
-
}
|
|
255880
|
-
await seedAuthFromEnv();
|
|
255881
|
-
const loggedIn = await isLoggedIn();
|
|
255882
|
-
if (!loggedIn) {
|
|
255883
|
-
ctx.log.info("You need to login first to continue.");
|
|
255884
|
-
await login(ctx);
|
|
255885
|
-
}
|
|
255886
|
-
try {
|
|
255887
|
-
const userInfo = await readAuth();
|
|
255888
|
-
ctx.errorReporter.setContext({
|
|
255889
|
-
user: { email: userInfo.email, name: userInfo.name }
|
|
255890
|
-
});
|
|
255891
|
-
} catch {}
|
|
255892
|
-
}
|
|
255893
|
-
async function ensureAppContext(ctx, options = {}) {
|
|
255894
|
-
const appContext = await initAppContext(options);
|
|
255895
|
-
ctx.app = appContext;
|
|
255896
|
-
ctx.errorReporter.setContext({ appId: appContext.id });
|
|
255897
|
-
}
|
|
255898
|
-
|
|
255899
255431
|
// src/cli/utils/version-check.ts
|
|
255900
255432
|
async function checkForUpgrade() {
|
|
255901
255433
|
const testLatestVersion = getTestOverrides()?.latestVersion;
|
|
@@ -256288,6 +255820,11 @@ function verifyDenoInstalled(context) {
|
|
|
256288
255820
|
});
|
|
256289
255821
|
}
|
|
256290
255822
|
}
|
|
255823
|
+
// src/core/utils/git.ts
|
|
255824
|
+
var GIT_HASH_PATTERN = /^[a-fA-F0-9]{7,64}$/;
|
|
255825
|
+
function isGitCommitHash(value) {
|
|
255826
|
+
return GIT_HASH_PATTERN.test(value);
|
|
255827
|
+
}
|
|
256291
255828
|
// src/core/workspace/schema.ts
|
|
256292
255829
|
var WorkspaceSchema = exports_external.object({
|
|
256293
255830
|
id: exports_external.string(),
|
|
@@ -256362,7 +255899,7 @@ async function pullAction({
|
|
|
256362
255899
|
runTask: runTask2
|
|
256363
255900
|
}) {
|
|
256364
255901
|
const { project: project2 } = await readProjectConfig();
|
|
256365
|
-
const dir =
|
|
255902
|
+
const dir = join17(dirname10(project2.configPath), project2.agentSkillsDir);
|
|
256366
255903
|
const remote = await runTask2("Fetching agent skills from Base44", () => fetchAgentSkills(), {
|
|
256367
255904
|
successMessage: "Agent skills fetched successfully",
|
|
256368
255905
|
errorMessage: "Failed to fetch agent skills"
|
|
@@ -256418,14 +255955,14 @@ function getAgentSkillsCommand() {
|
|
|
256418
255955
|
}
|
|
256419
255956
|
|
|
256420
255957
|
// src/cli/commands/agents/pull.ts
|
|
256421
|
-
import { dirname as
|
|
255958
|
+
import { dirname as dirname11, join as join18 } from "node:path";
|
|
256422
255959
|
async function pullAgentsAction({
|
|
256423
255960
|
log,
|
|
256424
255961
|
runTask: runTask2
|
|
256425
255962
|
}) {
|
|
256426
255963
|
const { project: project2 } = await readProjectConfig();
|
|
256427
|
-
const configDir =
|
|
256428
|
-
const agentsDir =
|
|
255964
|
+
const configDir = dirname11(project2.configPath);
|
|
255965
|
+
const agentsDir = join18(configDir, project2.agentsDir);
|
|
256429
255966
|
const remoteAgents = await runTask2("Fetching agents from Base44", async () => {
|
|
256430
255967
|
return await fetchAgents();
|
|
256431
255968
|
}, {
|
|
@@ -256495,12 +256032,12 @@ function getAgentsCommand() {
|
|
|
256495
256032
|
}
|
|
256496
256033
|
|
|
256497
256034
|
// src/cli/commands/auth/password-login.ts
|
|
256498
|
-
import { dirname as
|
|
256035
|
+
import { dirname as dirname12, join as join19 } from "node:path";
|
|
256499
256036
|
async function passwordLoginAction({ log, runTask: runTask2 }, action) {
|
|
256500
256037
|
const shouldEnable = action === "enable";
|
|
256501
256038
|
const { project: project2 } = await readProjectConfig();
|
|
256502
|
-
const configDir =
|
|
256503
|
-
const authDir =
|
|
256039
|
+
const configDir = dirname12(project2.configPath);
|
|
256040
|
+
const authDir = join19(configDir, project2.authDir);
|
|
256504
256041
|
const updated = await runTask2("Updating local auth config", async () => {
|
|
256505
256042
|
const current = await readAuthConfig(authDir) ?? DEFAULT_AUTH_CONFIG;
|
|
256506
256043
|
const merged = { ...current, enableUsernamePassword: shouldEnable };
|
|
@@ -256520,14 +256057,14 @@ function getPasswordLoginCommand() {
|
|
|
256520
256057
|
}
|
|
256521
256058
|
|
|
256522
256059
|
// src/cli/commands/auth/pull.ts
|
|
256523
|
-
import { dirname as
|
|
256060
|
+
import { dirname as dirname13, join as join20 } from "node:path";
|
|
256524
256061
|
async function pullAuthAction({
|
|
256525
256062
|
log,
|
|
256526
256063
|
runTask: runTask2
|
|
256527
256064
|
}) {
|
|
256528
256065
|
const { project: project2 } = await readProjectConfig();
|
|
256529
|
-
const configDir =
|
|
256530
|
-
const authDir =
|
|
256066
|
+
const configDir = dirname13(project2.configPath);
|
|
256067
|
+
const authDir = join20(configDir, project2.authDir);
|
|
256531
256068
|
const remoteConfig = await runTask2("Fetching auth config from Base44", async () => {
|
|
256532
256069
|
return await pullAuthConfig();
|
|
256533
256070
|
}, {
|
|
@@ -256591,7 +256128,7 @@ function getAuthPushCommand() {
|
|
|
256591
256128
|
}
|
|
256592
256129
|
|
|
256593
256130
|
// src/cli/commands/auth/social-login.ts
|
|
256594
|
-
import { dirname as
|
|
256131
|
+
import { dirname as dirname14, join as join21, resolve as resolve4 } from "node:path";
|
|
256595
256132
|
var PROVIDER_LABELS = {
|
|
256596
256133
|
google: "Google",
|
|
256597
256134
|
microsoft: "Microsoft",
|
|
@@ -256631,7 +256168,7 @@ async function socialLoginAction({ log, isNonInteractive, runTask: runTask2 }, p
|
|
|
256631
256168
|
let clientSecret;
|
|
256632
256169
|
if (useCustomOAuth && oauth && oauthCli && hasSecretOptions(options)) {
|
|
256633
256170
|
if (options.envFile) {
|
|
256634
|
-
const secrets = await parseEnvFile(
|
|
256171
|
+
const secrets = await parseEnvFile(resolve4(options.envFile));
|
|
256635
256172
|
const value = secrets[oauthCli.envVar];
|
|
256636
256173
|
if (!value) {
|
|
256637
256174
|
throw new InvalidInputError(`Key "${oauthCli.envVar}" not found in ${options.envFile}.`);
|
|
@@ -256661,8 +256198,8 @@ async function socialLoginAction({ log, isNonInteractive, runTask: runTask2 }, p
|
|
|
256661
256198
|
}
|
|
256662
256199
|
}
|
|
256663
256200
|
const { project: project2 } = await readProjectConfig();
|
|
256664
|
-
const configDir =
|
|
256665
|
-
const authDir =
|
|
256201
|
+
const configDir = dirname14(project2.configPath);
|
|
256202
|
+
const authDir = join21(configDir, project2.authDir);
|
|
256666
256203
|
const { config: updated } = await runTask2("Updating local auth config", async () => updateSocialLoginConfig(authDir, provider, shouldEnable, useCustomOAuth && options.clientId ? { clientId: options.clientId } : undefined));
|
|
256667
256204
|
if (clientSecret) {
|
|
256668
256205
|
await runTask2("Saving client secret", async () => pushCustomOAuthSecret(provider, clientSecret));
|
|
@@ -256687,7 +256224,7 @@ function getSocialLoginCommand() {
|
|
|
256687
256224
|
}
|
|
256688
256225
|
|
|
256689
256226
|
// src/cli/commands/auth/sso.ts
|
|
256690
|
-
import { dirname as
|
|
256227
|
+
import { dirname as dirname15, join as join22, resolve as resolve5 } from "node:path";
|
|
256691
256228
|
var SSOConfigFileSchema = exports_external.object({
|
|
256692
256229
|
provider: exports_external.enum(Object.values(KNOWN_SSO_PROVIDERS)),
|
|
256693
256230
|
clientId: exports_external.string(),
|
|
@@ -256703,7 +256240,7 @@ var SSOConfigFileSchema = exports_external.object({
|
|
|
256703
256240
|
ssoName: exports_external.string().optional()
|
|
256704
256241
|
});
|
|
256705
256242
|
async function loadSSOConfigFile(filePath) {
|
|
256706
|
-
const resolved =
|
|
256243
|
+
const resolved = resolve5(filePath);
|
|
256707
256244
|
const raw2 = await readJsonFile(resolved);
|
|
256708
256245
|
const result = SSOConfigFileSchema.safeParse(raw2);
|
|
256709
256246
|
if (!result.success) {
|
|
@@ -256791,7 +256328,7 @@ async function ssoEnableAction({ isNonInteractive, runTask: runTask2 }, options)
|
|
|
256791
256328
|
}
|
|
256792
256329
|
let clientSecret;
|
|
256793
256330
|
if (merged.envFile && !merged.clientSecret) {
|
|
256794
|
-
const secrets2 = await parseEnvFile(
|
|
256331
|
+
const secrets2 = await parseEnvFile(resolve5(merged.envFile));
|
|
256795
256332
|
const value = secrets2.sso_client_secret;
|
|
256796
256333
|
if (!value) {
|
|
256797
256334
|
throw new InvalidInputError(`Key "sso_client_secret" not found in ${merged.envFile}.`);
|
|
@@ -256850,8 +256387,8 @@ async function ssoEnableAction({ isNonInteractive, runTask: runTask2 }, options)
|
|
|
256850
256387
|
throw error48;
|
|
256851
256388
|
}
|
|
256852
256389
|
const { project: project2 } = await readProjectConfig();
|
|
256853
|
-
const configDir =
|
|
256854
|
-
const authDir =
|
|
256390
|
+
const configDir = dirname15(project2.configPath);
|
|
256391
|
+
const authDir = join22(configDir, project2.authDir);
|
|
256855
256392
|
await runTask2("Updating local auth config", async () => updateSSOConfig(authDir, provider, true));
|
|
256856
256393
|
await runTask2("Saving SSO credentials", async () => pushSSOSecrets(secrets));
|
|
256857
256394
|
return {
|
|
@@ -256866,8 +256403,8 @@ async function ssoDisableAction({ log, runTask: runTask2 }, options) {
|
|
|
256866
256403
|
throw new InvalidInputError("Configuration options cannot be used with disable. To disable SSO: base44 auth sso disable");
|
|
256867
256404
|
}
|
|
256868
256405
|
const { project: project2 } = await readProjectConfig();
|
|
256869
|
-
const configDir =
|
|
256870
|
-
const authDir =
|
|
256406
|
+
const configDir = dirname15(project2.configPath);
|
|
256407
|
+
const authDir = join22(configDir, project2.authDir);
|
|
256871
256408
|
const updated = await runTask2("Updating local auth config", async () => updateSSOConfig(authDir, null, false));
|
|
256872
256409
|
await runTask2("Removing SSO credentials", async () => deleteSSOSecrets());
|
|
256873
256410
|
if (!hasAnyLoginMethod(updated)) {
|
|
@@ -257429,19 +256966,19 @@ var baseOpen = async (options) => {
|
|
|
257429
256966
|
}
|
|
257430
256967
|
const subprocess = childProcess3.spawn(command2, cliArguments, childProcessOptions);
|
|
257431
256968
|
if (options.wait) {
|
|
257432
|
-
return new Promise((
|
|
256969
|
+
return new Promise((resolve6, reject) => {
|
|
257433
256970
|
subprocess.once("error", reject);
|
|
257434
256971
|
subprocess.once("close", (exitCode) => {
|
|
257435
256972
|
if (!options.allowNonzeroExitCode && exitCode !== 0) {
|
|
257436
256973
|
reject(new Error(`Exited with code ${exitCode}`));
|
|
257437
256974
|
return;
|
|
257438
256975
|
}
|
|
257439
|
-
|
|
256976
|
+
resolve6(subprocess);
|
|
257440
256977
|
});
|
|
257441
256978
|
});
|
|
257442
256979
|
}
|
|
257443
256980
|
if (isFallbackAttempt) {
|
|
257444
|
-
return new Promise((
|
|
256981
|
+
return new Promise((resolve6, reject) => {
|
|
257445
256982
|
subprocess.once("error", reject);
|
|
257446
256983
|
subprocess.once("spawn", () => {
|
|
257447
256984
|
subprocess.once("close", (exitCode) => {
|
|
@@ -257451,17 +256988,17 @@ var baseOpen = async (options) => {
|
|
|
257451
256988
|
return;
|
|
257452
256989
|
}
|
|
257453
256990
|
subprocess.unref();
|
|
257454
|
-
|
|
256991
|
+
resolve6(subprocess);
|
|
257455
256992
|
});
|
|
257456
256993
|
});
|
|
257457
256994
|
});
|
|
257458
256995
|
}
|
|
257459
256996
|
subprocess.unref();
|
|
257460
|
-
return new Promise((
|
|
256997
|
+
return new Promise((resolve6, reject) => {
|
|
257461
256998
|
subprocess.once("error", reject);
|
|
257462
256999
|
subprocess.once("spawn", () => {
|
|
257463
257000
|
subprocess.off("error", reject);
|
|
257464
|
-
|
|
257001
|
+
resolve6(subprocess);
|
|
257465
257002
|
});
|
|
257466
257003
|
});
|
|
257467
257004
|
};
|
|
@@ -257724,13 +257261,13 @@ function getConnectorsListAvailableCommand() {
|
|
|
257724
257261
|
}
|
|
257725
257262
|
|
|
257726
257263
|
// src/cli/commands/connectors/pull.ts
|
|
257727
|
-
import { dirname as
|
|
257264
|
+
import { dirname as dirname16, join as join23, resolve as resolve6 } from "node:path";
|
|
257728
257265
|
async function resolveConnectorsDir(options) {
|
|
257729
257266
|
if (!getAppContext().projectRoot) {
|
|
257730
|
-
return
|
|
257267
|
+
return resolve6(options.dir ?? "connectors");
|
|
257731
257268
|
}
|
|
257732
257269
|
const { project: project2 } = await readProjectConfig();
|
|
257733
|
-
return
|
|
257270
|
+
return join23(dirname16(project2.configPath), project2.connectorsDir);
|
|
257734
257271
|
}
|
|
257735
257272
|
async function pullConnectorsAction({ log, runTask: runTask2, jsonMode }, options) {
|
|
257736
257273
|
const connectorsDir = await resolveConnectorsDir(options);
|
|
@@ -257771,10 +257308,10 @@ function getConnectorsPullCommand() {
|
|
|
257771
257308
|
}
|
|
257772
257309
|
|
|
257773
257310
|
// src/cli/commands/connectors/push.ts
|
|
257774
|
-
import { resolve as
|
|
257311
|
+
import { resolve as resolve7 } from "node:path";
|
|
257775
257312
|
async function readConnectorsToPush(options) {
|
|
257776
257313
|
if (!getAppContext().projectRoot) {
|
|
257777
|
-
return readAllConnectors(
|
|
257314
|
+
return readAllConnectors(resolve7(options.dir ?? "connectors"));
|
|
257778
257315
|
}
|
|
257779
257316
|
const { connectors } = await readProjectConfig();
|
|
257780
257317
|
return connectors;
|
|
@@ -258138,11 +257675,11 @@ function getListCommand() {
|
|
|
258138
257675
|
}
|
|
258139
257676
|
|
|
258140
257677
|
// src/cli/commands/functions/pull.ts
|
|
258141
|
-
import { dirname as
|
|
257678
|
+
import { dirname as dirname17, join as join24 } from "node:path";
|
|
258142
257679
|
async function pullFunctionsAction({ log, runTask: runTask2 }, name2) {
|
|
258143
257680
|
const { project: project2, functions } = await readProjectConfig();
|
|
258144
|
-
const configDir =
|
|
258145
|
-
const functionsDir =
|
|
257681
|
+
const configDir = dirname17(project2.configPath);
|
|
257682
|
+
const functionsDir = join24(configDir, project2.functionsDir);
|
|
258146
257683
|
const pluginFunctionNames = new Set(functions.filter((fn) => fn.source.type === "plugin").map((fn) => fn.name));
|
|
258147
257684
|
const remoteFunctions = await runTask2("Fetching functions from Base44", async () => {
|
|
258148
257685
|
const { functions: functions2 } = await listDeployedFunctions();
|
|
@@ -258275,11 +257812,11 @@ function getBuildCommand() {
|
|
|
258275
257812
|
}
|
|
258276
257813
|
|
|
258277
257814
|
// src/cli/commands/project/create.ts
|
|
258278
|
-
import { basename as basename5, resolve as
|
|
257815
|
+
import { basename as basename5, resolve as resolve8 } from "node:path";
|
|
258279
257816
|
var import_kebabCase = __toESM(require_kebabCase(), 1);
|
|
258280
257817
|
|
|
258281
257818
|
// src/cli/commands/project/scaffold-shared.ts
|
|
258282
|
-
import { join as
|
|
257819
|
+
import { join as join25 } from "node:path";
|
|
258283
257820
|
var DEFAULT_TEMPLATE_ID = "backend-only";
|
|
258284
257821
|
async function getTemplateById(templateId) {
|
|
258285
257822
|
const templates = await listTemplates();
|
|
@@ -258338,7 +257875,7 @@ async function completeProjectSetup({
|
|
|
258338
257875
|
updateMessage("Building project...");
|
|
258339
257876
|
await execa({ cwd: resolvedPath, shell: true })`${buildCommand}`;
|
|
258340
257877
|
updateMessage("Deploying site...");
|
|
258341
|
-
return await deploySite(
|
|
257878
|
+
return await deploySite(join25(resolvedPath, outputDirectory));
|
|
258342
257879
|
}, {
|
|
258343
257880
|
successMessage: theme.colors.base44Orange("Site deployed successfully"),
|
|
258344
257881
|
errorMessage: "Failed to deploy site"
|
|
@@ -258467,7 +258004,7 @@ async function createInteractive(options, ctx) {
|
|
|
258467
258004
|
}, ctx);
|
|
258468
258005
|
}
|
|
258469
258006
|
async function createNonInteractive(options, ctx) {
|
|
258470
|
-
ctx.log.info(`Creating a new project at ${
|
|
258007
|
+
ctx.log.info(`Creating a new project at ${resolve8(options.path)}`);
|
|
258471
258008
|
const template2 = await getTemplateById(options.template ?? DEFAULT_TEMPLATE_ID);
|
|
258472
258009
|
return await executeCreate({
|
|
258473
258010
|
template: template2,
|
|
@@ -258491,7 +258028,7 @@ async function executeCreate({
|
|
|
258491
258028
|
}, ctx) {
|
|
258492
258029
|
const { log, runTask: runTask2 } = ctx;
|
|
258493
258030
|
const name2 = rawName.trim();
|
|
258494
|
-
const resolvedPath =
|
|
258031
|
+
const resolvedPath = resolve8(projectPath);
|
|
258495
258032
|
const organizationId = await resolveWorkspaceId(ctx, flagWorkspaceId, isInteractive);
|
|
258496
258033
|
const { projectId } = await runTask2("Setting up your project...", async () => {
|
|
258497
258034
|
return await createProjectFiles({
|
|
@@ -258541,81 +258078,6 @@ Examples:
|
|
|
258541
258078
|
$ base44 create my-app --workspace 507f1f77bcf86cd799439011 Creates a base44 project in the given workspace`).hook("preAction", validateCreateOptions).action(createAction);
|
|
258542
258079
|
}
|
|
258543
258080
|
|
|
258544
|
-
// src/cli/commands/site/deploy-options.ts
|
|
258545
|
-
function addDeploymentOptions(command2) {
|
|
258546
|
-
return command2.addOption(new Option("--git-hash <hash>", "Commit the build came from (defaults to the checkout's HEAD)").argParser(parseGitHash)).addOption(new Option("--concurrency <n>", "Parallel asset uploads").default(DEFAULT_UPLOAD_CONCURRENCY).argParser(parseConcurrency));
|
|
258547
|
-
}
|
|
258548
|
-
function parseGitHash(value) {
|
|
258549
|
-
if (!isGitCommitHash(value)) {
|
|
258550
|
-
throw new InvalidArgumentError("Expected a git commit hash (7-64 hex chars).");
|
|
258551
|
-
}
|
|
258552
|
-
return value;
|
|
258553
|
-
}
|
|
258554
|
-
function parseConcurrency(value) {
|
|
258555
|
-
const parsed = Number(value);
|
|
258556
|
-
if (!Number.isInteger(parsed) || parsed < 1 || parsed > MAX_UPLOAD_CONCURRENCY) {
|
|
258557
|
-
throw new InvalidArgumentError(`Expected a whole number between 1 and ${MAX_UPLOAD_CONCURRENCY}.`);
|
|
258558
|
-
}
|
|
258559
|
-
return parsed;
|
|
258560
|
-
}
|
|
258561
|
-
|
|
258562
|
-
// src/cli/commands/site/run-app-deploy.ts
|
|
258563
|
-
var TASK_LABELS = {
|
|
258564
|
-
"full-stack": {
|
|
258565
|
-
start: "Deploying full-stack app...",
|
|
258566
|
-
success: theme.colors.base44Orange("Full-stack app deployed"),
|
|
258567
|
-
error: "Full-stack deploy failed"
|
|
258568
|
-
},
|
|
258569
|
-
"static-deployment": {
|
|
258570
|
-
start: "Deploying site...",
|
|
258571
|
-
success: "Site deployed",
|
|
258572
|
-
error: "Site deploy failed"
|
|
258573
|
-
},
|
|
258574
|
-
static: {
|
|
258575
|
-
start: "Creating archive and deploying site...",
|
|
258576
|
-
success: "Site deployed successfully",
|
|
258577
|
-
error: "Deployment failed"
|
|
258578
|
-
}
|
|
258579
|
-
};
|
|
258580
|
-
async function runAppSiteDeploy({ runTask: runTask2, log }, target, options = {}) {
|
|
258581
|
-
const kind = await detectAppDeployKind(target);
|
|
258582
|
-
if (kind === "none")
|
|
258583
|
-
return { kind: "none" };
|
|
258584
|
-
const labels = TASK_LABELS[kind];
|
|
258585
|
-
const progressLines = [];
|
|
258586
|
-
const warnings = [];
|
|
258587
|
-
const result = await runTask2(labels.start, async (updateMessage) => await deployAppSite(target, {
|
|
258588
|
-
gitHash: options.gitHash,
|
|
258589
|
-
concurrency: options.concurrency,
|
|
258590
|
-
progress: {
|
|
258591
|
-
onWarning: (message) => {
|
|
258592
|
-
warnings.push(message);
|
|
258593
|
-
},
|
|
258594
|
-
onAssets: ({ totalAssets, newAssets }) => {
|
|
258595
|
-
const line = `Found ${totalAssets} static assets (${newAssets} new)`;
|
|
258596
|
-
progressLines.push(line);
|
|
258597
|
-
updateMessage(line);
|
|
258598
|
-
},
|
|
258599
|
-
onAssetUpload: ({ uploadedFiles, totalFiles }) => {
|
|
258600
|
-
updateMessage(`Uploaded ${uploadedFiles} of ${totalFiles} assets`);
|
|
258601
|
-
},
|
|
258602
|
-
onWorker: ({ moduleCount }) => {
|
|
258603
|
-
updateMessage(`Deploying worker (${moduleCount} modules)…`);
|
|
258604
|
-
}
|
|
258605
|
-
}
|
|
258606
|
-
}), {
|
|
258607
|
-
successMessage: labels.success,
|
|
258608
|
-
errorMessage: labels.error
|
|
258609
|
-
});
|
|
258610
|
-
for (const line of progressLines) {
|
|
258611
|
-
log.message(theme.styles.dim(line));
|
|
258612
|
-
}
|
|
258613
|
-
for (const warning of warnings) {
|
|
258614
|
-
log.warn(warning);
|
|
258615
|
-
}
|
|
258616
|
-
return result;
|
|
258617
|
-
}
|
|
258618
|
-
|
|
258619
258081
|
// src/cli/commands/project/deploy.ts
|
|
258620
258082
|
async function deployAction(ctx, options = {}) {
|
|
258621
258083
|
const { isNonInteractive, log } = ctx;
|
|
@@ -258623,13 +258085,12 @@ async function deployAction(ctx, options = {}) {
|
|
|
258623
258085
|
throw new InvalidInputError("--yes is required in non-interactive mode");
|
|
258624
258086
|
}
|
|
258625
258087
|
const projectData = await readProjectConfig(options.projectRoot);
|
|
258626
|
-
|
|
258627
|
-
const plannedSite = await detectAppDeployKind(project2);
|
|
258628
|
-
if (!hasResourcesToDeploy(projectData) && plannedSite === "none") {
|
|
258088
|
+
if (!hasResourcesToDeploy(projectData)) {
|
|
258629
258089
|
return {
|
|
258630
258090
|
outroMessage: "No resources found to deploy"
|
|
258631
258091
|
};
|
|
258632
258092
|
}
|
|
258093
|
+
const { project: project2, entities, functions, agents, connectors, authConfig } = projectData;
|
|
258633
258094
|
const summaryLines = [];
|
|
258634
258095
|
if (entities.length > 0) {
|
|
258635
258096
|
summaryLines.push(` - ${entities.length} ${entities.length === 1 ? "entity" : "entities"}`);
|
|
@@ -258649,9 +258110,7 @@ async function deployAction(ctx, options = {}) {
|
|
|
258649
258110
|
if (project2.visibility) {
|
|
258650
258111
|
summaryLines.push(` - Visibility: ${project2.visibility}`);
|
|
258651
258112
|
}
|
|
258652
|
-
if (
|
|
258653
|
-
summaryLines.push(" - Full-stack app");
|
|
258654
|
-
} else if (project2.site?.outputDirectory) {
|
|
258113
|
+
if (project2.site?.outputDirectory) {
|
|
258655
258114
|
summaryLines.push(` - Site from ${project2.site.outputDirectory}`);
|
|
258656
258115
|
}
|
|
258657
258116
|
if (!options.yes) {
|
|
@@ -258673,7 +258132,6 @@ ${summaryLines.join(`
|
|
|
258673
258132
|
let functionCompleted = 0;
|
|
258674
258133
|
const functionTotal = functions.length;
|
|
258675
258134
|
const result = await deployAll(projectData, {
|
|
258676
|
-
site: false,
|
|
258677
258135
|
onVisibilitySet: (level) => {
|
|
258678
258136
|
log.success(`App visibility set to ${level}`);
|
|
258679
258137
|
},
|
|
@@ -258686,10 +258144,6 @@ ${summaryLines.join(`
|
|
|
258686
258144
|
formatDeployResult(r, log);
|
|
258687
258145
|
}
|
|
258688
258146
|
});
|
|
258689
|
-
const siteResult = await runAppSiteDeploy(ctx, project2, {
|
|
258690
|
-
gitHash: options.gitHash,
|
|
258691
|
-
concurrency: options.concurrency
|
|
258692
|
-
});
|
|
258693
258147
|
const connectorResults = result.connectorResults ?? [];
|
|
258694
258148
|
await handleOAuthConnectors(connectorResults, isNonInteractive, options, log);
|
|
258695
258149
|
const stripeResult = connectorResults.find((r) => r.type === "stripe");
|
|
@@ -258697,28 +258151,13 @@ ${summaryLines.join(`
|
|
|
258697
258151
|
printStripeResult(stripeResult, log);
|
|
258698
258152
|
}
|
|
258699
258153
|
log.message(`${theme.styles.header("Dashboard")}: ${theme.colors.links(getDashboardUrl())}`);
|
|
258700
|
-
if (
|
|
258701
|
-
log.message(`${theme.styles.header("App URL")}: ${theme.colors.links(
|
|
258702
|
-
}
|
|
258703
|
-
const deployment = siteResult.kind === "full-stack" || siteResult.kind === "static-deployment" ? siteResult : undefined;
|
|
258704
|
-
if (deployment) {
|
|
258705
|
-
printDeploymentSummary(deployment, log);
|
|
258154
|
+
if (result.appUrl) {
|
|
258155
|
+
log.message(`${theme.styles.header("App URL")}: ${theme.colors.links(result.appUrl)}`);
|
|
258706
258156
|
}
|
|
258707
|
-
return {
|
|
258708
|
-
outroMessage: "App deployed successfully",
|
|
258709
|
-
stdout: ctx.jsonMode && deployment ? `${JSON.stringify({
|
|
258710
|
-
deploymentId: deployment.deploymentId,
|
|
258711
|
-
gitHash: deployment.gitHash
|
|
258712
|
-
}, null, 2)}
|
|
258713
|
-
` : undefined
|
|
258714
|
-
};
|
|
258715
|
-
}
|
|
258716
|
-
function printDeploymentSummary(deployment, log) {
|
|
258717
|
-
log.message(`${theme.styles.header("Deployment")}: ${deployment.deploymentId} ${theme.styles.dim(`(commit ${deployment.gitHash.slice(0, 12)})`)}`);
|
|
258157
|
+
return { outroMessage: "App deployed successfully" };
|
|
258718
258158
|
}
|
|
258719
258159
|
function getDeployCommand2() {
|
|
258720
|
-
|
|
258721
|
-
return addDeploymentOptions(command2).action(deployAction);
|
|
258160
|
+
return new Base44Command("deploy").description("Deploy all project resources (entities, functions, agents, connectors, and site)").option("-y, --yes", "Skip confirmation prompt").option("--build", "Build the site before deploying (skips the prompt)").option("--no-build", "Deploy without building (skips the prompt)").action(deployAction);
|
|
258722
258161
|
}
|
|
258723
258162
|
async function handleOAuthConnectors(connectorResults, isNonInteractive, options, log) {
|
|
258724
258163
|
const needsOAuth = filterPendingOAuth(connectorResults);
|
|
@@ -258996,7 +258435,7 @@ async function followLogs(functionNames, options, availableFunctionNames, jsonMo
|
|
|
258996
258435
|
for (const entry of fresh)
|
|
258997
258436
|
writeFollowLine(entry, jsonMode);
|
|
258998
258437
|
first = false;
|
|
258999
|
-
await new Promise((
|
|
258438
|
+
await new Promise((resolve9) => setTimeout(resolve9, 2000));
|
|
259000
258439
|
}
|
|
259001
258440
|
}
|
|
259002
258441
|
function formatLogs(entries, env3) {
|
|
@@ -259106,11 +258545,13 @@ async function logsAction(ctx, options) {
|
|
|
259106
258545
|
};
|
|
259107
258546
|
}
|
|
259108
258547
|
function getLogsCommand() {
|
|
259109
|
-
return new Base44Command("logs").description("Fetch function logs for this app").option("--function <names>", "Filter by function name(s), comma-separated. If omitted, fetches logs for all project functions").option("--since <datetime>", "Show logs from this time. ISO datetime or relative shorthand (e.g. 1h, 30m, 2d)", normalizeDatetime).option("--until <datetime>", "Show logs until this time. ISO datetime or relative shorthand (e.g. 1h, 30m, 2d)", normalizeDatetime).addOption(new Option("--level <level>", "Filter by log level").choices([
|
|
258548
|
+
return new Base44Command("logs").description("Fetch function logs for this app").option("--function <names>", "Filter by function name(s), comma-separated. If omitted, fetches logs for all project functions").option("--since <datetime>", "Show logs from this time. ISO datetime or relative shorthand (e.g. 1h, 30m, 2d)", normalizeDatetime).option("--until <datetime>", "Show logs until this time. ISO datetime or relative shorthand (e.g. 1h, 30m, 2d)", normalizeDatetime).addOption(new Option("--level <level>", "Filter by log level").choices([
|
|
258549
|
+
...LogLevelSchema.options
|
|
258550
|
+
])).option("-n, --limit <n>", "Results per page (1-1000, default: 50)").option("-f, --follow", "Stream new logs as they arrive").addOption(new Option("--order <order>", "Sort order").choices(["asc", "desc"])).addOption(new Option("--env <env>", "Which deployment to read logs from: preview (current draft) or prod (published). Default: preview").choices([...LogEnvSchema.options])).action(logsAction);
|
|
259110
258551
|
}
|
|
259111
258552
|
|
|
259112
258553
|
// src/cli/commands/project/scaffold.ts
|
|
259113
|
-
import { basename as basename6, resolve as
|
|
258554
|
+
import { basename as basename6, resolve as resolve9 } from "node:path";
|
|
259114
258555
|
function resolveAppId(options) {
|
|
259115
258556
|
const appId = options.appId;
|
|
259116
258557
|
if (!appId) {
|
|
@@ -259126,7 +258567,7 @@ function resolveAppId(options) {
|
|
|
259126
258567
|
async function scaffoldAction(ctx, name2, options, command2) {
|
|
259127
258568
|
const { log, runTask: runTask2 } = ctx;
|
|
259128
258569
|
const appId = resolveAppId(command2.optsWithGlobals());
|
|
259129
|
-
const resolvedPath =
|
|
258570
|
+
const resolvedPath = resolve9("./");
|
|
259130
258571
|
const projectName = (name2 ?? basename6(resolvedPath)).trim();
|
|
259131
258572
|
const template2 = await getTemplateById("backend-only");
|
|
259132
258573
|
log.info(`Scaffolding project at ${resolvedPath}`);
|
|
@@ -259523,7 +258964,7 @@ function getSecretsListCommand() {
|
|
|
259523
258964
|
}
|
|
259524
258965
|
|
|
259525
258966
|
// src/cli/commands/secrets/set.ts
|
|
259526
|
-
import { resolve as
|
|
258967
|
+
import { resolve as resolve10 } from "node:path";
|
|
259527
258968
|
function parseEntries(entries) {
|
|
259528
258969
|
const secrets = {};
|
|
259529
258970
|
for (const entry of entries) {
|
|
@@ -259554,7 +258995,7 @@ async function setSecretsAction({ log, runTask: runTask2 }, entries, options) {
|
|
|
259554
258995
|
validateInput(entries, options);
|
|
259555
258996
|
let secrets;
|
|
259556
258997
|
if (options.envFile) {
|
|
259557
|
-
secrets = await parseEnvFile(
|
|
258998
|
+
secrets = await parseEnvFile(resolve10(options.envFile));
|
|
259558
258999
|
if (Object.keys(secrets).length === 0) {
|
|
259559
259000
|
throw new InvalidInputError("The env file contains no valid KEY=VALUE entries.");
|
|
259560
259001
|
}
|
|
@@ -259583,53 +259024,92 @@ function getSecretsCommand() {
|
|
|
259583
259024
|
}
|
|
259584
259025
|
|
|
259585
259026
|
// src/cli/commands/site/deploy.ts
|
|
259027
|
+
import { resolve as resolve11 } from "node:path";
|
|
259586
259028
|
async function deployAction2(ctx, options) {
|
|
259587
259029
|
const { isNonInteractive } = ctx;
|
|
259588
259030
|
if (isNonInteractive && !options.yes) {
|
|
259589
259031
|
throw new InvalidInputError("--yes is required in non-interactive mode");
|
|
259590
259032
|
}
|
|
259591
259033
|
const { project: project2 } = await readProjectConfig();
|
|
259592
|
-
const
|
|
259593
|
-
if (
|
|
259034
|
+
const outputDirectory = project2.site?.outputDirectory;
|
|
259035
|
+
if (!outputDirectory) {
|
|
259594
259036
|
throw new ConfigNotFoundError("No site configuration found.", {
|
|
259595
259037
|
hints: [
|
|
259596
259038
|
{
|
|
259597
259039
|
message: `Add 'site.outputDirectory' to your config.jsonc (e.g., "site": { "outputDirectory": "dist" })`
|
|
259598
|
-
},
|
|
259599
|
-
{
|
|
259600
|
-
message: "Full-stack apps ship from their build artifact — run your framework's build first"
|
|
259601
259040
|
}
|
|
259602
259041
|
]
|
|
259603
259042
|
});
|
|
259604
259043
|
}
|
|
259605
259044
|
if (!options.yes) {
|
|
259606
259045
|
const shouldDeploy = await Re({
|
|
259607
|
-
message:
|
|
259046
|
+
message: `Deploy site from ${outputDirectory}?`
|
|
259608
259047
|
});
|
|
259609
259048
|
if (Ct(shouldDeploy) || !shouldDeploy) {
|
|
259610
259049
|
return { outroMessage: "Deployment cancelled" };
|
|
259611
259050
|
}
|
|
259612
259051
|
}
|
|
259613
259052
|
await maybeBuildBeforeDeploy(ctx, project2, options.build);
|
|
259614
|
-
const
|
|
259615
|
-
|
|
259616
|
-
|
|
259617
|
-
|
|
259618
|
-
|
|
259619
|
-
|
|
259620
|
-
|
|
259621
|
-
|
|
259053
|
+
const outputDir = resolve11(project2.root, outputDirectory);
|
|
259054
|
+
const { gitHash, concurrency } = options;
|
|
259055
|
+
return gitHash ? await deployToDeploymentsApi(ctx, outputDir, gitHash, concurrency) : await deployTarball(ctx, outputDir);
|
|
259056
|
+
}
|
|
259057
|
+
async function deployToDeploymentsApi({ runTask: runTask2, log, jsonMode }, outputDir, gitHash, concurrency) {
|
|
259058
|
+
const progressLines = [];
|
|
259059
|
+
const { deploymentId } = await runTask2("Deploying site...", async (updateMessage) => await deployStaticSite({
|
|
259060
|
+
outputDir,
|
|
259061
|
+
gitHash,
|
|
259062
|
+
concurrency,
|
|
259063
|
+
progress: {
|
|
259064
|
+
onAssets: ({ totalAssets, newAssets }) => {
|
|
259065
|
+
const line = `Found ${totalAssets} static assets (${newAssets} new)`;
|
|
259066
|
+
progressLines.push(line);
|
|
259067
|
+
updateMessage(line);
|
|
259068
|
+
},
|
|
259069
|
+
onAssetUpload: ({ uploadedFiles, totalFiles }) => {
|
|
259070
|
+
updateMessage(`Uploaded ${uploadedFiles} of ${totalFiles} assets`);
|
|
259071
|
+
}
|
|
259072
|
+
}
|
|
259073
|
+
}), { successMessage: "Site deployed", errorMessage: "Site deploy failed" });
|
|
259074
|
+
for (const line of progressLines) {
|
|
259075
|
+
log.message(theme.styles.dim(line));
|
|
259076
|
+
}
|
|
259077
|
+
return {
|
|
259078
|
+
outroMessage: `Deployment ${deploymentId} (commit ${gitHash.slice(0, 12)})`,
|
|
259079
|
+
stdout: jsonMode ? `${JSON.stringify({ deploymentId, gitHash }, null, 2)}
|
|
259622
259080
|
` : undefined
|
|
259623
|
-
|
|
259081
|
+
};
|
|
259082
|
+
}
|
|
259083
|
+
async function deployTarball({ runTask: runTask2 }, outputDir) {
|
|
259084
|
+
const { appUrl } = await runTask2("Creating archive and deploying site...", async () => await deploySite(outputDir), {
|
|
259085
|
+
successMessage: "Site deployed successfully",
|
|
259086
|
+
errorMessage: "Deployment failed"
|
|
259087
|
+
});
|
|
259088
|
+
return { outroMessage: `Visit your site at: ${appUrl}` };
|
|
259089
|
+
}
|
|
259090
|
+
function getSiteDeployCommand() {
|
|
259091
|
+
const command2 = new Base44Command("deploy").description("Deploy built site files to Base44 hosting").option("-y, --yes", "Skip confirmation prompt").option("--build", "Build the site before deploying (skips the prompt)").option("--no-build", "Deploy without building (skips the prompt)");
|
|
259092
|
+
if (staticDeploymentsEnabled()) {
|
|
259093
|
+
command2.addOption(new Option("--git-hash <hash>", "Commit the build came from — deploys through the deployments API").argParser((value) => {
|
|
259094
|
+
if (!isGitCommitHash(value)) {
|
|
259095
|
+
throw new InvalidArgumentError("Expected a git commit hash (7-64 hex chars).");
|
|
259096
|
+
}
|
|
259097
|
+
return value;
|
|
259098
|
+
}));
|
|
259099
|
+
command2.addOption(new Option("--concurrency <n>", "Parallel asset uploads").default(DEFAULT_UPLOAD_CONCURRENCY).argParser(parseConcurrency));
|
|
259624
259100
|
}
|
|
259625
|
-
|
|
259626
|
-
|
|
259101
|
+
return command2.action(deployAction2);
|
|
259102
|
+
}
|
|
259103
|
+
function parseConcurrency(value) {
|
|
259104
|
+
const parsed = Number(value);
|
|
259105
|
+
if (!Number.isInteger(parsed) || parsed < 1 || parsed > MAX_UPLOAD_CONCURRENCY) {
|
|
259106
|
+
throw new InvalidArgumentError(`Expected a whole number between 1 and ${MAX_UPLOAD_CONCURRENCY}.`);
|
|
259627
259107
|
}
|
|
259628
|
-
return
|
|
259108
|
+
return parsed;
|
|
259629
259109
|
}
|
|
259630
|
-
function
|
|
259631
|
-
const
|
|
259632
|
-
return
|
|
259110
|
+
function staticDeploymentsEnabled(env3 = process.env) {
|
|
259111
|
+
const value = env3.BASE44_STATIC_DEPLOYMENTS;
|
|
259112
|
+
return value === "1" || value === "true";
|
|
259633
259113
|
}
|
|
259634
259114
|
|
|
259635
259115
|
// src/cli/commands/site/open.ts
|
|
@@ -259736,10 +259216,10 @@ function toPascalCase(name2) {
|
|
|
259736
259216
|
return name2.split(/[-_\s]+/).map((w8) => w8.charAt(0).toUpperCase() + w8.slice(1)).join("");
|
|
259737
259217
|
}
|
|
259738
259218
|
// src/core/types/update-project.ts
|
|
259739
|
-
import { join as
|
|
259219
|
+
import { join as join28 } from "node:path";
|
|
259740
259220
|
var TYPES_INCLUDE_PATH = `${PROJECT_SUBDIR}/${TYPES_OUTPUT_SUBDIR}/*.d.ts`;
|
|
259741
259221
|
async function updateProjectConfig(projectRoot) {
|
|
259742
|
-
const tsconfigPath =
|
|
259222
|
+
const tsconfigPath = join28(projectRoot, "tsconfig.json");
|
|
259743
259223
|
if (!await pathExists(tsconfigPath)) {
|
|
259744
259224
|
return false;
|
|
259745
259225
|
}
|
|
@@ -259974,7 +259454,7 @@ function createDevLogger(label2, labelColor = theme.styles.dim) {
|
|
|
259974
259454
|
// src/cli/dev/dev-server/main.ts
|
|
259975
259455
|
var import_cors = __toESM(require_lib4(), 1);
|
|
259976
259456
|
var import_express6 = __toESM(require_express(), 1);
|
|
259977
|
-
import { dirname as
|
|
259457
|
+
import { dirname as dirname23, join as join35 } from "node:path";
|
|
259978
259458
|
|
|
259979
259459
|
// ../../node_modules/get-port/index.js
|
|
259980
259460
|
import net from "node:net";
|
|
@@ -260001,14 +259481,14 @@ var getLocalHosts = () => {
|
|
|
260001
259481
|
}
|
|
260002
259482
|
return results;
|
|
260003
259483
|
};
|
|
260004
|
-
var checkAvailablePort = (options8) => new Promise((
|
|
259484
|
+
var checkAvailablePort = (options8) => new Promise((resolve13, reject) => {
|
|
260005
259485
|
const server = net.createServer();
|
|
260006
259486
|
server.unref();
|
|
260007
259487
|
server.on("error", reject);
|
|
260008
259488
|
server.listen(options8, () => {
|
|
260009
259489
|
const { port } = server.address();
|
|
260010
259490
|
server.close(() => {
|
|
260011
|
-
|
|
259491
|
+
resolve13(port);
|
|
260012
259492
|
});
|
|
260013
259493
|
});
|
|
260014
259494
|
});
|
|
@@ -260109,7 +259589,7 @@ var $setGracefulCleanup = tmp.setGracefulCleanup;
|
|
|
260109
259589
|
|
|
260110
259590
|
// src/cli/dev/dev-server/function-manager.ts
|
|
260111
259591
|
import { spawn as spawn2 } from "node:child_process";
|
|
260112
|
-
import { dirname as
|
|
259592
|
+
import { dirname as dirname20, join as join29 } from "node:path";
|
|
260113
259593
|
import { pathToFileURL } from "node:url";
|
|
260114
259594
|
|
|
260115
259595
|
// src/cli/dev/dev-server/base-function-manager.ts
|
|
@@ -260214,7 +259694,7 @@ class FunctionManager extends BaseFunctionManager {
|
|
|
260214
259694
|
}
|
|
260215
259695
|
spawnFunction(func, port) {
|
|
260216
259696
|
this.logger.log(`Spawning function "${func.name}" on port ${port}`);
|
|
260217
|
-
const importMapPath =
|
|
259697
|
+
const importMapPath = join29(dirname20(this.wrapperPath), "import-map.json");
|
|
260218
259698
|
const process23 = spawn2("deno", ["run", "--allow-all", "--import-map", importMapPath, this.wrapperPath], {
|
|
260219
259699
|
env: {
|
|
260220
259700
|
...globalThis.process.env,
|
|
@@ -260253,7 +259733,7 @@ class FunctionManager extends BaseFunctionManager {
|
|
|
260253
259733
|
});
|
|
260254
259734
|
}
|
|
260255
259735
|
waitForReady(name2, runningFunc) {
|
|
260256
|
-
return new Promise((
|
|
259736
|
+
return new Promise((resolve13, reject) => {
|
|
260257
259737
|
runningFunc.process.on("exit", (code2) => {
|
|
260258
259738
|
if (!runningFunc.ready) {
|
|
260259
259739
|
clearTimeout(timeout3);
|
|
@@ -260276,7 +259756,7 @@ class FunctionManager extends BaseFunctionManager {
|
|
|
260276
259756
|
runningFunc.ready = true;
|
|
260277
259757
|
clearTimeout(timeout3);
|
|
260278
259758
|
runningFunc.process.stdout?.off("data", onData);
|
|
260279
|
-
|
|
259759
|
+
resolve13(runningFunc.port);
|
|
260280
259760
|
}
|
|
260281
259761
|
};
|
|
260282
259762
|
runningFunc.process.stdout?.on("data", onData);
|
|
@@ -260288,7 +259768,7 @@ class FunctionManager extends BaseFunctionManager {
|
|
|
260288
259768
|
import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "node:fs";
|
|
260289
259769
|
import { isBuiltin } from "node:module";
|
|
260290
259770
|
import { homedir as homedir3 } from "node:os";
|
|
260291
|
-
import { join as
|
|
259771
|
+
import { join as join30 } from "node:path";
|
|
260292
259772
|
import { pathToFileURL as pathToFileURL6 } from "node:url";
|
|
260293
259773
|
var depsPromise;
|
|
260294
259774
|
function loadDeps() {
|
|
@@ -260409,9 +259889,9 @@ export default {
|
|
|
260409
259889
|
};
|
|
260410
259890
|
`;
|
|
260411
259891
|
function ensureBundlerConfig() {
|
|
260412
|
-
const dir =
|
|
259892
|
+
const dir = join30(homedir3(), ".base44", "function-bundler");
|
|
260413
259893
|
mkdirSync2(dir, { recursive: true });
|
|
260414
|
-
const configPath =
|
|
259894
|
+
const configPath = join30(dir, "deno.json");
|
|
260415
259895
|
writeFileSync2(configPath, `${JSON.stringify({ nodeModulesDir: "auto" }, null, 2)}
|
|
260416
259896
|
`);
|
|
260417
259897
|
return configPath;
|
|
@@ -261862,16 +261342,16 @@ function createCustomIntegrationRoutes(remoteProxy, logger2) {
|
|
|
261862
261342
|
|
|
261863
261343
|
// src/cli/dev/dev-server/watcher.ts
|
|
261864
261344
|
import { EventEmitter as EventEmitter4 } from "node:events";
|
|
261865
|
-
import { relative as
|
|
261345
|
+
import { relative as relative6 } from "node:path";
|
|
261866
261346
|
|
|
261867
261347
|
// ../../node_modules/chokidar/index.js
|
|
261868
261348
|
import { EventEmitter as EventEmitter3 } from "node:events";
|
|
261869
261349
|
import { stat as statcb, Stats } from "node:fs";
|
|
261870
|
-
import { readdir as readdir3, stat as
|
|
261350
|
+
import { readdir as readdir3, stat as stat5 } from "node:fs/promises";
|
|
261871
261351
|
import * as sp3 from "node:path";
|
|
261872
261352
|
|
|
261873
261353
|
// ../../node_modules/readdirp/index.js
|
|
261874
|
-
import { lstat as lstat2, readdir as readdir2, realpath, stat as
|
|
261354
|
+
import { lstat as lstat2, readdir as readdir2, realpath, stat as stat3 } from "node:fs/promises";
|
|
261875
261355
|
import { join as pjoin, relative as prelative, resolve as presolve, sep as psep } from "node:path";
|
|
261876
261356
|
import { Readable as Readable6 } from "node:stream";
|
|
261877
261357
|
var EntryTypes = {
|
|
@@ -261953,7 +261433,7 @@ class ReaddirpStream extends Readable6 {
|
|
|
261953
261433
|
const { root: root2, type } = opts;
|
|
261954
261434
|
this._fileFilter = normalizeFilter(opts.fileFilter);
|
|
261955
261435
|
this._directoryFilter = normalizeFilter(opts.directoryFilter);
|
|
261956
|
-
const statMethod = opts.lstat ? lstat2 :
|
|
261436
|
+
const statMethod = opts.lstat ? lstat2 : stat3;
|
|
261957
261437
|
if (wantBigintFsStats) {
|
|
261958
261438
|
this._stat = (path19) => statMethod(path19, { bigint: true });
|
|
261959
261439
|
} else {
|
|
@@ -262106,7 +261586,7 @@ function readdirp(root2, options8 = {}) {
|
|
|
262106
261586
|
|
|
262107
261587
|
// ../../node_modules/chokidar/handler.js
|
|
262108
261588
|
import { watch as fs_watch, unwatchFile, watchFile } from "node:fs";
|
|
262109
|
-
import { realpath as fsrealpath, lstat as lstat3, open as open2, stat as
|
|
261589
|
+
import { realpath as fsrealpath, lstat as lstat3, open as open2, stat as stat4 } from "node:fs/promises";
|
|
262110
261590
|
import { type as osType } from "node:os";
|
|
262111
261591
|
import * as sp2 from "node:path";
|
|
262112
261592
|
var STR_DATA = "data";
|
|
@@ -262132,7 +261612,7 @@ var EVENTS = {
|
|
|
262132
261612
|
};
|
|
262133
261613
|
var EV = EVENTS;
|
|
262134
261614
|
var THROTTLE_MODE_WATCH = "watch";
|
|
262135
|
-
var statMethods = { lstat: lstat3, stat:
|
|
261615
|
+
var statMethods = { lstat: lstat3, stat: stat4 };
|
|
262136
261616
|
var KEY_LISTENERS = "listeners";
|
|
262137
261617
|
var KEY_ERR = "errHandlers";
|
|
262138
261618
|
var KEY_RAW = "rawEmitters";
|
|
@@ -262592,9 +262072,9 @@ class NodeFsHandler {
|
|
|
262592
262072
|
if (this.fsw.closed) {
|
|
262593
262073
|
return;
|
|
262594
262074
|
}
|
|
262595
|
-
const
|
|
262075
|
+
const dirname22 = sp2.dirname(file2);
|
|
262596
262076
|
const basename8 = sp2.basename(file2);
|
|
262597
|
-
const parent = this.fsw._getWatchedDir(
|
|
262077
|
+
const parent = this.fsw._getWatchedDir(dirname22);
|
|
262598
262078
|
let prevStats = stats;
|
|
262599
262079
|
if (parent.has(basename8))
|
|
262600
262080
|
return;
|
|
@@ -262603,7 +262083,7 @@ class NodeFsHandler {
|
|
|
262603
262083
|
return;
|
|
262604
262084
|
if (!newStats || newStats.mtimeMs === 0) {
|
|
262605
262085
|
try {
|
|
262606
|
-
const newStats2 = await
|
|
262086
|
+
const newStats2 = await stat4(file2);
|
|
262607
262087
|
if (this.fsw.closed)
|
|
262608
262088
|
return;
|
|
262609
262089
|
const at13 = newStats2.atimeMs;
|
|
@@ -262621,7 +262101,7 @@ class NodeFsHandler {
|
|
|
262621
262101
|
prevStats = newStats2;
|
|
262622
262102
|
}
|
|
262623
262103
|
} catch (error48) {
|
|
262624
|
-
this.fsw._remove(
|
|
262104
|
+
this.fsw._remove(dirname22, basename8);
|
|
262625
262105
|
}
|
|
262626
262106
|
} else if (parent.has(basename8)) {
|
|
262627
262107
|
const at13 = newStats.atimeMs;
|
|
@@ -262710,7 +262190,7 @@ class NodeFsHandler {
|
|
|
262710
262190
|
this._addToNodeFs(path19, initialAdd, wh2, depth + 1);
|
|
262711
262191
|
}
|
|
262712
262192
|
}).on(EV.ERROR, this._boundHandleError);
|
|
262713
|
-
return new Promise((
|
|
262193
|
+
return new Promise((resolve14, reject) => {
|
|
262714
262194
|
if (!stream)
|
|
262715
262195
|
return reject();
|
|
262716
262196
|
stream.once(STR_END, () => {
|
|
@@ -262719,7 +262199,7 @@ class NodeFsHandler {
|
|
|
262719
262199
|
return;
|
|
262720
262200
|
}
|
|
262721
262201
|
const wasThrottled = throttler ? throttler.clear() : false;
|
|
262722
|
-
|
|
262202
|
+
resolve14(undefined);
|
|
262723
262203
|
previous.getChildren().filter((item) => {
|
|
262724
262204
|
return item !== directory && !current.has(item);
|
|
262725
262205
|
}).forEach((item) => {
|
|
@@ -262844,11 +262324,11 @@ function createPattern(matcher) {
|
|
|
262844
262324
|
if (matcher.path === string4)
|
|
262845
262325
|
return true;
|
|
262846
262326
|
if (matcher.recursive) {
|
|
262847
|
-
const
|
|
262848
|
-
if (!
|
|
262327
|
+
const relative6 = sp3.relative(matcher.path, string4);
|
|
262328
|
+
if (!relative6) {
|
|
262849
262329
|
return false;
|
|
262850
262330
|
}
|
|
262851
|
-
return !
|
|
262331
|
+
return !relative6.startsWith("..") && !sp3.isAbsolute(relative6);
|
|
262852
262332
|
}
|
|
262853
262333
|
return false;
|
|
262854
262334
|
};
|
|
@@ -263275,7 +262755,7 @@ class FSWatcher extends EventEmitter3 {
|
|
|
263275
262755
|
const fullPath = opts.cwd ? sp3.join(opts.cwd, path19) : path19;
|
|
263276
262756
|
let stats2;
|
|
263277
262757
|
try {
|
|
263278
|
-
stats2 = await
|
|
262758
|
+
stats2 = await stat5(fullPath);
|
|
263279
262759
|
} catch (err) {}
|
|
263280
262760
|
if (!stats2 || this.closed)
|
|
263281
262761
|
return;
|
|
@@ -263379,8 +262859,8 @@ class FSWatcher extends EventEmitter3 {
|
|
|
263379
262859
|
}
|
|
263380
262860
|
return this._userIgnored(path19, stats);
|
|
263381
262861
|
}
|
|
263382
|
-
_isntIgnored(path19,
|
|
263383
|
-
return !this._isIgnored(path19,
|
|
262862
|
+
_isntIgnored(path19, stat6) {
|
|
262863
|
+
return !this._isIgnored(path19, stat6);
|
|
263384
262864
|
}
|
|
263385
262865
|
_getWatchHelpers(path19) {
|
|
263386
262866
|
return new WatchHelper(path19, this.options.followSymlinks, this);
|
|
@@ -263547,7 +263027,7 @@ class WatchBase44 extends EventEmitter4 {
|
|
|
263547
263027
|
ignoreInitial: true
|
|
263548
263028
|
});
|
|
263549
263029
|
watcher.on("all", import_debounce.default(async (_event, path19) => {
|
|
263550
|
-
this.emit("change", name2,
|
|
263030
|
+
this.emit("change", name2, relative6(targetPath, path19));
|
|
263551
263031
|
}, WATCH_DEBOUNCE_MS));
|
|
263552
263032
|
watcher.on("error", (err) => {
|
|
263553
263033
|
this.logger.error(`Watch handler failed for ${targetPath}`, err);
|
|
@@ -263636,7 +263116,7 @@ async function createDevServer(options8) {
|
|
|
263636
263116
|
}
|
|
263637
263117
|
remoteProxy(req, res, next);
|
|
263638
263118
|
});
|
|
263639
|
-
const server = await new Promise((
|
|
263119
|
+
const server = await new Promise((resolve15, reject) => {
|
|
263640
263120
|
const s5 = app.listen(port, "127.0.0.1", (err) => {
|
|
263641
263121
|
if (err) {
|
|
263642
263122
|
if ("code" in err && err.code === "EADDRINUSE") {
|
|
@@ -263645,7 +263125,7 @@ async function createDevServer(options8) {
|
|
|
263645
263125
|
reject(err);
|
|
263646
263126
|
}
|
|
263647
263127
|
} else {
|
|
263648
|
-
|
|
263128
|
+
resolve15(s5);
|
|
263649
263129
|
}
|
|
263650
263130
|
});
|
|
263651
263131
|
});
|
|
@@ -263654,8 +263134,8 @@ async function createDevServer(options8) {
|
|
|
263654
263134
|
broadcastEntityEvent(io6, appId, entityName, event);
|
|
263655
263135
|
};
|
|
263656
263136
|
const base44ConfigWatcher = new WatchBase44({
|
|
263657
|
-
functions:
|
|
263658
|
-
entities:
|
|
263137
|
+
functions: join35(dirname23(project2.configPath), project2.functionsDir),
|
|
263138
|
+
entities: join35(dirname23(project2.configPath), project2.entitiesDir)
|
|
263659
263139
|
}, devLogger);
|
|
263660
263140
|
base44ConfigWatcher.on("change", async (name2) => {
|
|
263661
263141
|
try {
|
|
@@ -263695,13 +263175,13 @@ async function createDevServer(options8) {
|
|
|
263695
263175
|
if (!server.listening) {
|
|
263696
263176
|
return;
|
|
263697
263177
|
}
|
|
263698
|
-
await new Promise((
|
|
263178
|
+
await new Promise((resolve15, reject) => {
|
|
263699
263179
|
server.close((error48) => {
|
|
263700
263180
|
if (error48) {
|
|
263701
263181
|
reject(error48);
|
|
263702
263182
|
return;
|
|
263703
263183
|
}
|
|
263704
|
-
|
|
263184
|
+
resolve15();
|
|
263705
263185
|
});
|
|
263706
263186
|
});
|
|
263707
263187
|
};
|
|
@@ -263772,15 +263252,15 @@ class ServeRunner {
|
|
|
263772
263252
|
return;
|
|
263773
263253
|
}
|
|
263774
263254
|
this.stopping = true;
|
|
263775
|
-
const exited = new Promise((
|
|
263255
|
+
const exited = new Promise((resolve15) => child.once("exit", () => resolve15()));
|
|
263776
263256
|
if (process23.platform === "win32" && child.pid) {
|
|
263777
263257
|
const taskkill = spawn3("taskkill", ["/pid", String(child.pid), "/T", "/F"], {
|
|
263778
263258
|
stdio: "ignore",
|
|
263779
263259
|
windowsHide: true
|
|
263780
263260
|
});
|
|
263781
|
-
await new Promise((
|
|
263782
|
-
taskkill.once("exit", () =>
|
|
263783
|
-
taskkill.once("error", () =>
|
|
263261
|
+
await new Promise((resolve15) => {
|
|
263262
|
+
taskkill.once("exit", () => resolve15());
|
|
263263
|
+
taskkill.once("error", () => resolve15());
|
|
263784
263264
|
});
|
|
263785
263265
|
} else if (child.pid) {
|
|
263786
263266
|
try {
|
|
@@ -263950,13 +263430,13 @@ async function runScript(options8) {
|
|
|
263950
263430
|
}
|
|
263951
263431
|
// src/cli/commands/exec.ts
|
|
263952
263432
|
function readStdin2() {
|
|
263953
|
-
return new Promise((
|
|
263433
|
+
return new Promise((resolve15, reject) => {
|
|
263954
263434
|
let data = "";
|
|
263955
263435
|
process.stdin.setEncoding("utf-8");
|
|
263956
263436
|
process.stdin.on("data", (chunk) => {
|
|
263957
263437
|
data += chunk;
|
|
263958
263438
|
});
|
|
263959
|
-
process.stdin.on("end", () =>
|
|
263439
|
+
process.stdin.on("end", () => resolve15(data));
|
|
263960
263440
|
process.stdin.on("error", reject);
|
|
263961
263441
|
});
|
|
263962
263442
|
}
|
|
@@ -264027,7 +263507,7 @@ Examples:
|
|
|
264027
263507
|
}
|
|
264028
263508
|
|
|
264029
263509
|
// src/cli/commands/project/eject.ts
|
|
264030
|
-
import { resolve as
|
|
263510
|
+
import { resolve as resolve15 } from "node:path";
|
|
264031
263511
|
var import_kebabCase2 = __toESM(require_kebabCase(), 1);
|
|
264032
263512
|
async function eject(ctx, options8, command2) {
|
|
264033
263513
|
const { log, runTask: runTask2, isNonInteractive } = ctx;
|
|
@@ -264091,7 +263571,7 @@ async function eject(ctx, options8, command2) {
|
|
|
264091
263571
|
Ne("Operation cancelled.");
|
|
264092
263572
|
throw new CLIExitError(0);
|
|
264093
263573
|
}
|
|
264094
|
-
const resolvedPath =
|
|
263574
|
+
const resolvedPath = resolve15(selectedPath);
|
|
264095
263575
|
await runTask2("Downloading your project's code...", async (updateMessage) => {
|
|
264096
263576
|
await createProjectFilesForExistingProject({
|
|
264097
263577
|
projectId,
|
|
@@ -264184,7 +263664,7 @@ var import_detect_agent = __toESM(require_dist5(), 1);
|
|
|
264184
263664
|
import { release, type } from "node:os";
|
|
264185
263665
|
|
|
264186
263666
|
// ../../node_modules/posthog-node/dist/extensions/error-tracking/modifiers/module.node.mjs
|
|
264187
|
-
import { dirname as
|
|
263667
|
+
import { dirname as dirname24, posix, sep } from "path";
|
|
264188
263668
|
function createModulerModifier() {
|
|
264189
263669
|
const getModuleFromFileName = createGetModuleFromFilename();
|
|
264190
263670
|
return async (frames) => {
|
|
@@ -264193,7 +263673,7 @@ function createModulerModifier() {
|
|
|
264193
263673
|
return frames;
|
|
264194
263674
|
};
|
|
264195
263675
|
}
|
|
264196
|
-
function createGetModuleFromFilename(basePath = process.argv[1] ?
|
|
263676
|
+
function createGetModuleFromFilename(basePath = process.argv[1] ? dirname24(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
|
|
264197
263677
|
const normalizedBase = isWindows5 ? normalizeWindowsPath2(basePath) : basePath;
|
|
264198
263678
|
return (filename) => {
|
|
264199
263679
|
if (!filename)
|
|
@@ -266471,14 +265951,14 @@ async function addSourceContext(frames) {
|
|
|
266471
265951
|
return frames;
|
|
266472
265952
|
}
|
|
266473
265953
|
function getContextLinesFromFile(path19, ranges, output) {
|
|
266474
|
-
return new Promise((
|
|
265954
|
+
return new Promise((resolve16) => {
|
|
266475
265955
|
const stream = createReadStream2(path19);
|
|
266476
265956
|
const lineReaded = createInterface2({
|
|
266477
265957
|
input: stream
|
|
266478
265958
|
});
|
|
266479
265959
|
function destroyStreamAndResolve() {
|
|
266480
265960
|
stream.destroy();
|
|
266481
|
-
|
|
265961
|
+
resolve16();
|
|
266482
265962
|
}
|
|
266483
265963
|
let lineNumber = 0;
|
|
266484
265964
|
let currentRangeIndex = 0;
|
|
@@ -267590,15 +267070,15 @@ class PostHogBackendClient extends PostHogCoreStateless {
|
|
|
267590
267070
|
return true;
|
|
267591
267071
|
if (this.featureFlagsPoller === undefined)
|
|
267592
267072
|
return false;
|
|
267593
|
-
return new Promise((
|
|
267073
|
+
return new Promise((resolve16) => {
|
|
267594
267074
|
const timeout3 = setTimeout(() => {
|
|
267595
267075
|
cleanup();
|
|
267596
|
-
|
|
267076
|
+
resolve16(false);
|
|
267597
267077
|
}, timeoutMs);
|
|
267598
267078
|
const cleanup = this._events.on("localEvaluationFlagsLoaded", (count2) => {
|
|
267599
267079
|
clearTimeout(timeout3);
|
|
267600
267080
|
cleanup();
|
|
267601
|
-
|
|
267081
|
+
resolve16(count2 > 0);
|
|
267602
267082
|
});
|
|
267603
267083
|
});
|
|
267604
267084
|
}
|
|
@@ -268382,9 +267862,9 @@ function addCommandInfoToErrorReporter(program2, errorReporter) {
|
|
|
268382
267862
|
});
|
|
268383
267863
|
}
|
|
268384
267864
|
// src/cli/index.ts
|
|
268385
|
-
var __dirname4 =
|
|
267865
|
+
var __dirname4 = dirname25(fileURLToPath6(import.meta.url));
|
|
268386
267866
|
async function runCLI(options8) {
|
|
268387
|
-
ensureNpmAssets(
|
|
267867
|
+
ensureNpmAssets(join36(__dirname4, "../assets"));
|
|
268388
267868
|
const errorReporter = new ErrorReporter;
|
|
268389
267869
|
errorReporter.registerProcessErrorHandlers();
|
|
268390
267870
|
const jsonMode = process.argv.includes("--json");
|
|
@@ -268423,4 +267903,4 @@ export {
|
|
|
268423
267903
|
CLIExitError
|
|
268424
267904
|
};
|
|
268425
267905
|
|
|
268426
|
-
//# debugId=
|
|
267906
|
+
//# debugId=D124AF9A61B7AEE264756E2164756E21
|