@undefineds.co/xpod 0.1.7 → 0.2.0-preview.2
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 +141 -2
- package/config/cli.json +9 -71
- package/config/cloud.json +34 -7
- package/config/local.json +6 -2
- package/config/resolver.json +11 -49
- package/config/runtime-open.json +22 -0
- package/config/xpod.base.json +32 -0
- package/config/xpod.cluster.json +2 -44
- package/config/xpod.json +5 -2
- package/dist/api/auth/AuthContext.d.ts +12 -1
- package/dist/api/auth/AuthContext.js +18 -1
- package/dist/api/auth/AuthContext.js.map +1 -1
- package/dist/api/auth/ClientCredentialsAuthenticator.d.ts +0 -1
- package/dist/api/auth/ClientCredentialsAuthenticator.js.map +1 -1
- package/dist/api/auth/ServiceTokenAuthenticator.d.ts +18 -0
- package/dist/api/auth/ServiceTokenAuthenticator.js +50 -0
- package/dist/api/auth/ServiceTokenAuthenticator.js.map +1 -0
- package/dist/api/auth/index.d.ts +1 -0
- package/dist/api/auth/index.js +1 -0
- package/dist/api/auth/index.js.map +1 -1
- package/dist/api/chatkit/ai-provider.d.ts +0 -10
- package/dist/api/chatkit/ai-provider.js +11 -120
- package/dist/api/chatkit/ai-provider.js.map +1 -1
- package/dist/api/chatkit/default-agent.js +11 -8
- package/dist/api/chatkit/default-agent.js.map +1 -1
- package/dist/api/chatkit/pod-store.js +19 -3
- package/dist/api/chatkit/pod-store.js.map +1 -1
- package/dist/api/chatkit/schema.d.ts +9 -3
- package/dist/api/chatkit/schema.js +14 -6
- package/dist/api/chatkit/schema.js.map +1 -1
- package/dist/api/container/business-token.d.ts +9 -0
- package/dist/api/container/business-token.js +32 -0
- package/dist/api/container/business-token.js.map +1 -0
- package/dist/api/container/cloud.js +36 -12
- package/dist/api/container/cloud.js.map +1 -1
- package/dist/api/container/common.js +12 -5
- package/dist/api/container/common.js.map +1 -1
- package/dist/api/container/index.js +94 -14
- package/dist/api/container/index.js.map +1 -1
- package/dist/api/container/local.js +2 -1
- package/dist/api/container/local.js.map +1 -1
- package/dist/api/container/routes.js +81 -9
- package/dist/api/container/routes.js.map +1 -1
- package/dist/api/container/types.d.ts +8 -6
- package/dist/api/container/types.js.map +1 -1
- package/dist/api/handlers/AdminHandler.js +9 -9
- package/dist/api/handlers/AdminHandler.js.map +1 -1
- package/dist/api/handlers/ApiKeyHandler.js +0 -6
- package/dist/api/handlers/ApiKeyHandler.js.map +1 -1
- package/dist/api/handlers/EdgeNodeSignalHandler.d.ts +17 -0
- package/dist/api/handlers/EdgeNodeSignalHandler.js +171 -0
- package/dist/api/handlers/EdgeNodeSignalHandler.js.map +1 -0
- package/dist/api/handlers/PodManagementHandler.d.ts +5 -4
- package/dist/api/handlers/PodManagementHandler.js +11 -10
- package/dist/api/handlers/PodManagementHandler.js.map +1 -1
- package/dist/api/handlers/ProvisionHandler.d.ts +42 -0
- package/dist/api/handlers/ProvisionHandler.js +161 -0
- package/dist/api/handlers/ProvisionHandler.js.map +1 -0
- package/dist/api/handlers/QuotaHandler.d.ts +7 -7
- package/dist/api/handlers/QuotaHandler.js +143 -73
- package/dist/api/handlers/QuotaHandler.js.map +1 -1
- package/dist/api/handlers/SubdomainClientHandler.js +2 -2
- package/dist/api/handlers/SubdomainClientHandler.js.map +1 -1
- package/dist/api/handlers/SubdomainHandler.js +13 -8
- package/dist/api/handlers/SubdomainHandler.js.map +1 -1
- package/dist/api/handlers/UsageHandler.d.ts +14 -0
- package/dist/api/handlers/UsageHandler.js +123 -0
- package/dist/api/handlers/UsageHandler.js.map +1 -0
- package/dist/api/handlers/index.d.ts +3 -1
- package/dist/api/handlers/index.js +3 -1
- package/dist/api/handlers/index.js.map +1 -1
- package/dist/api/main.js +18 -0
- package/dist/api/main.js.map +1 -1
- package/dist/api/middleware/OpenAuthMiddleware.d.ts +12 -0
- package/dist/api/middleware/OpenAuthMiddleware.js +27 -0
- package/dist/api/middleware/OpenAuthMiddleware.js.map +1 -0
- package/dist/api/runtime.d.ts +15 -0
- package/dist/api/runtime.js +104 -0
- package/dist/api/runtime.js.map +1 -0
- package/dist/api/service/VercelChatService.d.ts +16 -7
- package/dist/api/service/VercelChatService.js +98 -178
- package/dist/api/service/VercelChatService.js.map +1 -1
- package/dist/api/store/DrizzleClientCredentialsStore.d.ts +6 -11
- package/dist/api/store/DrizzleClientCredentialsStore.js +9 -39
- package/dist/api/store/DrizzleClientCredentialsStore.js.map +1 -1
- package/dist/authorization/AuthModeSelector.d.ts +10 -0
- package/dist/authorization/AuthModeSelector.js +27 -0
- package/dist/authorization/AuthModeSelector.js.map +1 -0
- package/dist/authorization/AuthModeSelector.jsonld +81 -0
- package/dist/cli/commands/account.d.ts +6 -0
- package/dist/cli/commands/account.js +119 -0
- package/dist/cli/commands/account.js.map +1 -0
- package/dist/cli/commands/auth.js +20 -29
- package/dist/cli/commands/auth.js.map +1 -1
- package/dist/cli/commands/backup.d.ts +15 -0
- package/dist/cli/commands/backup.js +286 -0
- package/dist/cli/commands/backup.js.map +1 -0
- package/dist/cli/commands/config.d.ts +34 -3
- package/dist/cli/commands/config.js +195 -258
- package/dist/cli/commands/config.js.map +1 -1
- package/dist/cli/commands/doctor.d.ts +6 -0
- package/dist/cli/commands/doctor.js +94 -0
- package/dist/cli/commands/doctor.js.map +1 -0
- package/dist/cli/commands/pod.d.ts +6 -0
- package/dist/cli/commands/pod.js +124 -0
- package/dist/cli/commands/pod.js.map +1 -0
- package/dist/cli/commands/start.js +28 -5
- package/dist/cli/commands/start.js.map +1 -1
- package/dist/cli/index.js +9 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/lib/credentials-store.d.ts +17 -0
- package/dist/cli/lib/credentials-store.js +73 -0
- package/dist/cli/lib/credentials-store.js.map +1 -0
- package/dist/cli/lib/css-account.d.ts +17 -0
- package/dist/cli/lib/css-account.js +56 -0
- package/dist/cli/lib/css-account.js.map +1 -1
- package/dist/cli/lib/pod-thread-store.d.ts +57 -0
- package/dist/cli/lib/pod-thread-store.js +310 -0
- package/dist/cli/lib/pod-thread-store.js.map +1 -0
- package/dist/cli/lib/solid-auth.d.ts +20 -0
- package/dist/cli/lib/solid-auth.js +70 -0
- package/dist/cli/lib/solid-auth.js.map +1 -0
- package/dist/components/components.jsonld +5 -8
- package/dist/components/context.jsonld +114 -244
- package/dist/edge/EdgeNodeAgent.js +2 -2
- package/dist/edge/EdgeNodeAgent.js.map +1 -1
- package/dist/edge/EdgeNodeDnsCoordinator.d.ts +1 -7
- package/dist/edge/EdgeNodeDnsCoordinator.js +31 -41
- package/dist/edge/EdgeNodeDnsCoordinator.js.map +1 -1
- package/dist/edge/EdgeNodeDnsCoordinator.jsonld +1 -27
- package/dist/edge/EdgeNodeModeDetector.d.ts +1 -1
- package/dist/edge/EdgeNodeModeDetector.js +9 -11
- package/dist/edge/EdgeNodeModeDetector.js.map +1 -1
- package/dist/http/ClusterIngressRouter.js +3 -3
- package/dist/http/ClusterIngressRouter.js.map +1 -1
- package/dist/http/ClusterWebSocketConfigurator.js +2 -2
- package/dist/http/ClusterWebSocketConfigurator.js.map +1 -1
- package/dist/http/PodRoutingHttpHandler.js +2 -2
- package/dist/http/PodRoutingHttpHandler.js.map +1 -1
- package/dist/http/cluster/PodMigrationHttpHandler.d.ts +1 -1
- package/dist/http/cluster/PodMigrationHttpHandler.js +1 -1
- package/dist/http/cluster/PodMigrationHttpHandler.js.map +1 -1
- package/dist/identity/drizzle/EdgeNodeRepository.d.ts +37 -4
- package/dist/identity/drizzle/EdgeNodeRepository.js +120 -128
- package/dist/identity/drizzle/EdgeNodeRepository.js.map +1 -1
- package/dist/identity/drizzle/ServiceTokenRepository.d.ts +52 -0
- package/dist/identity/drizzle/ServiceTokenRepository.js +143 -0
- package/dist/identity/drizzle/ServiceTokenRepository.js.map +1 -0
- package/dist/identity/drizzle/db.d.ts +9 -0
- package/dist/identity/drizzle/db.js +208 -1
- package/dist/identity/drizzle/db.js.map +1 -1
- package/dist/identity/drizzle/schema.pg.d.ts +5 -0
- package/dist/identity/drizzle/schema.pg.js +49 -20
- package/dist/identity/drizzle/schema.pg.js.map +1 -1
- package/dist/identity/drizzle/schema.sqlite.d.ts +332 -57
- package/dist/identity/drizzle/schema.sqlite.js +48 -18
- package/dist/identity/drizzle/schema.sqlite.js.map +1 -1
- package/dist/identity/oidc/AutoDetectIdentityProviderHandler.js +6 -4
- package/dist/identity/oidc/AutoDetectIdentityProviderHandler.js.map +1 -1
- package/dist/index.d.ts +6 -9
- package/dist/index.js +12 -14
- package/dist/index.js.map +1 -1
- package/dist/main.js +25 -8
- package/dist/main.js.map +1 -1
- package/dist/provision/ProvisionCodeCodec.d.ts +39 -0
- package/dist/provision/ProvisionCodeCodec.js +65 -0
- package/dist/provision/ProvisionCodeCodec.js.map +1 -0
- package/dist/provision/ProvisionCodeCodec.jsonld +47 -0
- package/dist/provision/ProvisionPodCreator.d.ts +20 -0
- package/dist/provision/ProvisionPodCreator.js +84 -0
- package/dist/provision/ProvisionPodCreator.js.map +1 -0
- package/dist/provision/ProvisionPodCreator.jsonld +118 -0
- package/dist/quota/DrizzleQuotaService.d.ts +17 -3
- package/dist/quota/DrizzleQuotaService.js +108 -8
- package/dist/quota/DrizzleQuotaService.js.map +1 -1
- package/dist/quota/DrizzleQuotaService.jsonld +33 -22
- package/dist/quota/NoopQuotaService.d.ts +7 -1
- package/dist/quota/NoopQuotaService.js +12 -0
- package/dist/quota/NoopQuotaService.js.map +1 -1
- package/dist/quota/NoopQuotaService.jsonld +24 -0
- package/dist/quota/QuotaService.d.ts +17 -0
- package/dist/quota/QuotaService.js +5 -0
- package/dist/quota/QuotaService.js.map +1 -1
- package/dist/quota/QuotaService.jsonld +50 -0
- package/dist/runtime/Proxy.d.ts +22 -4
- package/dist/runtime/Proxy.js +154 -35
- package/dist/runtime/Proxy.js.map +1 -1
- package/dist/runtime/XpodRuntime.d.ts +49 -0
- package/dist/runtime/XpodRuntime.js +374 -0
- package/dist/runtime/XpodRuntime.js.map +1 -0
- package/dist/runtime/env-utils.d.ts +2 -0
- package/dist/runtime/env-utils.js +55 -0
- package/dist/runtime/env-utils.js.map +1 -0
- package/dist/runtime/index.d.ts +4 -0
- package/dist/runtime/index.js +8 -1
- package/dist/runtime/index.js.map +1 -1
- package/dist/runtime/socket-fetch.d.ts +1 -0
- package/dist/runtime/socket-fetch.js +72 -0
- package/dist/runtime/socket-fetch.js.map +1 -0
- package/dist/runtime/socket-http.d.ts +1 -0
- package/dist/runtime/socket-http.js +142 -0
- package/dist/runtime/socket-http.js.map +1 -0
- package/dist/runtime/socket-utils.d.ts +2 -0
- package/dist/runtime/socket-utils.js +34 -0
- package/dist/runtime/socket-utils.js.map +1 -0
- package/dist/service/{EdgeNodeHeartbeatService.d.ts → EdgeNodeSignalClient.d.ts} +3 -3
- package/dist/service/{EdgeNodeHeartbeatService.js → EdgeNodeSignalClient.js} +4 -4
- package/dist/service/EdgeNodeSignalClient.js.map +1 -0
- package/dist/service/PodMigrationService.d.ts +1 -2
- package/dist/service/PodMigrationService.js +1 -2
- package/dist/service/PodMigrationService.js.map +1 -1
- package/dist/storage/SparqlUpdateResourceStore.js +1 -1
- package/dist/storage/SparqlUpdateResourceStore.js.map +1 -1
- package/dist/storage/accessors/MinioDataAccessor.d.ts +6 -0
- package/dist/storage/accessors/MinioDataAccessor.js +10 -0
- package/dist/storage/accessors/MinioDataAccessor.js.map +1 -1
- package/dist/storage/accessors/MinioDataAccessor.jsonld +4 -0
- package/dist/storage/accessors/MixDataAccessor.d.ts +2 -1
- package/dist/storage/accessors/MixDataAccessor.js +12 -1
- package/dist/storage/accessors/MixDataAccessor.js.map +1 -1
- package/dist/storage/accessors/MixDataAccessor.jsonld +19 -0
- package/dist/storage/locking/UrlAwareRedisLocker.d.ts +18 -0
- package/dist/storage/locking/UrlAwareRedisLocker.js +60 -0
- package/dist/storage/locking/UrlAwareRedisLocker.js.map +1 -0
- package/dist/storage/locking/UrlAwareRedisLocker.jsonld +123 -0
- package/dist/storage/quota/UsageRepository.d.ts +41 -8
- package/dist/storage/quota/UsageRepository.js +252 -50
- package/dist/storage/quota/UsageRepository.js.map +1 -1
- package/dist/storage/sparql/ComunicaQuintEngine.d.ts +9 -0
- package/dist/storage/sparql/ComunicaQuintEngine.js +50 -9
- package/dist/storage/sparql/ComunicaQuintEngine.js.map +1 -1
- package/dist/storage/sparql/QueryOptimizer.js +13 -1
- package/dist/storage/sparql/QueryOptimizer.js.map +1 -1
- package/dist/storage/sparql/QuintQuerySource.d.ts +14 -0
- package/dist/storage/sparql/QuintQuerySource.js +152 -1
- package/dist/storage/sparql/QuintQuerySource.js.map +1 -1
- package/dist/storage/sparql/SubgraphQueryEngine.d.ts +1 -0
- package/dist/storage/sparql/SubgraphQueryEngine.js +6 -2
- package/dist/storage/sparql/SubgraphQueryEngine.js.map +1 -1
- package/dist/storage/sparql/SubgraphQueryEngine.jsonld +4 -0
- package/dist/subdomain/SubdomainClient.d.ts +3 -3
- package/dist/subdomain/SubdomainClient.js +1 -1
- package/dist/subdomain/SubdomainClient.js.map +1 -1
- package/dist/subdomain/SubdomainService.d.ts +15 -16
- package/dist/subdomain/SubdomainService.js +80 -54
- package/dist/subdomain/SubdomainService.js.map +1 -1
- package/dist/subdomain/SubdomainService.jsonld +22 -26
- package/dist/supervisor/Supervisor.d.ts +7 -2
- package/dist/supervisor/Supervisor.js +33 -1
- package/dist/supervisor/Supervisor.js.map +1 -1
- package/dist/test-utils/index.d.ts +4 -0
- package/dist/test-utils/index.js +8 -0
- package/dist/test-utils/index.js.map +1 -0
- package/dist/test-utils/no-auth-xpod.d.ts +11 -0
- package/dist/test-utils/no-auth-xpod.js +25 -0
- package/dist/test-utils/no-auth-xpod.js.map +1 -0
- package/dist/test-utils/seed-pod.d.ts +5 -0
- package/dist/test-utils/seed-pod.js +61 -0
- package/dist/test-utils/seed-pod.js.map +1 -0
- package/package.json +23 -5
- package/templates/identity/account/create-pod.html.ejs +110 -0
- package/templates/main.html.ejs +10 -0
- package/dist/api/handlers/DevHandler.d.ts +0 -18
- package/dist/api/handlers/DevHandler.js +0 -276
- package/dist/api/handlers/DevHandler.js.map +0 -1
- package/dist/api/handlers/SignalHandler.d.ts +0 -13
- package/dist/api/handlers/SignalHandler.js +0 -122
- package/dist/api/handlers/SignalHandler.js.map +0 -1
- package/dist/gateway/Proxy.d.ts +0 -24
- package/dist/gateway/Proxy.js +0 -209
- package/dist/gateway/Proxy.js.map +0 -1
- package/dist/gateway/Supervisor.d.ts +0 -2
- package/dist/gateway/Supervisor.js +0 -7
- package/dist/gateway/Supervisor.js.map +0 -1
- package/dist/gateway/port-finder.d.ts +0 -4
- package/dist/gateway/port-finder.js +0 -15
- package/dist/gateway/port-finder.js.map +0 -1
- package/dist/gateway/types.d.ts +0 -1
- package/dist/gateway/types.js +0 -3
- package/dist/gateway/types.js.map +0 -1
- package/dist/http/SignalInterceptHttpHandler.d.ts +0 -24
- package/dist/http/SignalInterceptHttpHandler.js +0 -47
- package/dist/http/SignalInterceptHttpHandler.js.map +0 -1
- package/dist/http/SignalInterceptHttpHandler.jsonld +0 -103
- package/dist/http/admin/EdgeNodeSignalHttpHandler.d.ts +0 -71
- package/dist/http/admin/EdgeNodeSignalHttpHandler.js +0 -674
- package/dist/http/admin/EdgeNodeSignalHttpHandler.js.map +0 -1
- package/dist/http/admin/EdgeNodeSignalHttpHandler.jsonld +0 -406
- package/dist/http/cluster/PodMigrationHttpHandler.jsonld +0 -169
- package/dist/quota/DefaultQuotaService.d.ts +0 -16
- package/dist/quota/DefaultQuotaService.js +0 -37
- package/dist/quota/DefaultQuotaService.js.map +0 -1
- package/dist/quota/DefaultQuotaService.jsonld +0 -85
- package/dist/service/EdgeNodeHeartbeatService.js.map +0 -1
- package/dist/service/PodMigrationService.jsonld +0 -76
- package/dist/storage/MigratableDataAccessor.d.ts +0 -63
- package/dist/storage/MigratableDataAccessor.js +0 -11
- package/dist/storage/MigratableDataAccessor.js.map +0 -1
- package/dist/storage/MigratableDataAccessor.jsonld +0 -60
- package/dist/storage/accessors/TieredMinioDataAccessor.d.ts +0 -150
- package/dist/storage/accessors/TieredMinioDataAccessor.js +0 -582
- package/dist/storage/accessors/TieredMinioDataAccessor.js.map +0 -1
- package/dist/storage/accessors/TieredMinioDataAccessor.jsonld +0 -333
- package/static/app/assets/index.css +0 -1
- package/static/app/assets/main.js +0 -11
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ServiceConfig, ServiceState, StatusChangeHandler } from './types';
|
|
1
|
+
import type { ServiceConfig, ServiceState, ServiceStatus, StatusChangeHandler } from './types';
|
|
2
2
|
export interface SupervisorLog {
|
|
3
3
|
timestamp: string;
|
|
4
4
|
level: 'info' | 'warn' | 'error';
|
|
@@ -7,16 +7,21 @@ export interface SupervisorLog {
|
|
|
7
7
|
}
|
|
8
8
|
export declare class Supervisor {
|
|
9
9
|
private processes;
|
|
10
|
+
private managedStops;
|
|
10
11
|
private states;
|
|
11
12
|
private configs;
|
|
12
13
|
private logs;
|
|
13
14
|
private onStatusChange?;
|
|
14
15
|
private isShuttingDown;
|
|
15
|
-
constructor(
|
|
16
|
+
constructor(options?: {
|
|
17
|
+
handleProcessSignals?: boolean;
|
|
18
|
+
});
|
|
16
19
|
private shutdown;
|
|
17
20
|
private killAll;
|
|
18
21
|
setStatusChangeHandler(handler: StatusChangeHandler): void;
|
|
19
22
|
register(config: ServiceConfig): void;
|
|
23
|
+
registerManaged(name: string, stop?: () => Promise<void> | void): void;
|
|
24
|
+
setStatus(name: string, status: ServiceStatus, extra?: Partial<ServiceState>): void;
|
|
20
25
|
addLog(source: string, level: SupervisorLog['level'], message: string): void;
|
|
21
26
|
getLogs(filters?: {
|
|
22
27
|
level?: string;
|
|
@@ -9,12 +9,16 @@ const tree_kill_1 = __importDefault(require("tree-kill"));
|
|
|
9
9
|
const MAX_RESTARTS = 5;
|
|
10
10
|
const MAX_LOGS = 500;
|
|
11
11
|
class Supervisor {
|
|
12
|
-
constructor() {
|
|
12
|
+
constructor(options = {}) {
|
|
13
13
|
this.processes = new Map();
|
|
14
|
+
this.managedStops = new Map();
|
|
14
15
|
this.states = new Map();
|
|
15
16
|
this.configs = new Map();
|
|
16
17
|
this.logs = [];
|
|
17
18
|
this.isShuttingDown = false;
|
|
19
|
+
if (options.handleProcessSignals === false) {
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
18
22
|
// 确保父进程退出时清理所有子进程
|
|
19
23
|
process.on('exit', () => this.killAll());
|
|
20
24
|
process.on('SIGINT', () => this.shutdown('SIGINT'));
|
|
@@ -52,6 +56,29 @@ class Supervisor {
|
|
|
52
56
|
restartCount: 0,
|
|
53
57
|
});
|
|
54
58
|
}
|
|
59
|
+
registerManaged(name, stop) {
|
|
60
|
+
if (!this.states.has(name)) {
|
|
61
|
+
this.states.set(name, {
|
|
62
|
+
name,
|
|
63
|
+
status: 'stopped',
|
|
64
|
+
restartCount: 0,
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
if (stop) {
|
|
68
|
+
this.managedStops.set(name, async () => {
|
|
69
|
+
await stop();
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
setStatus(name, status, extra) {
|
|
74
|
+
if (!this.states.has(name)) {
|
|
75
|
+
this.registerManaged(name);
|
|
76
|
+
}
|
|
77
|
+
this.updateState(name, {
|
|
78
|
+
status,
|
|
79
|
+
...extra,
|
|
80
|
+
});
|
|
81
|
+
}
|
|
55
82
|
addLog(source, level, message) {
|
|
56
83
|
this.logs.push({
|
|
57
84
|
timestamp: new Date().toISOString(),
|
|
@@ -88,6 +115,11 @@ class Supervisor {
|
|
|
88
115
|
for (const name of this.processes.keys()) {
|
|
89
116
|
promises.push(this.stop(name));
|
|
90
117
|
}
|
|
118
|
+
for (const [name, stop] of this.managedStops) {
|
|
119
|
+
promises.push(stop().catch((error) => {
|
|
120
|
+
this.addLog(name, 'error', `Failed to stop managed service: ${String(error)}`);
|
|
121
|
+
}));
|
|
122
|
+
}
|
|
91
123
|
await Promise.all(promises);
|
|
92
124
|
}
|
|
93
125
|
start(name) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Supervisor.js","sourceRoot":"","sources":["../../src/supervisor/Supervisor.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn, type ChildProcess } from 'node:child_process';\nimport kill from 'tree-kill';\nimport type { ServiceConfig, ServiceState, StatusChangeHandler } from './types';\n\nconst MAX_RESTARTS = 5;\nconst MAX_LOGS = 500;\n\nexport interface SupervisorLog {\n timestamp: string;\n level: 'info' | 'warn' | 'error';\n source: string;\n message: string;\n}\n\nexport class Supervisor {\n private processes: Map<string, ChildProcess> = new Map();\n private states: Map<string, ServiceState> = new Map();\n private configs: Map<string, ServiceConfig> = new Map();\n private logs: SupervisorLog[] = [];\n private onStatusChange?: StatusChangeHandler;\n private isShuttingDown = false;\n\n constructor() {\n // 确保父进程退出时清理所有子进程\n process.on('exit', () => this.killAll());\n process.on('SIGINT', () => this.shutdown('SIGINT'));\n process.on('SIGTERM', () => this.shutdown('SIGTERM'));\n }\n\n private async shutdown(signal: string): Promise<void> {\n if (this.isShuttingDown) return;\n this.isShuttingDown = true;\n console.log(`[Supervisor] Received ${signal}, stopping all services...`);\n await this.stopAll();\n process.exit(0);\n }\n\n private killAll(): void {\n // 同步杀掉所有子进程(用于 process.on('exit'))\n for (const [, child] of this.processes) {\n if (child.pid) {\n try {\n process.kill(child.pid, 'SIGKILL');\n } catch {\n // 进程可能已经退出\n }\n }\n }\n }\n\n public setStatusChangeHandler(handler: StatusChangeHandler): void {\n this.onStatusChange = handler;\n }\n\n public register(config: ServiceConfig): void {\n this.configs.set(config.name, config);\n this.states.set(config.name, {\n name: config.name,\n status: 'stopped',\n restartCount: 0,\n });\n }\n\n public addLog(source: string, level: SupervisorLog['level'], message: string): void {\n this.logs.push({\n timestamp: new Date().toISOString(),\n level,\n source,\n message,\n });\n\n if (this.logs.length > MAX_LOGS) {\n this.logs.splice(0, this.logs.length - MAX_LOGS);\n }\n }\n\n public getLogs(filters?: {\n level?: string;\n source?: string;\n limit?: number;\n }): SupervisorLog[] {\n let rows = this.logs;\n\n if (filters?.level) {\n rows = rows.filter((item) => item.level === filters.level);\n }\n if (filters?.source) {\n rows = rows.filter((item) => item.source === filters.source);\n }\n\n const limit = filters?.limit;\n if (typeof limit === 'number' && Number.isFinite(limit) && limit > 0) {\n return rows.slice(-limit);\n }\n\n return rows;\n }\n\n public async startAll(): Promise<void> {\n for (const name of this.configs.keys()) {\n this.start(name);\n }\n }\n\n public async stopAll(): Promise<void> {\n this.isShuttingDown = true;\n const promises: Promise<void>[] = [];\n for (const name of this.processes.keys()) {\n promises.push(this.stop(name));\n }\n await Promise.all(promises);\n }\n\n public start(name: string): void {\n const config = this.configs.get(name);\n const state = this.states.get(name);\n if (!config || !state) return;\n\n if (state.status === 'running' || state.status === 'starting') return;\n\n console.log(`[Supervisor] Starting ${name}...`);\n this.addLog(name, 'info', 'Service starting');\n this.updateState(name, { status: 'starting', startTime: Date.now() });\n\n const env = { ...process.env, ...config.env };\n\n const child = spawn(config.command, config.args, {\n stdio: ['ignore', 'pipe', 'pipe'],\n env,\n cwd: config.cwd || process.cwd(),\n detached: false,\n });\n\n this.processes.set(name, child);\n this.updateState(name, { status: 'running', pid: child.pid });\n\n const prefixLog = (source: string, data: Buffer, isError = false): void => {\n const output = data.toString();\n const lines = output.split('\\n');\n for (const line of lines) {\n const trimmed = line.trim();\n if (!trimmed) {\n continue;\n }\n\n if (isError) {\n console.error(`[${source}] ${trimmed}`);\n this.addLog(source, 'error', trimmed);\n } else {\n console.log(`[${source}] ${trimmed}`);\n this.addLog(source, 'info', trimmed);\n }\n }\n };\n\n child.stdout?.on('data', (data) => {\n prefixLog(name, data, false);\n });\n\n child.stderr?.on('data', (data) => {\n prefixLog(name, data, true);\n });\n\n child.on('error', (err) => {\n console.error(`[Supervisor] Error spawning ${name}:`, err);\n this.addLog(name, 'error', `Spawn error: ${String(err)}`);\n this.updateState(name, { status: 'crashed' });\n });\n\n child.on('exit', (code, signal) => {\n console.log(`[Supervisor] ${name} exited with code ${code} signal ${signal}`);\n this.addLog(name, code === 0 ? 'info' : 'error', `Exited with code ${code ?? 'null'} signal ${signal ?? 'null'}`);\n const currentState = this.states.get(name);\n const wasManualStop = currentState?.status === 'stopped';\n\n this.updateState(name, {\n status: 'stopped',\n lastExitCode: code ?? undefined,\n pid: undefined,\n });\n this.processes.delete(name);\n\n // Auto-restart on crash (not on manual stop or shutdown)\n if (code !== 0 && !wasManualStop && !this.isShuttingDown) {\n const newState = this.states.get(name);\n const restartCount = (newState?.restartCount || 0) + 1;\n\n if (restartCount <= MAX_RESTARTS) {\n this.updateState(name, { restartCount });\n console.log(`[Supervisor] Restarting ${name} in 2s... (attempt ${restartCount}/${MAX_RESTARTS})`);\n this.addLog(name, 'warn', `Restarting in 2s (attempt ${restartCount}/${MAX_RESTARTS})`);\n setTimeout(() => this.start(name), 2000);\n } else {\n console.error(`[Supervisor] ${name} exceeded max restarts (${MAX_RESTARTS}), giving up`);\n this.addLog(name, 'error', `Exceeded max restarts (${MAX_RESTARTS})`);\n }\n }\n });\n }\n\n public stop(name: string): Promise<void> {\n return new Promise((resolve) => {\n const child = this.processes.get(name);\n if (!child || !child.pid) {\n resolve();\n return;\n }\n\n // Mark as stopped first to prevent auto-restart\n this.updateState(name, { status: 'stopped' });\n this.addLog(name, 'info', 'Stopping service');\n\n kill(child.pid, 'SIGTERM', (err) => {\n if (err) {\n console.error(`[Supervisor] Failed to kill ${name}:`, err);\n this.addLog(name, 'error', `Failed to stop: ${String(err)}`);\n }\n resolve();\n });\n });\n }\n\n public getStatus(name: string): ServiceState | undefined {\n const state = this.states.get(name);\n if (state && state.status === 'running' && state.startTime) {\n return { ...state, uptime: Date.now() - state.startTime };\n }\n return state;\n }\n\n public getAllStatus(): ServiceState[] {\n return Array.from(this.states.values()).map((s) => {\n if (s.status === 'running' && s.startTime) {\n return { ...s, uptime: Date.now() - s.startTime };\n }\n return s;\n });\n }\n\n private updateState(name: string, update: Partial<ServiceState>): void {\n const state = this.states.get(name);\n if (state) {\n Object.assign(state, update);\n this.onStatusChange?.(name, { ...state });\n }\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"Supervisor.js","sourceRoot":"","sources":["../../src/supervisor/Supervisor.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn, type ChildProcess } from 'node:child_process';\nimport kill from 'tree-kill';\nimport type { ServiceConfig, ServiceState, ServiceStatus, StatusChangeHandler } from './types';\n\nconst MAX_RESTARTS = 5;\nconst MAX_LOGS = 500;\n\nexport interface SupervisorLog {\n timestamp: string;\n level: 'info' | 'warn' | 'error';\n source: string;\n message: string;\n}\n\nexport class Supervisor {\n private processes: Map<string, ChildProcess> = new Map();\n private managedStops: Map<string, () => Promise<void>> = new Map();\n private states: Map<string, ServiceState> = new Map();\n private configs: Map<string, ServiceConfig> = new Map();\n private logs: SupervisorLog[] = [];\n private onStatusChange?: StatusChangeHandler;\n private isShuttingDown = false;\n\n constructor(options: { handleProcessSignals?: boolean } = {}) {\n if (options.handleProcessSignals === false) {\n return;\n }\n\n // 确保父进程退出时清理所有子进程\n process.on('exit', () => this.killAll());\n process.on('SIGINT', () => this.shutdown('SIGINT'));\n process.on('SIGTERM', () => this.shutdown('SIGTERM'));\n }\n\n private async shutdown(signal: string): Promise<void> {\n if (this.isShuttingDown) return;\n this.isShuttingDown = true;\n console.log(`[Supervisor] Received ${signal}, stopping all services...`);\n await this.stopAll();\n process.exit(0);\n }\n\n private killAll(): void {\n // 同步杀掉所有子进程(用于 process.on('exit'))\n for (const [, child] of this.processes) {\n if (child.pid) {\n try {\n process.kill(child.pid, 'SIGKILL');\n } catch {\n // 进程可能已经退出\n }\n }\n }\n }\n\n public setStatusChangeHandler(handler: StatusChangeHandler): void {\n this.onStatusChange = handler;\n }\n\n public register(config: ServiceConfig): void {\n this.configs.set(config.name, config);\n this.states.set(config.name, {\n name: config.name,\n status: 'stopped',\n restartCount: 0,\n });\n }\n\n public registerManaged(name: string, stop?: () => Promise<void> | void): void {\n if (!this.states.has(name)) {\n this.states.set(name, {\n name,\n status: 'stopped',\n restartCount: 0,\n });\n }\n\n if (stop) {\n this.managedStops.set(name, async() => {\n await stop();\n });\n }\n }\n\n public setStatus(name: string, status: ServiceStatus, extra?: Partial<ServiceState>): void {\n if (!this.states.has(name)) {\n this.registerManaged(name);\n }\n\n this.updateState(name, {\n status,\n ...extra,\n });\n }\n\n public addLog(source: string, level: SupervisorLog['level'], message: string): void {\n this.logs.push({\n timestamp: new Date().toISOString(),\n level,\n source,\n message,\n });\n\n if (this.logs.length > MAX_LOGS) {\n this.logs.splice(0, this.logs.length - MAX_LOGS);\n }\n }\n\n public getLogs(filters?: {\n level?: string;\n source?: string;\n limit?: number;\n }): SupervisorLog[] {\n let rows = this.logs;\n\n if (filters?.level) {\n rows = rows.filter((item) => item.level === filters.level);\n }\n if (filters?.source) {\n rows = rows.filter((item) => item.source === filters.source);\n }\n\n const limit = filters?.limit;\n if (typeof limit === 'number' && Number.isFinite(limit) && limit > 0) {\n return rows.slice(-limit);\n }\n\n return rows;\n }\n\n public async startAll(): Promise<void> {\n for (const name of this.configs.keys()) {\n this.start(name);\n }\n }\n\n public async stopAll(): Promise<void> {\n this.isShuttingDown = true;\n const promises: Promise<void>[] = [];\n for (const name of this.processes.keys()) {\n promises.push(this.stop(name));\n }\n for (const [ name, stop ] of this.managedStops) {\n promises.push(stop().catch((error) => {\n this.addLog(name, 'error', `Failed to stop managed service: ${String(error)}`);\n }));\n }\n await Promise.all(promises);\n }\n\n public start(name: string): void {\n const config = this.configs.get(name);\n const state = this.states.get(name);\n if (!config || !state) return;\n\n if (state.status === 'running' || state.status === 'starting') return;\n\n console.log(`[Supervisor] Starting ${name}...`);\n this.addLog(name, 'info', 'Service starting');\n this.updateState(name, { status: 'starting', startTime: Date.now() });\n\n const env = { ...process.env, ...config.env };\n\n const child = spawn(config.command, config.args, {\n stdio: ['ignore', 'pipe', 'pipe'],\n env,\n cwd: config.cwd || process.cwd(),\n detached: false,\n });\n\n this.processes.set(name, child);\n this.updateState(name, { status: 'running', pid: child.pid });\n\n const prefixLog = (source: string, data: Buffer, isError = false): void => {\n const output = data.toString();\n const lines = output.split('\\n');\n for (const line of lines) {\n const trimmed = line.trim();\n if (!trimmed) {\n continue;\n }\n\n if (isError) {\n console.error(`[${source}] ${trimmed}`);\n this.addLog(source, 'error', trimmed);\n } else {\n console.log(`[${source}] ${trimmed}`);\n this.addLog(source, 'info', trimmed);\n }\n }\n };\n\n child.stdout?.on('data', (data) => {\n prefixLog(name, data, false);\n });\n\n child.stderr?.on('data', (data) => {\n prefixLog(name, data, true);\n });\n\n child.on('error', (err) => {\n console.error(`[Supervisor] Error spawning ${name}:`, err);\n this.addLog(name, 'error', `Spawn error: ${String(err)}`);\n this.updateState(name, { status: 'crashed' });\n });\n\n child.on('exit', (code, signal) => {\n console.log(`[Supervisor] ${name} exited with code ${code} signal ${signal}`);\n this.addLog(name, code === 0 ? 'info' : 'error', `Exited with code ${code ?? 'null'} signal ${signal ?? 'null'}`);\n const currentState = this.states.get(name);\n const wasManualStop = currentState?.status === 'stopped';\n\n this.updateState(name, {\n status: 'stopped',\n lastExitCode: code ?? undefined,\n pid: undefined,\n });\n this.processes.delete(name);\n\n // Auto-restart on crash (not on manual stop or shutdown)\n if (code !== 0 && !wasManualStop && !this.isShuttingDown) {\n const newState = this.states.get(name);\n const restartCount = (newState?.restartCount || 0) + 1;\n\n if (restartCount <= MAX_RESTARTS) {\n this.updateState(name, { restartCount });\n console.log(`[Supervisor] Restarting ${name} in 2s... (attempt ${restartCount}/${MAX_RESTARTS})`);\n this.addLog(name, 'warn', `Restarting in 2s (attempt ${restartCount}/${MAX_RESTARTS})`);\n setTimeout(() => this.start(name), 2000);\n } else {\n console.error(`[Supervisor] ${name} exceeded max restarts (${MAX_RESTARTS}), giving up`);\n this.addLog(name, 'error', `Exceeded max restarts (${MAX_RESTARTS})`);\n }\n }\n });\n }\n\n public stop(name: string): Promise<void> {\n return new Promise((resolve) => {\n const child = this.processes.get(name);\n if (!child || !child.pid) {\n resolve();\n return;\n }\n\n // Mark as stopped first to prevent auto-restart\n this.updateState(name, { status: 'stopped' });\n this.addLog(name, 'info', 'Stopping service');\n\n kill(child.pid, 'SIGTERM', (err) => {\n if (err) {\n console.error(`[Supervisor] Failed to kill ${name}:`, err);\n this.addLog(name, 'error', `Failed to stop: ${String(err)}`);\n }\n resolve();\n });\n });\n }\n\n public getStatus(name: string): ServiceState | undefined {\n const state = this.states.get(name);\n if (state && state.status === 'running' && state.startTime) {\n return { ...state, uptime: Date.now() - state.startTime };\n }\n return state;\n }\n\n public getAllStatus(): ServiceState[] {\n return Array.from(this.states.values()).map((s) => {\n if (s.status === 'running' && s.startTime) {\n return { ...s, uptime: Date.now() - s.startTime };\n }\n return s;\n });\n }\n\n private updateState(name: string, update: Partial<ServiceState>): void {\n const state = this.states.get(name);\n if (state) {\n Object.assign(state, update);\n this.onStatusChange?.(name, { ...state });\n }\n }\n}\n"]}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.seedPod = exports.startNoAuthXpod = void 0;
|
|
4
|
+
var no_auth_xpod_1 = require("./no-auth-xpod");
|
|
5
|
+
Object.defineProperty(exports, "startNoAuthXpod", { enumerable: true, get: function () { return no_auth_xpod_1.startNoAuthXpod; } });
|
|
6
|
+
var seed_pod_1 = require("./seed-pod");
|
|
7
|
+
Object.defineProperty(exports, "seedPod", { enumerable: true, get: function () { return seed_pod_1.seedPod; } });
|
|
8
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test-utils/index.ts"],"names":[],"mappings":";;;AAAA,+CAAiD;AAAxC,+GAAA,eAAe,OAAA;AAExB,uCAAqC;AAA5B,mGAAA,OAAO,OAAA","sourcesContent":["export { startNoAuthXpod } from './no-auth-xpod';\nexport type { NoAuthXpodOptions } from './no-auth-xpod';\nexport { seedPod } from './seed-pod';\nexport type { SeedPodOptions } from './seed-pod';\n"]}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export interface NoAuthXpodOptions {
|
|
2
|
+
port?: number;
|
|
3
|
+
baseUrl?: string;
|
|
4
|
+
rootFilePath?: string;
|
|
5
|
+
sparqlEndpoint?: string;
|
|
6
|
+
logLevel?: string;
|
|
7
|
+
}
|
|
8
|
+
export declare function startNoAuthXpod(options?: NoAuthXpodOptions): Promise<{
|
|
9
|
+
baseUrl: string;
|
|
10
|
+
stop: () => Promise<void>;
|
|
11
|
+
}>;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.startNoAuthXpod = startNoAuthXpod;
|
|
4
|
+
/**
|
|
5
|
+
* 无鉴权版本的 xpod 启动器
|
|
6
|
+
* 使用进程内 lib 方式启动完整 Xpod(CSS + API + Gateway)
|
|
7
|
+
*/
|
|
8
|
+
const XpodRuntime_1 = require("../runtime/XpodRuntime");
|
|
9
|
+
async function startNoAuthXpod(options = {}) {
|
|
10
|
+
const runtime = await (0, XpodRuntime_1.startXpodRuntime)({
|
|
11
|
+
mode: 'local',
|
|
12
|
+
open: true,
|
|
13
|
+
transport: options.port ? 'port' : 'auto',
|
|
14
|
+
gatewayPort: options.port,
|
|
15
|
+
baseUrl: options.baseUrl,
|
|
16
|
+
rootFilePath: options.rootFilePath,
|
|
17
|
+
sparqlEndpoint: options.sparqlEndpoint,
|
|
18
|
+
logLevel: options.logLevel,
|
|
19
|
+
});
|
|
20
|
+
return {
|
|
21
|
+
baseUrl: runtime.baseUrl,
|
|
22
|
+
stop: runtime.stop,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=no-auth-xpod.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"no-auth-xpod.js","sourceRoot":"","sources":["../../src/test-utils/no-auth-xpod.ts"],"names":[],"mappings":";;AAcA,0CAmBC;AAjCD;;;GAGG;AACH,wDAA0D;AAUnD,KAAK,UAAU,eAAe,CAAC,UAA6B,EAAE;IAInE,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAgB,EAAC;QACrC,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;QACzC,WAAW,EAAE,OAAO,CAAC,IAAI;QACzB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC,CAAC;IAEH,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC;AACJ,CAAC","sourcesContent":["/**\n * 无鉴权版本的 xpod 启动器\n * 使用进程内 lib 方式启动完整 Xpod(CSS + API + Gateway)\n */\nimport { startXpodRuntime } from '../runtime/XpodRuntime';\n\nexport interface NoAuthXpodOptions {\n port?: number;\n baseUrl?: string;\n rootFilePath?: string;\n sparqlEndpoint?: string;\n logLevel?: string;\n}\n\nexport async function startNoAuthXpod(options: NoAuthXpodOptions = {}): Promise<{\n baseUrl: string;\n stop: () => Promise<void>;\n}> {\n const runtime = await startXpodRuntime({\n mode: 'local',\n open: true,\n transport: options.port ? 'port' : 'auto',\n gatewayPort: options.port,\n baseUrl: options.baseUrl,\n rootFilePath: options.rootFilePath,\n sparqlEndpoint: options.sparqlEndpoint,\n logLevel: options.logLevel,\n });\n\n return {\n baseUrl: runtime.baseUrl,\n stop: runtime.stop,\n };\n}\n"]}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.seedPod = seedPod;
|
|
7
|
+
/**
|
|
8
|
+
* Seed 测试 Pod 数据 - 在 SPARQL 数据库插入容器元数据
|
|
9
|
+
*/
|
|
10
|
+
const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
|
|
11
|
+
const fs_1 = require("fs");
|
|
12
|
+
const path_1 = __importDefault(require("path"));
|
|
13
|
+
async function seedPod(options) {
|
|
14
|
+
const { rootFilePath, podName = 'test' } = options;
|
|
15
|
+
// 确保目录存在
|
|
16
|
+
await fs_1.promises.mkdir(rootFilePath, { recursive: true });
|
|
17
|
+
const sparqlDbPath = path_1.default.join(rootFilePath, 'sparql.db');
|
|
18
|
+
const db = new better_sqlite3_1.default(sparqlDbPath);
|
|
19
|
+
// 创建 quints 表(如果不存在)
|
|
20
|
+
db.exec(`
|
|
21
|
+
CREATE TABLE IF NOT EXISTS quints (
|
|
22
|
+
graph TEXT NOT NULL,
|
|
23
|
+
subject TEXT NOT NULL,
|
|
24
|
+
predicate TEXT NOT NULL,
|
|
25
|
+
object TEXT NOT NULL,
|
|
26
|
+
vector TEXT,
|
|
27
|
+
PRIMARY KEY (graph, subject, predicate, object)
|
|
28
|
+
);
|
|
29
|
+
`);
|
|
30
|
+
const baseUrl = 'http://localhost:5741';
|
|
31
|
+
const now = new Date().toISOString();
|
|
32
|
+
const yyyy = new Date().getFullYear();
|
|
33
|
+
const MM = String(new Date().getMonth() + 1).padStart(2, '0');
|
|
34
|
+
const dd = String(new Date().getDate()).padStart(2, '0');
|
|
35
|
+
// 插入容器元数据到 quints 表
|
|
36
|
+
const containers = [
|
|
37
|
+
`${baseUrl}/${podName}/`,
|
|
38
|
+
`${baseUrl}/${podName}/.data/`,
|
|
39
|
+
`${baseUrl}/${podName}/.data/chat/`,
|
|
40
|
+
`${baseUrl}/${podName}/.data/chat/cli-default/`,
|
|
41
|
+
`${baseUrl}/${podName}/.data/chat/cli-default/${yyyy}/`,
|
|
42
|
+
`${baseUrl}/${podName}/.data/chat/cli-default/${yyyy}/${MM}/`,
|
|
43
|
+
`${baseUrl}/${podName}/.data/chat/cli-default/${yyyy}/${MM}/${dd}/`,
|
|
44
|
+
];
|
|
45
|
+
const insert = db.prepare(`
|
|
46
|
+
INSERT OR IGNORE INTO quints (graph, subject, predicate, object, vector)
|
|
47
|
+
VALUES (?, ?, ?, ?, NULL)
|
|
48
|
+
`);
|
|
49
|
+
for (const container of containers) {
|
|
50
|
+
const metaGraph = `meta:${container}`;
|
|
51
|
+
// 类型
|
|
52
|
+
insert.run(metaGraph, container, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 'http://www.w3.org/ns/ldp#Container');
|
|
53
|
+
insert.run(metaGraph, container, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 'http://www.w3.org/ns/ldp#BasicContainer');
|
|
54
|
+
insert.run(metaGraph, container, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 'http://www.w3.org/ns/ldp#Resource');
|
|
55
|
+
// 修改时间
|
|
56
|
+
insert.run(metaGraph, container, 'http://purl.org/dc/terms/modified', `"${now}"^^http://www.w3.org/2001/XMLSchema#dateTime`);
|
|
57
|
+
}
|
|
58
|
+
db.close();
|
|
59
|
+
console.log(`✓ SPARQL 容器元数据插入完成 (${containers.length} 个容器)`);
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=seed-pod.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"seed-pod.js","sourceRoot":"","sources":["../../src/test-utils/seed-pod.ts"],"names":[],"mappings":";;;;;AAYA,0BAyDC;AArED;;GAEG;AACH,oEAAsC;AACtC,2BAAoC;AACpC,gDAAwB;AAOjB,KAAK,UAAU,OAAO,CAAC,OAAuB;IACnD,MAAM,EAAE,YAAY,EAAE,OAAO,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;IAEnD,SAAS;IACT,MAAM,aAAE,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAElD,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAC1D,MAAM,EAAE,GAAG,IAAI,wBAAQ,CAAC,YAAY,CAAC,CAAC;IAEtC,qBAAqB;IACrB,EAAE,CAAC,IAAI,CAAC;;;;;;;;;GASP,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,uBAAuB,CAAC;IACxC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACtC,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC9D,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAEzD,oBAAoB;IACpB,MAAM,UAAU,GAAG;QACjB,GAAG,OAAO,IAAI,OAAO,GAAG;QACxB,GAAG,OAAO,IAAI,OAAO,SAAS;QAC9B,GAAG,OAAO,IAAI,OAAO,cAAc;QACnC,GAAG,OAAO,IAAI,OAAO,0BAA0B;QAC/C,GAAG,OAAO,IAAI,OAAO,2BAA2B,IAAI,GAAG;QACvD,GAAG,OAAO,IAAI,OAAO,2BAA2B,IAAI,IAAI,EAAE,GAAG;QAC7D,GAAG,OAAO,IAAI,OAAO,2BAA2B,IAAI,IAAI,EAAE,IAAI,EAAE,GAAG;KACpE,CAAC;IAEF,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,CAAC;;;GAGzB,CAAC,CAAC;IAEH,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,SAAS,GAAG,QAAQ,SAAS,EAAE,CAAC;QAEtC,KAAK;QACL,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,iDAAiD,EAAE,oCAAoC,CAAC,CAAC;QAC1H,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,iDAAiD,EAAE,yCAAyC,CAAC,CAAC;QAC/H,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,iDAAiD,EAAE,mCAAmC,CAAC,CAAC;QAEzH,OAAO;QACP,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,mCAAmC,EAAE,IAAI,GAAG,8CAA8C,CAAC,CAAC;IAC/H,CAAC;IAED,EAAE,CAAC,KAAK,EAAE,CAAC;IACX,OAAO,CAAC,GAAG,CAAC,uBAAuB,UAAU,CAAC,MAAM,OAAO,CAAC,CAAC;AAC/D,CAAC","sourcesContent":["/**\n * Seed 测试 Pod 数据 - 在 SPARQL 数据库插入容器元数据\n */\nimport Database from 'better-sqlite3';\nimport { promises as fs } from 'fs';\nimport path from 'path';\n\nexport interface SeedPodOptions {\n rootFilePath: string;\n podName?: string;\n}\n\nexport async function seedPod(options: SeedPodOptions): Promise<void> {\n const { rootFilePath, podName = 'test' } = options;\n\n // 确保目录存在\n await fs.mkdir(rootFilePath, { recursive: true });\n\n const sparqlDbPath = path.join(rootFilePath, 'sparql.db');\n const db = new Database(sparqlDbPath);\n\n // 创建 quints 表(如果不存在)\n db.exec(`\n CREATE TABLE IF NOT EXISTS quints (\n graph TEXT NOT NULL,\n subject TEXT NOT NULL,\n predicate TEXT NOT NULL,\n object TEXT NOT NULL,\n vector TEXT,\n PRIMARY KEY (graph, subject, predicate, object)\n );\n `);\n\n const baseUrl = 'http://localhost:5741';\n const now = new Date().toISOString();\n const yyyy = new Date().getFullYear();\n const MM = String(new Date().getMonth() + 1).padStart(2, '0');\n const dd = String(new Date().getDate()).padStart(2, '0');\n\n // 插入容器元数据到 quints 表\n const containers = [\n `${baseUrl}/${podName}/`,\n `${baseUrl}/${podName}/.data/`,\n `${baseUrl}/${podName}/.data/chat/`,\n `${baseUrl}/${podName}/.data/chat/cli-default/`,\n `${baseUrl}/${podName}/.data/chat/cli-default/${yyyy}/`,\n `${baseUrl}/${podName}/.data/chat/cli-default/${yyyy}/${MM}/`,\n `${baseUrl}/${podName}/.data/chat/cli-default/${yyyy}/${MM}/${dd}/`,\n ];\n\n const insert = db.prepare(`\n INSERT OR IGNORE INTO quints (graph, subject, predicate, object, vector)\n VALUES (?, ?, ?, ?, NULL)\n `);\n\n for (const container of containers) {\n const metaGraph = `meta:${container}`;\n\n // 类型\n insert.run(metaGraph, container, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 'http://www.w3.org/ns/ldp#Container');\n insert.run(metaGraph, container, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 'http://www.w3.org/ns/ldp#BasicContainer');\n insert.run(metaGraph, container, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 'http://www.w3.org/ns/ldp#Resource');\n\n // 修改时间\n insert.run(metaGraph, container, 'http://purl.org/dc/terms/modified', `\"${now}\"^^http://www.w3.org/2001/XMLSchema#dateTime`);\n }\n\n db.close();\n console.log(`✓ SPARQL 容器元数据插入完成 (${containers.length} 个容器)`);\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@undefineds.co/xpod",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0-preview.2",
|
|
4
4
|
"description": "Xpod is an extended Community Solid Server, offering rich-feature, production-level Solid Pod and identity management.",
|
|
5
5
|
"repository": "https://github.com/undefinedsco/xpod",
|
|
6
6
|
"author": "developer@undefineds.co",
|
|
@@ -21,6 +21,21 @@
|
|
|
21
21
|
},
|
|
22
22
|
"main": "./dist/index.js",
|
|
23
23
|
"types": "./dist/index.d.ts",
|
|
24
|
+
"exports": {
|
|
25
|
+
".": {
|
|
26
|
+
"types": "./dist/index.d.ts",
|
|
27
|
+
"default": "./dist/index.js"
|
|
28
|
+
},
|
|
29
|
+
"./runtime": {
|
|
30
|
+
"types": "./dist/runtime/index.d.ts",
|
|
31
|
+
"default": "./dist/runtime/index.js"
|
|
32
|
+
},
|
|
33
|
+
"./test-utils": {
|
|
34
|
+
"types": "./dist/test-utils/index.d.ts",
|
|
35
|
+
"default": "./dist/test-utils/index.js"
|
|
36
|
+
},
|
|
37
|
+
"./package.json": "./package.json"
|
|
38
|
+
},
|
|
24
39
|
"lsd:module": "https://linkedsoftwaredependencies.org/bundles/npm/@undefineds.co/xpod",
|
|
25
40
|
"lsd:components": "dist/components/components.jsonld",
|
|
26
41
|
"lsd:contexts": {
|
|
@@ -62,7 +77,8 @@
|
|
|
62
77
|
"test:run": "vitest --run",
|
|
63
78
|
"test:terminal": "npx ts-node scripts/test-terminal.ts",
|
|
64
79
|
"test:coverage": "vitest --run --coverage",
|
|
65
|
-
"test
|
|
80
|
+
"typecheck:test": "tsc --noEmit -p tsconfig.test.json",
|
|
81
|
+
"test:integration": "yarn test:integration:all",
|
|
66
82
|
"test:cluster": "XPOD_RUN_INTEGRATION_TESTS=true vitest --run tests/integration/MultiNodeCluster.integration.test.ts",
|
|
67
83
|
"test:all": "XPOD_RUN_INTEGRATION_TESTS=true vitest --run --coverage",
|
|
68
84
|
"test:quad-vs-quint": "vitest --run tests/storage/quad-vs-quint-comparison.test.ts",
|
|
@@ -71,13 +87,14 @@
|
|
|
71
87
|
"dev:cluster:lite": "docker compose -f docker-compose.standalone.yml up --build",
|
|
72
88
|
"dev:cluster:lite:down": "docker compose -f docker-compose.standalone.yml down",
|
|
73
89
|
"test:integration:lite": "yarn ts-node scripts/run-integration-lite-local.ts",
|
|
74
|
-
"test:integration:full": "
|
|
75
|
-
"test:integration:all": "yarn test:integration:
|
|
90
|
+
"test:integration:full": "yarn test:integration:cluster",
|
|
91
|
+
"test:integration:all": "yarn test:integration:lite && yarn test:integration:cluster",
|
|
76
92
|
"test:integration:lite:up": "docker compose -f docker-compose.standalone.yml up -d --build",
|
|
77
93
|
"test:integration:lite:down": "docker compose -f docker-compose.standalone.yml down",
|
|
78
94
|
"build:single": "node scripts/build-single-file.js",
|
|
79
95
|
"build:single:standalone": "yarn build && node scripts/build-single-file.js",
|
|
80
|
-
"test:setup": "dotenv -e .env.local -- yarn ts-node scripts/setup-test-credentials.ts"
|
|
96
|
+
"test:setup": "dotenv -e .env.local -- yarn ts-node scripts/setup-test-credentials.ts",
|
|
97
|
+
"test:integration:cluster": "yarn ts-node scripts/run-integration-cluster.ts"
|
|
81
98
|
},
|
|
82
99
|
"devDependencies": {
|
|
83
100
|
"@playwright/test": "^1.57.0",
|
|
@@ -125,6 +142,7 @@
|
|
|
125
142
|
"asynciterator": "^3.9.0",
|
|
126
143
|
"awilix": "^12.0.5",
|
|
127
144
|
"better-sqlite3": "^12.5.0",
|
|
145
|
+
"better-sqlite3-multiple-ciphers": "^12.6.2",
|
|
128
146
|
"classic-level": "^1.4.1",
|
|
129
147
|
"clsx": "^2.1.0",
|
|
130
148
|
"drizzle-orm": "^0.30.10",
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
<h1>Create account</h1>
|
|
2
|
+
<form method="post" id="mainForm">
|
|
3
|
+
<p class="error" id="error"></p>
|
|
4
|
+
|
|
5
|
+
<fieldset>
|
|
6
|
+
<p>Choose a name for your pod. It will be converted to lower case.</p>
|
|
7
|
+
<ol>
|
|
8
|
+
<li>
|
|
9
|
+
<label for="name">Name</label>
|
|
10
|
+
<input id="name" type="text" name="name" autofocus>
|
|
11
|
+
</li>
|
|
12
|
+
</ol>
|
|
13
|
+
<p>Choose which WebID will have initial write permissions on the pod.</p>
|
|
14
|
+
<ol>
|
|
15
|
+
<li class="radio">
|
|
16
|
+
<label>
|
|
17
|
+
<input type="radio" id="internalWebIdOn" name="internalWebId" value="on" checked>
|
|
18
|
+
Use the WebID in the Pod and register it to your account.
|
|
19
|
+
</label>
|
|
20
|
+
</li>
|
|
21
|
+
<li class="radio">
|
|
22
|
+
<label>
|
|
23
|
+
<input type="radio" id="internalWebIdOff" name="internalWebId" value="">
|
|
24
|
+
Use an external WebID.
|
|
25
|
+
</label>
|
|
26
|
+
<ol id="existingWebIdForm">
|
|
27
|
+
<li>
|
|
28
|
+
<label for="webId">Existing WebID:</label>
|
|
29
|
+
<input id="webId" type="text" name="webId">
|
|
30
|
+
</li>
|
|
31
|
+
</ol>
|
|
32
|
+
</li>
|
|
33
|
+
</ol>
|
|
34
|
+
</fieldset>
|
|
35
|
+
|
|
36
|
+
<ul class="actions">
|
|
37
|
+
<li><button type="submit" name="submit" disabled>Create pod</button></li>
|
|
38
|
+
<li><button type="button" id="account-link">Back</button></li>
|
|
39
|
+
</ul>
|
|
40
|
+
</form>
|
|
41
|
+
<div class="hidden" id="response">
|
|
42
|
+
<h2>Your new Pod</h2>
|
|
43
|
+
<p>
|
|
44
|
+
Your new Pod is located at <a id="response-podBaseUrl" href="" class="link"></a>.
|
|
45
|
+
<br>
|
|
46
|
+
You can store your documents and data there.
|
|
47
|
+
All WebIDs registered to this account have control access to this pod.
|
|
48
|
+
</p>
|
|
49
|
+
|
|
50
|
+
<div id="response-linkWebId">
|
|
51
|
+
<h2>Your new WebID</h2>
|
|
52
|
+
<p>
|
|
53
|
+
Your new WebID is <a id="response-webId" href="" class="link"></a>.
|
|
54
|
+
<br>
|
|
55
|
+
You can use this identifier to interact with Solid pods and apps.
|
|
56
|
+
</p>
|
|
57
|
+
</div>
|
|
58
|
+
|
|
59
|
+
<p class="actions"><button type="button" id="response-account-link">Back</button></p>
|
|
60
|
+
</div>
|
|
61
|
+
|
|
62
|
+
|
|
63
|
+
<script>
|
|
64
|
+
const { mainForm } = getElements('mainForm');
|
|
65
|
+
|
|
66
|
+
(async() => {
|
|
67
|
+
let res = await fetch('<%= idpIndex %>', { headers: { accept: 'application/json' } });
|
|
68
|
+
|
|
69
|
+
const { controls } = await res.json();
|
|
70
|
+
setRedirectClick('account-link', controls.html.account.account);
|
|
71
|
+
setRedirectClick('response-account-link', controls.html.account.account);
|
|
72
|
+
|
|
73
|
+
addPostListener(async() => {
|
|
74
|
+
const formData = new FormData(mainForm);
|
|
75
|
+
const json = {
|
|
76
|
+
name: formData.get('name'),
|
|
77
|
+
}
|
|
78
|
+
if (formData.get('internalWebId') === '') {
|
|
79
|
+
json.settings = { webId: formData.get('webId') };
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
// 透传 provisionCode(由 main.html.ejs 全局脚本存入 sessionStorage)
|
|
83
|
+
const pc = sessionStorage.getItem('provisionCode');
|
|
84
|
+
if (pc) {
|
|
85
|
+
json.settings = { ...json.settings, provisionCode: pc };
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
const res = await postJson(controls.account.pod, json);
|
|
89
|
+
if (res.status >= 400) {
|
|
90
|
+
throw new Error((await res.json()).message);
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
const { pod, webId, webIdResource } = await res.json();
|
|
94
|
+
|
|
95
|
+
updateElement('response-podBaseUrl', pod, { innerText: true, href: true });
|
|
96
|
+
if (webIdResource) {
|
|
97
|
+
updateElement('response-webId', webId, { innerText: true, href: true });
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
setVisibility('response', true);
|
|
101
|
+
setVisibility('response-linkWebId', Boolean(webIdResource));
|
|
102
|
+
setVisibility('mainForm', false);
|
|
103
|
+
|
|
104
|
+
// Pod 创建成功后清除 provisionCode
|
|
105
|
+
if (pc) {
|
|
106
|
+
sessionStorage.removeItem('provisionCode');
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
})();
|
|
110
|
+
</script>
|
package/templates/main.html.ejs
CHANGED
|
@@ -1 +1,11 @@
|
|
|
1
|
+
<script>
|
|
2
|
+
// 全局持久化 provisionCode:用户从 /.account/?provisionCode=xxx 进入后,
|
|
3
|
+
// 无论经过注册、登录多少步,最终到 create-pod 页面时 provisionCode 都在。
|
|
4
|
+
(function() {
|
|
5
|
+
try {
|
|
6
|
+
var pc = new URLSearchParams(location.search).get('provisionCode');
|
|
7
|
+
if (pc) sessionStorage.setItem('provisionCode', pc);
|
|
8
|
+
} catch(e) {}
|
|
9
|
+
})();
|
|
10
|
+
</script>
|
|
1
11
|
<%- htmlBody %>
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import type { ApiServer } from '../ApiServer';
|
|
2
|
-
import type { EdgeNodeRepository } from '../../identity/drizzle/EdgeNodeRepository';
|
|
3
|
-
import type { DrizzleClientCredentialsStore } from '../store/DrizzleClientCredentialsStore';
|
|
4
|
-
export interface DevHandlerOptions {
|
|
5
|
-
nodeRepo: EdgeNodeRepository;
|
|
6
|
-
credentialsStore: DrizzleClientCredentialsStore;
|
|
7
|
-
}
|
|
8
|
-
/**
|
|
9
|
-
* 开发模式专用 Handler
|
|
10
|
-
*
|
|
11
|
-
* 仅在 NODE_ENV=development 时启用,用于集成测试
|
|
12
|
-
*
|
|
13
|
-
* POST /dev/credentials - 创建测试用 client credentials
|
|
14
|
-
* POST /dev/nodes - 创建测试用 edge node
|
|
15
|
-
* POST /dev/setup - 一键创建 credentials + node(完整测试环境)
|
|
16
|
-
* DELETE /dev/cleanup/:testId - 清理测试数据
|
|
17
|
-
*/
|
|
18
|
-
export declare function registerDevRoutes(server: ApiServer, options: DevHandlerOptions): void;
|