Refactor bin scripts: shared CLI bootstrap, robust module migrate, and runtime locking
This commit is contained in:
@@ -25,57 +25,41 @@ require_once __DIR__ . '/module-cli-bootstrap.php';
|
||||
|
||||
function moduleBuildRun(): int
|
||||
{
|
||||
$warningsBefore = moduleCliVendorWarningsIgnoredTotal();
|
||||
moduleCliBootstrapApp();
|
||||
return moduleCliRunStep('module-build', static function (): int {
|
||||
$runtimeDir = __DIR__ . '/../storage/runtime/pages';
|
||||
$lockFile = __DIR__ . '/../storage/runtime/.module-build.lock';
|
||||
|
||||
$exitCode = 0;
|
||||
$runtimeDir = __DIR__ . '/../storage/runtime/pages';
|
||||
$lockFile = __DIR__ . '/../storage/runtime/.module-build.lock';
|
||||
|
||||
try {
|
||||
// Ensure runtime directory exists
|
||||
$runtimeParent = dirname($runtimeDir);
|
||||
if (!is_dir($runtimeParent) && !mkdir($runtimeParent, 0775, true) && !is_dir($runtimeParent)) {
|
||||
throw new \RuntimeException("Failed to create runtime directory: {$runtimeParent}");
|
||||
}
|
||||
|
||||
// Lock to prevent concurrent builds
|
||||
$lock = fopen($lockFile, 'c');
|
||||
if ($lock === false || !flock($lock, LOCK_EX | LOCK_NB)) {
|
||||
fwrite(STDERR, "module-build: another build is in progress, skipping.\n");
|
||||
return 0;
|
||||
}
|
||||
return moduleCliWithFileLock(
|
||||
$lockFile,
|
||||
'module-build: another build is in progress, skipping.',
|
||||
static function () use ($runtimeDir): int {
|
||||
$registry = app(ModuleRegistry::class);
|
||||
$modules = $registry->getModules();
|
||||
$builder = new ModuleRuntimePageBuilder();
|
||||
$result = $builder->build($runtimeDir, __DIR__ . '/../pages', $modules);
|
||||
|
||||
$registry = app(ModuleRegistry::class);
|
||||
$modules = $registry->getModules();
|
||||
$builder = new ModuleRuntimePageBuilder();
|
||||
$result = $builder->build($runtimeDir, __DIR__ . '/../pages', $modules);
|
||||
ModuleRuntimePageBuilder::writeFingerprint($runtimeDir, $modules);
|
||||
|
||||
ModuleRuntimePageBuilder::writeFingerprint($runtimeDir, $modules);
|
||||
if (count($modules) === 0) {
|
||||
fwrite(STDOUT, "module-build: no modules, runtime -> core pages (symlink).\n");
|
||||
} else {
|
||||
fwrite(STDOUT, sprintf(
|
||||
"module-build: runtime pages built - %d core entries + %d module entries.\n",
|
||||
(int) ($result['core_entries'] ?? 0),
|
||||
(int) ($result['module_entries'] ?? 0)
|
||||
));
|
||||
}
|
||||
|
||||
if (count($modules) === 0) {
|
||||
fwrite(STDOUT, "module-build: no modules, runtime → core pages (symlink).\n");
|
||||
} else {
|
||||
fwrite(STDOUT, sprintf(
|
||||
"module-build: runtime pages built — %d core entries + %d module entries.\n",
|
||||
(int) ($result['core_entries'] ?? 0),
|
||||
(int) ($result['module_entries'] ?? 0)
|
||||
));
|
||||
}
|
||||
} catch (Throwable $exception) {
|
||||
fwrite(STDERR, sprintf("module-build: FAILED: %s\n", $exception->getMessage()));
|
||||
$exitCode = 1;
|
||||
} finally {
|
||||
if (isset($lock) && is_resource($lock)) {
|
||||
flock($lock, LOCK_UN);
|
||||
fclose($lock);
|
||||
}
|
||||
}
|
||||
|
||||
$vendorWarningsIgnored = moduleCliVendorWarningsIgnoredSince($warningsBefore);
|
||||
fwrite(STDOUT, sprintf("module-build: vendor_warnings_ignored=%d\n", $vendorWarningsIgnored));
|
||||
|
||||
return $exitCode;
|
||||
return 0;
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
if (PHP_SAPI === 'cli' && realpath((string) ($_SERVER['SCRIPT_FILENAME'] ?? '')) === __FILE__) {
|
||||
|
||||
Reference in New Issue
Block a user