playcademy 0.13.6 → 0.13.7
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/index.js +30 -12
- package/dist/utils.d.ts +4 -1
- package/dist/utils.js +12 -3
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -7627,7 +7627,7 @@ function startHotReload(onReload, options = {}) {
|
|
|
7627
7627
|
init_src2();
|
|
7628
7628
|
import { mkdir as mkdir4 } from "fs/promises";
|
|
7629
7629
|
import { join as join17 } from "path";
|
|
7630
|
-
import { Miniflare } from "miniflare";
|
|
7630
|
+
import { Log, LogLevel, Miniflare } from "miniflare";
|
|
7631
7631
|
|
|
7632
7632
|
// ../utils/src/port.ts
|
|
7633
7633
|
import { existsSync as existsSync15, mkdirSync as mkdirSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "node:fs";
|
|
@@ -7708,14 +7708,22 @@ function isServerRunning(type, projectRoot) {
|
|
|
7708
7708
|
if (!info) {
|
|
7709
7709
|
return false;
|
|
7710
7710
|
}
|
|
7711
|
+
if (!Number.isInteger(info.pid) || info.pid <= 0) {
|
|
7712
|
+
cleanupServerInfo(type, projectRoot);
|
|
7713
|
+
return false;
|
|
7714
|
+
}
|
|
7711
7715
|
try {
|
|
7712
|
-
|
|
7713
|
-
|
|
7714
|
-
|
|
7715
|
-
|
|
7716
|
+
process.kill(info.pid, 0);
|
|
7717
|
+
return true;
|
|
7718
|
+
} catch (err) {
|
|
7719
|
+
const code = err && typeof err === "object" && "code" in err ? err.code : null;
|
|
7720
|
+
if (code === "ESRCH" || code === "EINVAL") {
|
|
7721
|
+
cleanupServerInfo(type, projectRoot);
|
|
7722
|
+
return false;
|
|
7723
|
+
}
|
|
7724
|
+
if (code === "EPERM") {
|
|
7716
7725
|
return true;
|
|
7717
7726
|
}
|
|
7718
|
-
} catch {
|
|
7719
7727
|
cleanupServerInfo(type, projectRoot);
|
|
7720
7728
|
return false;
|
|
7721
7729
|
}
|
|
@@ -7749,11 +7757,18 @@ function cleanupServerInfo(type, projectRoot, pid) {
|
|
|
7749
7757
|
init_constants2();
|
|
7750
7758
|
init_loader();
|
|
7751
7759
|
init_core();
|
|
7760
|
+
var FilteredLog = class extends Log {
|
|
7761
|
+
logWithLevel(level, message) {
|
|
7762
|
+
if (message.includes("Ready on")) return;
|
|
7763
|
+
console.log(message);
|
|
7764
|
+
}
|
|
7765
|
+
};
|
|
7752
7766
|
async function startDevServer(options) {
|
|
7753
7767
|
const {
|
|
7754
7768
|
port: preferredPort,
|
|
7755
7769
|
config: providedConfig,
|
|
7756
|
-
platformUrl = process.env.PLAYCADEMY_BASE_URL || "http://localhost:5174"
|
|
7770
|
+
platformUrl = process.env.PLAYCADEMY_BASE_URL || "http://localhost:5174",
|
|
7771
|
+
logger: logger2 = true
|
|
7757
7772
|
} = options;
|
|
7758
7773
|
const port = await findAvailablePort(preferredPort);
|
|
7759
7774
|
const config = providedConfig ?? await loadConfig();
|
|
@@ -7767,8 +7782,10 @@ async function startDevServer(options) {
|
|
|
7767
7782
|
const dbDir = hasDatabase ? await ensureDatabaseDirectory() : void 0;
|
|
7768
7783
|
const hasKV = hasKVSetup(config);
|
|
7769
7784
|
const kvDir = hasKV ? await ensureKvDirectory() : void 0;
|
|
7785
|
+
const log2 = logger2 ? new FilteredLog(LogLevel.INFO) : new Log(LogLevel.NONE);
|
|
7770
7786
|
const mf = new Miniflare({
|
|
7771
7787
|
port,
|
|
7788
|
+
log: log2,
|
|
7772
7789
|
modules: [
|
|
7773
7790
|
{
|
|
7774
7791
|
type: "ESModule",
|
|
@@ -7791,7 +7808,7 @@ async function startDevServer(options) {
|
|
|
7791
7808
|
await initializeDatabase(mf);
|
|
7792
7809
|
}
|
|
7793
7810
|
await writeBackendServerInfo(port);
|
|
7794
|
-
return mf;
|
|
7811
|
+
return { server: mf, port };
|
|
7795
7812
|
}
|
|
7796
7813
|
async function ensureDatabaseDirectory() {
|
|
7797
7814
|
const dbDir = join17(getWorkspace(), CLI_DIRECTORIES.DATABASE);
|
|
@@ -8688,11 +8705,12 @@ async function setupServerHotReload(serverRef, port, workspace, config, loggerEn
|
|
|
8688
8705
|
await serverRef.current.dispose();
|
|
8689
8706
|
}
|
|
8690
8707
|
const newConfig = await loadConfig();
|
|
8691
|
-
|
|
8708
|
+
const { server } = await startDevServer({
|
|
8692
8709
|
port,
|
|
8693
8710
|
config: newConfig,
|
|
8694
8711
|
logger: loggerEnabled
|
|
8695
8712
|
});
|
|
8713
|
+
serverRef.current = server;
|
|
8696
8714
|
await discoverRoutes(getCustomRoutesDirectory(workspace, newConfig));
|
|
8697
8715
|
},
|
|
8698
8716
|
{ config }
|
|
@@ -8718,9 +8736,9 @@ async function runDevServer(options) {
|
|
|
8718
8736
|
logger.newLine();
|
|
8719
8737
|
return;
|
|
8720
8738
|
}
|
|
8721
|
-
const
|
|
8722
|
-
const server = await startDevServer({
|
|
8723
|
-
port,
|
|
8739
|
+
const requestedPort = parseInt(options.port, 10);
|
|
8740
|
+
const { server, port } = await startDevServer({
|
|
8741
|
+
port: requestedPort,
|
|
8724
8742
|
config,
|
|
8725
8743
|
logger: options.logger !== false
|
|
8726
8744
|
});
|
package/dist/utils.d.ts
CHANGED
|
@@ -115,7 +115,10 @@ interface DevServerOptions {
|
|
|
115
115
|
* Start the local development server using Miniflare
|
|
116
116
|
* Returns the Miniflare instance which can be disposed for hot reload
|
|
117
117
|
*/
|
|
118
|
-
declare function startDevServer(options: DevServerOptions): Promise<
|
|
118
|
+
declare function startDevServer(options: DevServerOptions): Promise<{
|
|
119
|
+
server: Miniflare;
|
|
120
|
+
port: number;
|
|
121
|
+
}>;
|
|
119
122
|
|
|
120
123
|
interface HotReloadOptions {
|
|
121
124
|
/** Custom success logger (defaults to CLI logger) */
|
package/dist/utils.js
CHANGED
|
@@ -559,7 +559,7 @@ function processConfigVariables(config) {
|
|
|
559
559
|
// src/lib/dev/server.ts
|
|
560
560
|
import { mkdir as mkdir2 } from "fs/promises";
|
|
561
561
|
import { join as join7 } from "path";
|
|
562
|
-
import { Miniflare } from "miniflare";
|
|
562
|
+
import { Log, LogLevel, Miniflare } from "miniflare";
|
|
563
563
|
|
|
564
564
|
// ../utils/src/port.ts
|
|
565
565
|
import { existsSync as existsSync2, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
@@ -1463,11 +1463,18 @@ function hasKVSetup(config) {
|
|
|
1463
1463
|
}
|
|
1464
1464
|
|
|
1465
1465
|
// src/lib/dev/server.ts
|
|
1466
|
+
var FilteredLog = class extends Log {
|
|
1467
|
+
logWithLevel(level, message) {
|
|
1468
|
+
if (message.includes("Ready on")) return;
|
|
1469
|
+
console.log(message);
|
|
1470
|
+
}
|
|
1471
|
+
};
|
|
1466
1472
|
async function startDevServer(options) {
|
|
1467
1473
|
const {
|
|
1468
1474
|
port: preferredPort,
|
|
1469
1475
|
config: providedConfig,
|
|
1470
|
-
platformUrl = process.env.PLAYCADEMY_BASE_URL || "http://localhost:5174"
|
|
1476
|
+
platformUrl = process.env.PLAYCADEMY_BASE_URL || "http://localhost:5174",
|
|
1477
|
+
logger: logger2 = true
|
|
1471
1478
|
} = options;
|
|
1472
1479
|
const port = await findAvailablePort(preferredPort);
|
|
1473
1480
|
const config = providedConfig ?? await loadConfig();
|
|
@@ -1481,8 +1488,10 @@ async function startDevServer(options) {
|
|
|
1481
1488
|
const dbDir = hasDatabase ? await ensureDatabaseDirectory() : void 0;
|
|
1482
1489
|
const hasKV = hasKVSetup(config);
|
|
1483
1490
|
const kvDir = hasKV ? await ensureKvDirectory() : void 0;
|
|
1491
|
+
const log2 = logger2 ? new FilteredLog(LogLevel.INFO) : new Log(LogLevel.NONE);
|
|
1484
1492
|
const mf = new Miniflare({
|
|
1485
1493
|
port,
|
|
1494
|
+
log: log2,
|
|
1486
1495
|
modules: [
|
|
1487
1496
|
{
|
|
1488
1497
|
type: "ESModule",
|
|
@@ -1505,7 +1514,7 @@ async function startDevServer(options) {
|
|
|
1505
1514
|
await initializeDatabase(mf);
|
|
1506
1515
|
}
|
|
1507
1516
|
await writeBackendServerInfo(port);
|
|
1508
|
-
return mf;
|
|
1517
|
+
return { server: mf, port };
|
|
1509
1518
|
}
|
|
1510
1519
|
async function ensureDatabaseDirectory() {
|
|
1511
1520
|
const dbDir = join7(getWorkspace(), CLI_DIRECTORIES.DATABASE);
|