ludicord 2.2.0 → 2.2.4
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/README.md +8 -6
- package/bin/ludicord.js +0 -0
- package/dist/api/runtime.d.ts +4 -0
- package/dist/api/runtime.js +61 -10
- package/dist/auth/client.d.ts +10 -0
- package/dist/auth/client.js +81 -8
- package/dist/auth/index.d.ts +1 -1
- package/dist/auth/index.js +1 -1
- package/dist/auth/server.js +175 -32
- package/dist/auth/types.d.ts +5 -0
- package/dist/cli/index.js +14 -13
- package/dist/cli/project-commands.js +49 -34
- package/dist/compiler/build.js +37 -127
- package/dist/compiler/client-entry.d.ts +4 -0
- package/dist/compiler/client-entry.js +35 -0
- package/dist/compiler/client-tooling.d.ts +5 -0
- package/dist/compiler/client-tooling.js +97 -0
- package/dist/compiler/scanner.js +8 -0
- package/dist/compiler/server-bundle.d.ts +11 -0
- package/dist/compiler/server-bundle.js +31 -0
- package/dist/compiler/type-generation.js +11 -2
- package/dist/config/defaults.js +28 -2
- package/dist/config/environment.d.ts +2 -0
- package/dist/config/environment.js +18 -0
- package/dist/discord/data.d.ts +21 -0
- package/dist/discord/data.js +91 -0
- package/dist/discord/events.d.ts +42 -4
- package/dist/discord/events.js +120 -41
- package/dist/discord/index.d.ts +4 -2
- package/dist/discord/index.js +2 -1
- package/dist/discord/runtime.d.ts +2 -2
- package/dist/discord/runtime.js +9 -13
- package/dist/discord/testing.d.ts +1 -0
- package/dist/discord/testing.js +10 -0
- package/dist/manifests/types.d.ts +4 -0
- package/dist/navigation/index.d.ts +2 -0
- package/dist/runtime/client/dev-panel.d.ts +2 -0
- package/dist/runtime/client/dev-panel.js +63 -0
- package/dist/runtime/client/embed-router.d.ts +4 -1
- package/dist/runtime/client/embed-router.js +69 -17
- package/dist/runtime/client/files.d.ts +23 -0
- package/dist/runtime/client/files.js +12 -0
- package/dist/runtime/client/minimize-card.js +4 -4
- package/dist/runtime/client/minimize.d.ts +1 -0
- package/dist/runtime/client/minimize.js +1 -0
- package/dist/runtime/client/root.d.ts +7 -0
- package/dist/runtime/client/root.js +19 -0
- package/dist/runtime/index.d.ts +8 -4
- package/dist/runtime/index.js +14 -2
- package/dist/runtime/server/dev-server.d.ts +1 -0
- package/dist/runtime/server/dev-server.js +294 -282
- package/dist/runtime/server/diagnostics.d.ts +17 -0
- package/dist/runtime/server/diagnostics.js +87 -0
- package/dist/runtime/server/index.d.ts +5 -0
- package/dist/runtime/server/index.js +3 -0
- package/dist/runtime/server/production-server.js +14 -1
- package/dist/security/discord.d.ts +9 -0
- package/dist/security/discord.js +37 -7
- package/dist/security/secret-scan.d.ts +3 -0
- package/dist/security/secret-scan.js +40 -0
- package/dist/server/discord-rest.d.ts +45 -0
- package/dist/server/discord-rest.js +46 -0
- package/dist/server/index.d.ts +2 -0
- package/dist/server/index.js +1 -0
- package/dist/sessions/cookies.d.ts +4 -1
- package/dist/sessions/cookies.js +17 -4
- package/dist/sessions/crypto.js +6 -0
- package/dist/testing/index.d.ts +13 -0
- package/dist/testing/index.js +24 -0
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dist/ws/client.d.ts +6 -0
- package/dist/ws/client.js +46 -10
- package/dist/ws/server.d.ts +4 -0
- package/dist/ws/server.js +36 -15
- package/package.json +31 -4
- package/dist/api/runtime.d.ts.map +0 -1
- package/dist/api/runtime.js.map +0 -1
- package/dist/auth/client.d.ts.map +0 -1
- package/dist/auth/client.js.map +0 -1
- package/dist/auth/index.d.ts.map +0 -1
- package/dist/auth/index.js.map +0 -1
- package/dist/auth/server.d.ts.map +0 -1
- package/dist/auth/server.js.map +0 -1
- package/dist/auth/types.d.ts.map +0 -1
- package/dist/auth/types.js.map +0 -1
- package/dist/cli/index.d.ts.map +0 -1
- package/dist/cli/index.js.map +0 -1
- package/dist/cli/project-commands.d.ts.map +0 -1
- package/dist/cli/project-commands.js.map +0 -1
- package/dist/compiler/build.d.ts.map +0 -1
- package/dist/compiler/build.js.map +0 -1
- package/dist/compiler/index.d.ts.map +0 -1
- package/dist/compiler/index.js.map +0 -1
- package/dist/compiler/scanner.d.ts.map +0 -1
- package/dist/compiler/scanner.js.map +0 -1
- package/dist/compiler/type-generation.d.ts.map +0 -1
- package/dist/compiler/type-generation.js.map +0 -1
- package/dist/compiler/write-manifests.d.ts.map +0 -1
- package/dist/compiler/write-manifests.js.map +0 -1
- package/dist/config/defaults.d.ts.map +0 -1
- package/dist/config/defaults.js.map +0 -1
- package/dist/config/index.d.ts.map +0 -1
- package/dist/config/index.js.map +0 -1
- package/dist/config/loader.d.ts.map +0 -1
- package/dist/config/loader.js.map +0 -1
- package/dist/config/project-root.d.ts.map +0 -1
- package/dist/config/project-root.js.map +0 -1
- package/dist/config/types.d.ts.map +0 -1
- package/dist/config/types.js.map +0 -1
- package/dist/discord/events.d.ts.map +0 -1
- package/dist/discord/events.js.map +0 -1
- package/dist/discord/index.d.ts.map +0 -1
- package/dist/discord/index.js.map +0 -1
- package/dist/discord/runtime.d.ts.map +0 -1
- package/dist/discord/runtime.js.map +0 -1
- package/dist/discord/safe-area.d.ts.map +0 -1
- package/dist/discord/safe-area.js.map +0 -1
- package/dist/discord/testing.d.ts.map +0 -1
- package/dist/discord/testing.js.map +0 -1
- package/dist/index.d.ts.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/manifests/types.d.ts.map +0 -1
- package/dist/manifests/types.js.map +0 -1
- package/dist/navigation/index.d.ts.map +0 -1
- package/dist/navigation/index.js.map +0 -1
- package/dist/router/match.d.ts.map +0 -1
- package/dist/router/match.js.map +0 -1
- package/dist/runtime/client/embed-router.d.ts.map +0 -1
- package/dist/runtime/client/embed-router.js.map +0 -1
- package/dist/runtime/client/minimize-card.d.ts.map +0 -1
- package/dist/runtime/client/minimize-card.js.map +0 -1
- package/dist/runtime/client/minimize.d.ts.map +0 -1
- package/dist/runtime/client/minimize.js.map +0 -1
- package/dist/runtime/index.d.ts.map +0 -1
- package/dist/runtime/index.js.map +0 -1
- package/dist/runtime/server/dev-server.d.ts.map +0 -1
- package/dist/runtime/server/dev-server.js.map +0 -1
- package/dist/runtime/server/production-server.d.ts.map +0 -1
- package/dist/runtime/server/production-server.js.map +0 -1
- package/dist/security/discord.d.ts.map +0 -1
- package/dist/security/discord.js.map +0 -1
- package/dist/security/index.d.ts.map +0 -1
- package/dist/security/index.js.map +0 -1
- package/dist/server/index.d.ts.map +0 -1
- package/dist/server/index.js.map +0 -1
- package/dist/server/session.d.ts.map +0 -1
- package/dist/server/session.js.map +0 -1
- package/dist/server/types.d.ts.map +0 -1
- package/dist/server/types.js.map +0 -1
- package/dist/sessions/cookies.d.ts.map +0 -1
- package/dist/sessions/cookies.js.map +0 -1
- package/dist/sessions/crypto.d.ts.map +0 -1
- package/dist/sessions/crypto.js.map +0 -1
- package/dist/shared/errors.d.ts.map +0 -1
- package/dist/shared/errors.js.map +0 -1
- package/dist/testing/index.d.ts.map +0 -1
- package/dist/testing/index.js.map +0 -1
- package/dist/version.d.ts.map +0 -1
- package/dist/version.js.map +0 -1
- package/dist/ws/client.d.ts.map +0 -1
- package/dist/ws/client.js.map +0 -1
- package/dist/ws/index.d.ts.map +0 -1
- package/dist/ws/index.js.map +0 -1
- package/dist/ws/server.d.ts.map +0 -1
- package/dist/ws/server.js.map +0 -1
|
@@ -1,310 +1,322 @@
|
|
|
1
1
|
import { createServer } from "node:http";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { networkInterfaces } from "node:os";
|
|
2
|
+
import { existsSync, watch } from "node:fs";
|
|
3
|
+
import { randomUUID } from "node:crypto";
|
|
5
4
|
import path from "node:path";
|
|
6
5
|
import { fileURLToPath } from "node:url";
|
|
7
|
-
import react from "@vitejs/plugin-react";
|
|
8
6
|
import express from "express";
|
|
9
|
-
import { createServer as createViteServer, normalizePath
|
|
7
|
+
import { createServer as createViteServer, normalizePath } from "vite";
|
|
8
|
+
import { TraceMap, originalPositionFor } from "@jridgewell/trace-mapping";
|
|
10
9
|
import { generateManifests } from "../../compiler/scanner.js";
|
|
11
10
|
import { generateLudicordTypes } from "../../compiler/type-generation.js";
|
|
11
|
+
import { clientEntry } from "../../compiler/client-entry.js";
|
|
12
|
+
import { clientAliases, clientPlugins, ludicordLogger } from "../../compiler/client-tooling.js";
|
|
13
|
+
import { bundleServerGraph } from "../../compiler/server-bundle.js";
|
|
12
14
|
import { createLudicordAuthRouter } from "../../auth/server.js";
|
|
13
15
|
import { createApiMiddleware } from "../../api/runtime.js";
|
|
14
|
-
import { attachWebSocketRuntime
|
|
16
|
+
import { attachWebSocketRuntime } from "../../ws/server.js";
|
|
15
17
|
import { loadLudicordConfig } from "../../config/loader.js";
|
|
18
|
+
import { loadProjectEnvironment } from "../../config/environment.js";
|
|
16
19
|
import { LUDICORD_VERSION } from "../../version.js";
|
|
17
|
-
|
|
18
|
-
const
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
20
|
+
import { diagnostic, sourceFrame, watchProjectTypes } from "./diagnostics.js";
|
|
21
|
+
const ENTRY = "virtual:ludicord-activity-entry";
|
|
22
|
+
const RESOLVED_ENTRY = "\0" + ENTRY;
|
|
23
|
+
const PANEL = "virtual:ludicord-dev-panel";
|
|
24
|
+
export async function createLudicordDevServer(options) {
|
|
25
|
+
const projectRoot = path.resolve(options.projectRoot);
|
|
26
|
+
loadProjectEnvironment(projectRoot, "development");
|
|
27
|
+
const { config } = await loadLudicordConfig(projectRoot);
|
|
28
|
+
let manifests = generateManifests(projectRoot);
|
|
29
|
+
generateLudicordTypes(projectRoot, manifests, config);
|
|
30
|
+
process.setSourceMapsEnabled?.(true);
|
|
31
|
+
const app = express();
|
|
32
|
+
const httpServer = createServer(app);
|
|
33
|
+
const issues = new Map();
|
|
34
|
+
let vite;
|
|
35
|
+
let websocket;
|
|
36
|
+
let typeWatcher;
|
|
37
|
+
let sourceWatcher;
|
|
38
|
+
const changedFiles = new Map();
|
|
39
|
+
let graph;
|
|
40
|
+
let revision = 0;
|
|
41
|
+
const runId = randomUUID();
|
|
42
|
+
const serverIssues = new Set();
|
|
43
|
+
const reportedErrors = new WeakSet();
|
|
44
|
+
let closed = false;
|
|
45
|
+
let rebuilding = Promise.resolve();
|
|
46
|
+
const publish = () => vite?.ws.send({ type: "custom", event: "ludicord:diagnostics", data: { issues: [...issues.values()] } });
|
|
47
|
+
const report = (error, file, kind = "runtime") => {
|
|
48
|
+
if (error !== null && typeof error === "object") {
|
|
49
|
+
if (reportedErrors.has(error))
|
|
50
|
+
return;
|
|
51
|
+
reportedErrors.add(error);
|
|
52
|
+
}
|
|
53
|
+
const item = diagnostic(error, projectRoot, file, kind);
|
|
54
|
+
issues.set(kind + ":" + (item.file ?? "runtime"), item);
|
|
55
|
+
console.error("\nLudicord " + kind + " error · " + (item.file ?? "Activity") + ":" + (item.line ?? 1) + ":" + (item.column ?? 1) + "\n" + item.message + (item.frame ? "\n" + item.frame : ""));
|
|
56
|
+
if (options.debug && item.stack)
|
|
57
|
+
console.error(item.stack);
|
|
58
|
+
publish();
|
|
44
59
|
};
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
60
|
+
const refreshManifests = () => {
|
|
61
|
+
manifests = generateManifests(projectRoot);
|
|
62
|
+
generateLudicordTypes(projectRoot, manifests, config);
|
|
63
|
+
return manifests;
|
|
64
|
+
};
|
|
65
|
+
const rebuildServer = (file) => {
|
|
66
|
+
rebuilding = rebuilding.then(async () => {
|
|
67
|
+
if (closed)
|
|
68
|
+
return;
|
|
69
|
+
const started = performance.now();
|
|
70
|
+
const name = file === undefined ? "server routes" : normalizePath(path.relative(projectRoot, file));
|
|
71
|
+
if (manifests.api.length + manifests.websocket.length > 0)
|
|
72
|
+
console.log("compiling " + name);
|
|
73
|
+
try {
|
|
74
|
+
const next = await bundleServerGraph(projectRoot, path.join(projectRoot, ".ludicord", "dev", runId, String(++revision)), manifests);
|
|
75
|
+
graph = next;
|
|
76
|
+
for (const key of serverIssues)
|
|
77
|
+
issues.delete(key);
|
|
78
|
+
serverIssues.clear();
|
|
79
|
+
for (const key of issues.keys()) {
|
|
80
|
+
if (key.startsWith("compile:server") || key === "compile:" + name || key === "runtime:" + name)
|
|
81
|
+
issues.delete(key);
|
|
82
|
+
}
|
|
83
|
+
if (file !== undefined)
|
|
84
|
+
websocket?.reload();
|
|
85
|
+
if (manifests.api.length + manifests.websocket.length > 0)
|
|
86
|
+
console.log("compiled " + name + " (" + Math.round(performance.now() - started) + "ms)");
|
|
87
|
+
publish();
|
|
88
|
+
}
|
|
89
|
+
catch (error) {
|
|
90
|
+
report(error, file ?? "server routes", "compile");
|
|
91
|
+
const item = diagnostic(error, projectRoot, file ?? "server routes", "compile");
|
|
92
|
+
serverIssues.add("compile:" + (item.file ?? "runtime"));
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
return rebuilding;
|
|
96
|
+
};
|
|
97
|
+
const isServerFile = (file) => {
|
|
98
|
+
const relative = normalizePath(path.relative(projectRoot, file));
|
|
99
|
+
return /^app\/(api|ws)\//.test(relative) || graph?.dependencies.has(path.resolve(file)) === true;
|
|
100
|
+
};
|
|
101
|
+
const plugin = {
|
|
102
|
+
name: "ludicord:activity-runtime", enforce: "pre",
|
|
58
103
|
resolveId(id) {
|
|
59
|
-
|
|
104
|
+
if (id === ENTRY)
|
|
105
|
+
return RESOLVED_ENTRY;
|
|
106
|
+
if (id === PANEL)
|
|
107
|
+
return fileURLToPath(new URL("../client/dev-panel.js", import.meta.url));
|
|
108
|
+
return undefined;
|
|
60
109
|
},
|
|
61
|
-
load(id) {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
: undefined;
|
|
110
|
+
load(id) { return id === RESOLVED_ENTRY ? clientEntry(projectRoot, manifests, config, true) : undefined; },
|
|
111
|
+
configureServer(server) {
|
|
112
|
+
server.watcher.add(path.join(projectRoot, "app"));
|
|
65
113
|
},
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
if (normalizedId.startsWith(`${appDirectory}/`)) {
|
|
70
|
-
console.log(`compiling ${path.relative(projectRoot, id).split(path.sep).join("/")}`);
|
|
114
|
+
async handleHotUpdate(context) {
|
|
115
|
+
if (isServerFile(context.file)) {
|
|
116
|
+
return [];
|
|
71
117
|
}
|
|
72
|
-
|
|
118
|
+
const relative = normalizePath(path.relative(projectRoot, context.file));
|
|
119
|
+
issues.delete("runtime:" + relative);
|
|
120
|
+
issues.delete("runtime:runtime");
|
|
121
|
+
issues.delete("compile:" + relative);
|
|
122
|
+
publish();
|
|
123
|
+
return context.modules;
|
|
73
124
|
},
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
125
|
+
};
|
|
126
|
+
try {
|
|
127
|
+
vite = await createViteServer({
|
|
128
|
+
configFile: false, root: projectRoot, appType: "custom",
|
|
129
|
+
cacheDir: path.join(projectRoot, ".ludicord", "cache", "client"),
|
|
130
|
+
customLogger: ludicordLogger((error) => report(error, undefined, "compile")),
|
|
131
|
+
server: {
|
|
132
|
+
middlewareMode: true, allowedHosts: config.server.allowedHosts === true ? true : [...config.server.allowedHosts],
|
|
133
|
+
hmr: options.hmr === false ? false : { server: httpServer, overlay: false },
|
|
134
|
+
watch: { ignored: ["**/.ludicord/**", "**/.dact/**"] },
|
|
135
|
+
},
|
|
136
|
+
resolve: { dedupe: ["react", "react-dom"], alias: clientAliases(projectRoot) },
|
|
137
|
+
plugins: [plugin, ...await clientPlugins(projectRoot, (file, elapsed) => {
|
|
138
|
+
if (elapsed === undefined)
|
|
139
|
+
console.log("compiling " + file);
|
|
140
|
+
else {
|
|
141
|
+
console.log("compiled " + file + " (" + elapsed + "ms)");
|
|
142
|
+
issues.delete("compile:" + file);
|
|
143
|
+
publish();
|
|
144
|
+
}
|
|
145
|
+
})],
|
|
146
|
+
});
|
|
147
|
+
await rebuildServer();
|
|
148
|
+
// Server modules are compiled outside the browser graph, so watch them independently.
|
|
149
|
+
sourceWatcher = watch(projectRoot, { recursive: true }, (event, name) => {
|
|
150
|
+
if (name === null || closed)
|
|
151
|
+
return;
|
|
152
|
+
const relative = normalizePath(String(name));
|
|
153
|
+
if (/(^|\/)(node_modules|\.ludicord|\.dact|\.git)(\/|$)/.test(relative))
|
|
154
|
+
return;
|
|
155
|
+
const file = path.resolve(projectRoot, relative);
|
|
156
|
+
if (!isServerFile(file) && !(event === "rename" && relative.startsWith("app/") && /\.[cm]?[jt]sx?$/.test(relative)))
|
|
157
|
+
return;
|
|
158
|
+
clearTimeout(changedFiles.get(file));
|
|
159
|
+
changedFiles.set(file, setTimeout(() => {
|
|
160
|
+
changedFiles.delete(file);
|
|
80
161
|
try {
|
|
81
162
|
refreshManifests();
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
163
|
+
if (isServerFile(file))
|
|
164
|
+
void rebuildServer(file);
|
|
165
|
+
else {
|
|
166
|
+
const entry = vite?.moduleGraph.getModuleById(RESOLVED_ENTRY);
|
|
167
|
+
if (entry)
|
|
168
|
+
vite?.moduleGraph.invalidateModule(entry);
|
|
169
|
+
vite?.ws.send({ type: "full-reload", path: "*" });
|
|
85
170
|
}
|
|
86
|
-
server.ws.send({ type: "full-reload", path: "*" });
|
|
87
171
|
}
|
|
88
172
|
catch (error) {
|
|
89
|
-
|
|
173
|
+
report(error, file, "compile");
|
|
90
174
|
}
|
|
91
|
-
};
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
175
|
+
}, 80));
|
|
176
|
+
});
|
|
177
|
+
const loadModule = async (file) => {
|
|
178
|
+
await rebuilding;
|
|
179
|
+
if (graph === undefined)
|
|
180
|
+
throw new Error("LUDICORD3003: Fix the server compilation errors shown in Ludicord dev.");
|
|
181
|
+
return graph.loadModule(file);
|
|
182
|
+
};
|
|
183
|
+
websocket = attachWebSocketRuntime(httpServer, {
|
|
184
|
+
projectRoot, getRoutes: () => manifests.websocket,
|
|
185
|
+
loadModule: (file) => loadModule(file),
|
|
186
|
+
...(process.env.LUDICORD_SESSION_SECRET === undefined ? {} : { sessionSecret: process.env.LUDICORD_SESSION_SECRET }),
|
|
187
|
+
heartbeatInterval: config.websocket.heartbeatInterval, maxPayload: config.websocket.maxPayload,
|
|
188
|
+
compression: config.websocket.compression, enabled: config.websocket.enabled, allowDevelopmentSessions: true,
|
|
189
|
+
onError: (error, file) => report(error, file),
|
|
190
|
+
});
|
|
191
|
+
app.use("/_ludicord/auth", createLudicordAuthRouter({
|
|
192
|
+
...(config.discord.clientId === undefined ? {} : { clientId: config.discord.clientId }), production: false,
|
|
193
|
+
activityInstanceVerification: config.discord.auth.activityInstanceVerification,
|
|
194
|
+
}));
|
|
195
|
+
app.get("/_ludicord/dev/diagnostics", (_request, response) => response.json({ issues: [...issues.values()] }));
|
|
196
|
+
app.post("/_ludicord/dev/error", express.json({ limit: "64kb" }), async (request, response) => {
|
|
197
|
+
const body = request.body;
|
|
198
|
+
let item = diagnostic({ message: typeof body.message === "string" ? body.message : "Activity runtime error", stack: typeof body.stack === "string" ? body.stack : undefined }, projectRoot);
|
|
199
|
+
const stack = typeof body.stack === "string" ? body.stack : "";
|
|
200
|
+
const match = [...stack.matchAll(/https?:\/\/[^\s)]+?((?:\/@fs\/|\/app\/|\/components\/|\/lib\/)[^\s)]*?):(\d+):(\d+)/g)][0];
|
|
201
|
+
if (match?.[1]) {
|
|
202
|
+
try {
|
|
203
|
+
const moduleUrl = match[1];
|
|
204
|
+
const transformed = await vite?.transformRequest(moduleUrl);
|
|
205
|
+
const line = Number(match[2]);
|
|
206
|
+
const column = Number(match[3]);
|
|
207
|
+
const mapped = transformed?.map ? originalPositionFor(new TraceMap(transformed.map), { line, column: Math.max(0, column - 1) }) : null;
|
|
208
|
+
const pathname = decodeURIComponent(moduleUrl.split("?", 1)[0] ?? moduleUrl);
|
|
209
|
+
const moduleFile = pathname.startsWith("/@fs/") ? pathname.slice(5) : path.resolve(projectRoot, pathname.replace(/^\//, ""));
|
|
210
|
+
const source = mapped?.source;
|
|
211
|
+
const candidates = source ? [
|
|
212
|
+
source.startsWith("file:") ? fileURLToPath(source) : source,
|
|
213
|
+
path.resolve(projectRoot, source.replace(/^\//, "")),
|
|
214
|
+
path.resolve(path.dirname(moduleFile), source),
|
|
215
|
+
] : [moduleFile];
|
|
216
|
+
for (const file of candidates) {
|
|
217
|
+
const frame = sourceFrame(projectRoot, file, mapped?.line ?? line, (mapped?.column ?? column - 1) + 1);
|
|
218
|
+
if (frame !== undefined) {
|
|
219
|
+
item = { ...item, file: normalizePath(path.relative(projectRoot, file)), line: mapped?.line ?? line, column: (mapped?.column ?? column - 1) + 1, frame };
|
|
220
|
+
break;
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
catch { /* Preserve the original error when a source map is unavailable. */ }
|
|
98
225
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
{
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
}
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
226
|
+
issues.set("runtime:" + (item.file ?? "runtime"), item);
|
|
227
|
+
console.error("Ludicord runtime error · " + (item.file ?? "Activity") + "\n" + item.message + (item.frame ? "\n" + item.frame : ""));
|
|
228
|
+
response.json(item);
|
|
229
|
+
});
|
|
230
|
+
app.use(createApiMiddleware({
|
|
231
|
+
projectRoot, getRoutes: () => manifests.api, loadModule: (file) => loadModule(file),
|
|
232
|
+
...(process.env.LUDICORD_SESSION_SECRET === undefined ? {} : { sessionSecret: process.env.LUDICORD_SESSION_SECRET }),
|
|
233
|
+
proxyVerification: config.discord.auth.proxyVerification,
|
|
234
|
+
...(process.env.LUDICORD_DISCORD_PUBLIC_KEY === undefined ? {} : { discordPublicKey: process.env.LUDICORD_DISCORD_PUBLIC_KEY }),
|
|
235
|
+
bodyLimit: config.server.limits.body, allowDevelopmentSessions: true, onError: (error, file) => report(error, file),
|
|
236
|
+
}));
|
|
237
|
+
app.get("/_ludicord/manifest", (_request, response) => {
|
|
238
|
+
try {
|
|
239
|
+
response.json(refreshManifests());
|
|
240
|
+
}
|
|
241
|
+
catch (error) {
|
|
242
|
+
report(error, undefined, "compile");
|
|
243
|
+
response.status(500).json({ error: "LUDICORD_INVALID_MANIFEST" });
|
|
244
|
+
}
|
|
245
|
+
});
|
|
246
|
+
app.get("/", async (request, response, next) => {
|
|
247
|
+
try {
|
|
248
|
+
const html = await vite?.transformIndexHtml(request.originalUrl, '<!doctype html><html><head><meta charset="UTF-8" /><meta name="viewport" content="width=device-width, initial-scale=1.0" /><title>Ludicord Activity</title></head><body><div id="ludicord-root"></div><script type="module" src="/@id/' + PANEL + '"></script><script type="module">import "' + ENTRY + '";</script></body></html>');
|
|
249
|
+
response.status(200).type("html").send(html);
|
|
250
|
+
}
|
|
251
|
+
catch (error) {
|
|
252
|
+
next(error);
|
|
253
|
+
}
|
|
254
|
+
});
|
|
255
|
+
app.use(vite.middlewares);
|
|
256
|
+
app.use((error, _request, response, _next) => {
|
|
257
|
+
report(error);
|
|
258
|
+
if (!response.headersSent)
|
|
259
|
+
response.status(500).json({ error: "LUDICORD_DEV_ERROR", message: "See the Ludicord error panel or terminal for the source location." });
|
|
260
|
+
});
|
|
261
|
+
let typeSignature = "";
|
|
262
|
+
typeWatcher = watchProjectTypes(projectRoot, (items) => {
|
|
263
|
+
const signature = JSON.stringify(items);
|
|
264
|
+
if (typeSignature === signature)
|
|
265
|
+
return;
|
|
266
|
+
typeSignature = signature;
|
|
267
|
+
for (const key of issues.keys())
|
|
268
|
+
if (key.startsWith("type:"))
|
|
269
|
+
issues.delete(key);
|
|
270
|
+
for (const [index, item] of items.entries()) {
|
|
271
|
+
issues.set("type:" + (item.file ?? "project") + ":" + index, item);
|
|
272
|
+
console.error("Ludicord type error · " + (item.file ?? "project") + ":" + (item.line ?? 1) + ":" + (item.column ?? 1) + "\n" + item.message + (item.frame ? "\n" + item.frame : ""));
|
|
273
|
+
}
|
|
274
|
+
publish();
|
|
275
|
+
});
|
|
276
|
+
const host = options.host ?? config.server.host;
|
|
277
|
+
await new Promise((resolve, reject) => {
|
|
278
|
+
httpServer.once("error", reject);
|
|
279
|
+
httpServer.listen(options.port ?? config.server.port, host, () => { httpServer.off("error", reject); resolve(); });
|
|
280
|
+
});
|
|
281
|
+
const port = httpServer.address().port;
|
|
282
|
+
const displayHost = ["0.0.0.0", "::", "127.0.0.1"].includes(host) ? "localhost" : host;
|
|
283
|
+
const url = "http://" + displayHost + ":" + port;
|
|
284
|
+
return {
|
|
285
|
+
app, vite, websocket, port, host, url, getManifests: () => manifests, refreshManifests,
|
|
286
|
+
formatReadyMessage() {
|
|
287
|
+
const environments = [".env", ".env.local", ".env.development", ".env.development.local"].filter((name) => existsSync(path.join(projectRoot, name)));
|
|
288
|
+
return "Ludicord " + LUDICORD_VERSION + "\nDiscord Activity Framework\n\n Local: " + url +
|
|
289
|
+
(environments.length ? "\n Environment: " + environments.join(", ") : "") +
|
|
290
|
+
"\n\n✓ app/pages.tsx\n✓ Embed router\n" + (options.hmr === false ? "– HMR disabled" : "✓ HMR") + "\n✓ API / WS hot updates\n\nReady";
|
|
150
291
|
},
|
|
151
|
-
{
|
|
152
|
-
|
|
153
|
-
|
|
292
|
+
async close() {
|
|
293
|
+
if (closed)
|
|
294
|
+
return;
|
|
295
|
+
closed = true;
|
|
296
|
+
typeWatcher?.close();
|
|
297
|
+
sourceWatcher?.close();
|
|
298
|
+
for (const timer of changedFiles.values())
|
|
299
|
+
clearTimeout(timer);
|
|
300
|
+
await rebuilding;
|
|
301
|
+
await websocket?.close();
|
|
302
|
+
await vite?.close();
|
|
303
|
+
const ending = new Promise((resolve) => httpServer.close(() => resolve()));
|
|
304
|
+
httpServer.closeAllConnections();
|
|
305
|
+
await ending;
|
|
154
306
|
},
|
|
155
|
-
];
|
|
156
|
-
const vite = await createViteServer({
|
|
157
|
-
root: projectRoot,
|
|
158
|
-
appType: "custom",
|
|
159
|
-
server: {
|
|
160
|
-
middlewareMode: true,
|
|
161
|
-
allowedHosts: config.server.allowedHosts === true
|
|
162
|
-
? true
|
|
163
|
-
: [...config.server.allowedHosts],
|
|
164
|
-
hmr: options.hmr === false
|
|
165
|
-
? false
|
|
166
|
-
: {
|
|
167
|
-
server: httpServer,
|
|
168
|
-
},
|
|
169
|
-
},
|
|
170
|
-
resolve: {
|
|
171
|
-
alias: [
|
|
172
|
-
...reactFallbackAliases,
|
|
173
|
-
{
|
|
174
|
-
find: /^ludicord$/,
|
|
175
|
-
replacement: fileURLToPath(new URL("../../index.js", import.meta.url)),
|
|
176
|
-
},
|
|
177
|
-
],
|
|
178
|
-
},
|
|
179
|
-
plugins: [
|
|
180
|
-
createLudicordVitePlugin(projectRoot, () => manifests, () => {
|
|
181
|
-
refreshManifests();
|
|
182
|
-
}, config),
|
|
183
|
-
react(),
|
|
184
|
-
],
|
|
185
|
-
});
|
|
186
|
-
const websocket = attachWebSocketRuntime(httpServer, {
|
|
187
|
-
projectRoot,
|
|
188
|
-
getRoutes: () => manifests.websocket,
|
|
189
|
-
loadModule: async (absoluteFile) => vite.ssrLoadModule(`/@fs/${normalizePath(absoluteFile)}`),
|
|
190
|
-
...(process.env.LUDICORD_SESSION_SECRET === undefined
|
|
191
|
-
? {}
|
|
192
|
-
: { sessionSecret: process.env.LUDICORD_SESSION_SECRET }),
|
|
193
|
-
heartbeatInterval: config.websocket.heartbeatInterval,
|
|
194
|
-
maxPayload: config.websocket.maxPayload,
|
|
195
|
-
compression: config.websocket.compression,
|
|
196
|
-
});
|
|
197
|
-
app.use("/_ludicord/auth", createLudicordAuthRouter({
|
|
198
|
-
...(config.discord.clientId === undefined
|
|
199
|
-
? {}
|
|
200
|
-
: { clientId: config.discord.clientId }),
|
|
201
|
-
production: false,
|
|
202
|
-
activityInstanceVerification: config.discord.auth.activityInstanceVerification,
|
|
203
|
-
}));
|
|
204
|
-
app.use(createApiMiddleware({
|
|
205
|
-
projectRoot,
|
|
206
|
-
getRoutes: () => manifests.api,
|
|
207
|
-
loadModule: async (absoluteFile) => vite.ssrLoadModule(`/@fs/${normalizePath(absoluteFile)}`),
|
|
208
|
-
...(process.env.LUDICORD_SESSION_SECRET === undefined
|
|
209
|
-
? {}
|
|
210
|
-
: { sessionSecret: process.env.LUDICORD_SESSION_SECRET }),
|
|
211
|
-
proxyVerification: config.discord.auth.proxyVerification,
|
|
212
|
-
...(process.env.LUDICORD_DISCORD_PUBLIC_KEY === undefined
|
|
213
|
-
? {}
|
|
214
|
-
: { discordPublicKey: process.env.LUDICORD_DISCORD_PUBLIC_KEY }),
|
|
215
|
-
}));
|
|
216
|
-
app.get("/_ludicord/manifest", (_request, response) => {
|
|
217
|
-
response.json(refreshManifests());
|
|
218
|
-
});
|
|
219
|
-
app.get("/", async (request, response, next) => {
|
|
220
|
-
try {
|
|
221
|
-
const html = await vite.transformIndexHtml(request.originalUrl, `<!doctype html>
|
|
222
|
-
<html>
|
|
223
|
-
<head>
|
|
224
|
-
<meta charset="UTF-8" />
|
|
225
|
-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
226
|
-
<title>Ludicord Activity</title>
|
|
227
|
-
</head>
|
|
228
|
-
<body>
|
|
229
|
-
<div id="ludicord-root"></div>
|
|
230
|
-
<script type="module">import "${VIRTUAL_ENTRY}";</script>
|
|
231
|
-
</body>
|
|
232
|
-
</html>`);
|
|
233
|
-
response.status(200).type("html").send(html);
|
|
234
|
-
}
|
|
235
|
-
catch (error) {
|
|
236
|
-
next(error);
|
|
237
|
-
}
|
|
238
|
-
});
|
|
239
|
-
app.use(vite.middlewares);
|
|
240
|
-
app.use((error, _request, response, _next) => {
|
|
241
|
-
const message = error instanceof Error ? error.stack ?? error.message : String(error);
|
|
242
|
-
console.error(`[ludicord] ${message}`);
|
|
243
|
-
if (!response.headersSent)
|
|
244
|
-
response.status(500).send("Ludicord development server error");
|
|
245
|
-
});
|
|
246
|
-
const requestedPort = options.port ?? 3000;
|
|
247
|
-
const host = options.host ?? "0.0.0.0";
|
|
248
|
-
await new Promise((resolve, reject) => {
|
|
249
|
-
const onError = (error) => {
|
|
250
|
-
httpServer.off("listening", onListening);
|
|
251
|
-
reject(error);
|
|
252
307
|
};
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
const url = `http://${displayHost}:${port}`;
|
|
267
|
-
return {
|
|
268
|
-
app,
|
|
269
|
-
vite,
|
|
270
|
-
websocket,
|
|
271
|
-
port,
|
|
272
|
-
host,
|
|
273
|
-
url,
|
|
274
|
-
getManifests: () => manifests,
|
|
275
|
-
refreshManifests,
|
|
276
|
-
formatReadyMessage() {
|
|
277
|
-
const networks = networkUrls(port, host);
|
|
278
|
-
const environments = environmentFiles(projectRoot);
|
|
279
|
-
const activityReady = existsSync(path.join(projectRoot, manifests.activity.root));
|
|
280
|
-
const embedRouterReady = manifests.embeds.length > 0;
|
|
281
|
-
const hmrReady = options.hmr !== false;
|
|
282
|
-
return `Ludicord ${LUDICORD_VERSION}
|
|
283
|
-
Discord Activity Framework
|
|
284
|
-
|
|
285
|
-
Local: ${url}
|
|
286
|
-
${networks.length === 0 ? "" : `Network: ${networks[0]}\n`}Environments: ${environments.length === 0 ? "none" : environments.join(", ")}
|
|
287
|
-
|
|
288
|
-
${checkMark(activityReady)} app/pages.tsx
|
|
289
|
-
${checkMark(embedRouterReady)} Embed router
|
|
290
|
-
${checkMark(hmrReady)} HMR
|
|
291
|
-
|
|
292
|
-
Ready`;
|
|
293
|
-
},
|
|
294
|
-
async close() {
|
|
295
|
-
await websocket.close();
|
|
296
|
-
await vite.close();
|
|
297
|
-
const httpClosed = new Promise((resolve, reject) => {
|
|
298
|
-
httpServer.close((error) => {
|
|
299
|
-
if (error === undefined)
|
|
300
|
-
resolve();
|
|
301
|
-
else
|
|
302
|
-
reject(error);
|
|
303
|
-
});
|
|
304
|
-
});
|
|
305
|
-
httpServer.closeAllConnections();
|
|
306
|
-
await httpClosed;
|
|
307
|
-
},
|
|
308
|
-
};
|
|
308
|
+
}
|
|
309
|
+
catch (error) {
|
|
310
|
+
closed = true;
|
|
311
|
+
typeWatcher?.close();
|
|
312
|
+
sourceWatcher?.close();
|
|
313
|
+
for (const timer of changedFiles.values())
|
|
314
|
+
clearTimeout(timer);
|
|
315
|
+
await websocket?.close();
|
|
316
|
+
await vite?.close();
|
|
317
|
+
httpServer.closeAllConnections();
|
|
318
|
+
httpServer.close();
|
|
319
|
+
throw error;
|
|
320
|
+
}
|
|
309
321
|
}
|
|
310
322
|
//# sourceMappingURL=dev-server.js.map
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export interface LudicordDiagnostic {
|
|
2
|
+
readonly message: string;
|
|
3
|
+
readonly file?: string;
|
|
4
|
+
readonly line?: number;
|
|
5
|
+
readonly column?: number;
|
|
6
|
+
readonly frame?: string;
|
|
7
|
+
readonly stack?: string;
|
|
8
|
+
readonly kind: "compile" | "type" | "runtime";
|
|
9
|
+
}
|
|
10
|
+
export declare function redact(message: string): string;
|
|
11
|
+
export declare function sourceFrame(root: string, file: string, line: number, column: number): string | undefined;
|
|
12
|
+
export declare function diagnostic(error: unknown, root: string, file?: string, kind?: LudicordDiagnostic["kind"]): LudicordDiagnostic;
|
|
13
|
+
export declare function checkProjectTypes(root: string): readonly LudicordDiagnostic[];
|
|
14
|
+
export declare function watchProjectTypes(root: string, publish: (items: readonly LudicordDiagnostic[]) => void): {
|
|
15
|
+
close(): void;
|
|
16
|
+
} | undefined;
|
|
17
|
+
//# sourceMappingURL=diagnostics.d.ts.map
|