Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
daf464261d | ||
|
|
2c485d5616 | ||
|
|
d35a64a744 | ||
|
|
9061c7a37d | ||
|
|
b100b3a77c | ||
|
|
8e50b85e08 | ||
|
|
a03aa35169 | ||
|
|
797cf98afd | ||
|
|
0f034d9e95 | ||
|
|
9e6c3859c0 |
@@ -0,0 +1,6 @@
|
|||||||
|
# FIX CRLF always when developer has not set
|
||||||
|
# Linux/Mac: git config --global core.autocrlf input
|
||||||
|
# Windows: git config --global core.autocrlf true
|
||||||
|
# Auto detect text files and perform LF normalization
|
||||||
|
* text=auto
|
||||||
|
* eol=lf
|
||||||
@@ -25,3 +25,4 @@ logs/
|
|||||||
|
|
||||||
# Runtime data
|
# Runtime data
|
||||||
data/
|
data/
|
||||||
|
docker/__pycache__/
|
||||||
|
|||||||
@@ -121,6 +121,7 @@ RUN chmod +x /usr/local/bin/meta-core
|
|||||||
COPY docker/nginx.conf /etc/nginx/nginx.conf
|
COPY docker/nginx.conf /etc/nginx/nginx.conf
|
||||||
COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
||||||
COPY docker/wsgidav.yaml /app/docker/
|
COPY docker/wsgidav.yaml /app/docker/
|
||||||
|
COPY docker/webdav_token_controller.py /app/docker/
|
||||||
COPY docker/welcome.html /app/welcome/
|
COPY docker/welcome.html /app/welcome/
|
||||||
COPY docker/start-fuse-driver.sh /app/docker/
|
COPY docker/start-fuse-driver.sh /app/docker/
|
||||||
RUN chmod 644 /app/welcome/welcome.html && \
|
RUN chmod 644 /app/welcome/welcome.html && \
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ Meta-Fuse is a read-only process in the MetaMesh ecosystem that:
|
|||||||
│ [3] meta-stremio (PROCESS-READ) │
|
│ [3] meta-stremio (PROCESS-READ) │
|
||||||
│ └─► Reads metadata from KV, streams media content │
|
│ └─► Reads metadata from KV, streams media content │
|
||||||
│ │
|
│ │
|
||||||
│ [4] meta-orbit (SHARING-READ-WRITE) │
|
│ [4] meta-share (SHARING-READ-WRITE) │
|
||||||
│ └─► P2P metadata sync across network │
|
│ └─► P2P metadata sync across network │
|
||||||
│ │
|
│ │
|
||||||
└────────────────────────────────────────────────────────────────────────────┘
|
└────────────────────────────────────────────────────────────────────────────┘
|
||||||
@@ -104,7 +104,7 @@ http://meta-core:9000
|
|||||||
|
|
||||||
/urls API Response (JSON):
|
/urls API Response (JSON):
|
||||||
{
|
{
|
||||||
"hostname": "meta-core-dev",
|
"hostname": "metacore-app",
|
||||||
"baseUrl": "http://localhost:8083",
|
"baseUrl": "http://localhost:8083",
|
||||||
"apiUrl": "http://meta-core:9000",
|
"apiUrl": "http://meta-core:9000",
|
||||||
"redisUrl": "redis://meta-core:6379",
|
"redisUrl": "redis://meta-core:6379",
|
||||||
@@ -606,10 +606,10 @@ journalctl -u meta-fuse-driver -f
|
|||||||
cat /meta-core/locks/kv-leader.info
|
cat /meta-core/locks/kv-leader.info
|
||||||
|
|
||||||
# Check /urls API
|
# Check /urls API
|
||||||
curl -k https://dev.localhost:8083/api/urls
|
curl -k https://metacore-dev.localhost:8083/api/urls
|
||||||
|
|
||||||
# Verify redis is running (on leader)
|
# Verify redis is running (on leader)
|
||||||
docker exec meta-core-dev redis-cli ping
|
docker exec metacore-app redis-cli ping
|
||||||
|
|
||||||
# Check meta-fuse logs
|
# Check meta-fuse logs
|
||||||
docker logs meta-fuse | grep "KV"
|
docker logs meta-fuse | grep "KV"
|
||||||
@@ -632,10 +632,10 @@ docker logs meta-fuse | grep "wsgidav"
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Check Redis has file data (flat key format)
|
# Check Redis has file data (flat key format)
|
||||||
docker exec meta-core-dev redis-cli keys "file:*" | head -20
|
docker exec metacore-app redis-cli keys "file:*" | head -20
|
||||||
|
|
||||||
# Check file index
|
# Check file index
|
||||||
docker exec meta-core-dev redis-cli scard "file:__index__"
|
docker exec metacore-app redis-cli scard "file:__index__"
|
||||||
|
|
||||||
# Verify source files exist
|
# Verify source files exist
|
||||||
ls -la /files/watch/
|
ls -la /files/watch/
|
||||||
@@ -644,7 +644,7 @@ ls -la /files/watch/
|
|||||||
curl http://localhost:3000/api/fuse/stats
|
curl http://localhost:3000/api/fuse/stats
|
||||||
|
|
||||||
# Check streaming state builder stats
|
# Check streaming state builder stats
|
||||||
docker logs meta-fuse-dev | grep "State builder"
|
docker logs metafuse-app | grep "State builder"
|
||||||
```
|
```
|
||||||
|
|
||||||
## Technology Stack
|
## Technology Stack
|
||||||
@@ -665,7 +665,7 @@ Meta-Fuse is designed to work seamlessly with other MetaMesh services:
|
|||||||
|
|
||||||
- **meta-sort**: Provides metadata in KV database
|
- **meta-sort**: Provides metadata in KV database
|
||||||
- **meta-stremio**: Can stream files exposed by meta-fuse
|
- **meta-stremio**: Can stream files exposed by meta-fuse
|
||||||
- **meta-orbit**: Syncs metadata across P2P network
|
- **meta-share**: Syncs metadata across P2P network
|
||||||
|
|
||||||
### Connecting to meta-sort
|
### Connecting to meta-sort
|
||||||
|
|
||||||
@@ -673,13 +673,13 @@ Ensure meta-sort is running and has processed files:
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Check meta-sort processing status
|
# Check meta-sort processing status
|
||||||
curl -k https://dev.localhost:8180/api/processing/status
|
curl -k https://metasort-dev.localhost:8180/api/processing/status
|
||||||
|
|
||||||
# Verify Redis has metadata (via meta-core)
|
# Verify Redis has metadata (via meta-core)
|
||||||
docker exec meta-core-dev redis-cli scard "file:__index__"
|
docker exec metacore-app redis-cli scard "file:__index__"
|
||||||
|
|
||||||
# Check meta:events stream has events
|
# Check meta:events stream has events
|
||||||
docker exec meta-core-dev redis-cli xlen "meta:events"
|
docker exec metacore-app redis-cli xlen "meta:events"
|
||||||
```
|
```
|
||||||
|
|
||||||
Meta-fuse will automatically discover the KV database through the shared lock file at `/meta-core/locks/kv-leader.info`.
|
Meta-fuse will automatically discover the KV database through the shared lock file at `/meta-core/locks/kv-leader.info`.
|
||||||
|
|||||||
@@ -72,3 +72,6 @@ autorestart=true
|
|||||||
stdout_logfile=/var/log/supervisor/wsgidav.log
|
stdout_logfile=/var/log/supervisor/wsgidav.log
|
||||||
stderr_logfile=/var/log/supervisor/wsgidav_error.log
|
stderr_logfile=/var/log/supervisor/wsgidav_error.log
|
||||||
startsecs=5
|
startsecs=5
|
||||||
|
environment=
|
||||||
|
PYTHONPATH="/app/docker",
|
||||||
|
TOKEN_STORE_PATH="/meta-fuse/config/webdav-tokens.json"
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
"""
|
||||||
|
WsgiDAV custom DomainController for meta-fuse WebDAV access tokens.
|
||||||
|
|
||||||
|
Reads `${TOKEN_STORE_PATH}` (a JSON file written by meta-fuse's TokenStore.ts)
|
||||||
|
fresh on every basic-auth request — no caching, so token revocation from the
|
||||||
|
dashboard takes effect on the next request.
|
||||||
|
|
||||||
|
Username is ignored: the WebDAV password IS the token. We accept any
|
||||||
|
non-empty username so generic clients (Finder, Plex, davfs2) that demand both
|
||||||
|
fields keep working.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import hashlib
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from wsgidav.dc.base_dc import BaseDomainController
|
||||||
|
|
||||||
|
# Match the prefix produced by TokenStore.ts.
|
||||||
|
TOKEN_PREFIX = "mfwd_"
|
||||||
|
TOKEN_STORE_DEFAULT = "/meta-fuse/config/webdav-tokens.json"
|
||||||
|
|
||||||
|
|
||||||
|
class WebdavTokenController(BaseDomainController):
|
||||||
|
"""
|
||||||
|
Auth provider backed by meta-fuse's per-device token store.
|
||||||
|
|
||||||
|
WsgiDAV calls `basic_auth_user(realm, user_name, password, environ)` for
|
||||||
|
every request that requires auth. We hash the candidate password with
|
||||||
|
sha256 and check it against the persisted records.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, wsgidav_app: Any, config: dict) -> None:
|
||||||
|
super().__init__(wsgidav_app, config)
|
||||||
|
self._store_path = os.environ.get("TOKEN_STORE_PATH", TOKEN_STORE_DEFAULT)
|
||||||
|
|
||||||
|
# --- BaseDomainController contract --------------------------------------
|
||||||
|
|
||||||
|
def get_domain_realm(self, path_info: str, environ: dict) -> str:
|
||||||
|
# Single realm — all paths require the same token.
|
||||||
|
return "metafuse-webdav"
|
||||||
|
|
||||||
|
def require_authentication(self, realm: str, environ: dict) -> bool:
|
||||||
|
return True
|
||||||
|
|
||||||
|
def supports_http_digest_auth(self) -> bool:
|
||||||
|
# Tokens are not stored in plaintext, so we cannot answer digest
|
||||||
|
# challenges — clients must use basic auth (over TLS).
|
||||||
|
return False
|
||||||
|
|
||||||
|
def basic_auth_user(
|
||||||
|
self, realm: str, user_name: str, password: str, environ: dict
|
||||||
|
) -> bool:
|
||||||
|
if not password or not password.startswith(TOKEN_PREFIX):
|
||||||
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
|
with open(self._store_path, "r", encoding="utf-8") as fh:
|
||||||
|
store = json.load(fh)
|
||||||
|
except FileNotFoundError:
|
||||||
|
return False
|
||||||
|
except (OSError, json.JSONDecodeError):
|
||||||
|
# Treat unreadable store as "no valid tokens" — fail closed.
|
||||||
|
return False
|
||||||
|
|
||||||
|
candidate = hashlib.sha256(password.encode("utf-8")).hexdigest()
|
||||||
|
for token in store.get("tokens", []):
|
||||||
|
if token.get("hash") == candidate:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
+8
-16
@@ -3,17 +3,14 @@
|
|||||||
host: 0.0.0.0
|
host: 0.0.0.0
|
||||||
port: 8080
|
port: 8080
|
||||||
|
|
||||||
# Simple user authentication
|
# Authentication is delegated to a custom DomainController that validates the
|
||||||
simple_dc:
|
# basic-auth password against meta-fuse's per-device token store. Any
|
||||||
user_mapping:
|
# non-empty username is accepted; the password IS the token (`mfwd_*`).
|
||||||
"/":
|
http_authenticator:
|
||||||
metamesh:
|
domain_controller: webdav_token_controller.WebdavTokenController
|
||||||
password: metamesh
|
accept_basic: true
|
||||||
roles: ["editor"]
|
accept_digest: false
|
||||||
"/webdav":
|
default_to_digest: false
|
||||||
metamesh:
|
|
||||||
password: metamesh
|
|
||||||
roles: ["editor"]
|
|
||||||
|
|
||||||
# Mount the virtual filesystem
|
# Mount the virtual filesystem
|
||||||
provider_mapping:
|
provider_mapping:
|
||||||
@@ -31,11 +28,6 @@ server: cheroot
|
|||||||
server_args:
|
server_args:
|
||||||
numthreads: 10
|
numthreads: 10
|
||||||
|
|
||||||
# Authentication settings
|
|
||||||
accept_basic: true
|
|
||||||
accept_digest: false
|
|
||||||
default_to_digest: false
|
|
||||||
|
|
||||||
# HTTP configuration
|
# HTTP configuration
|
||||||
add_header_MS_Author_Via: false
|
add_header_MS_Author_Via: false
|
||||||
|
|
||||||
|
|||||||
@@ -535,29 +535,29 @@ List all discovered MetaMesh services.
|
|||||||
"services": [
|
"services": [
|
||||||
{
|
{
|
||||||
"name": "meta-sort",
|
"name": "meta-sort",
|
||||||
"url": "http://meta-sort-dev",
|
"url": "http://metasort-app",
|
||||||
"api": "http://meta-sort-dev/api",
|
"api": "http://metasort-app/api",
|
||||||
"status": "healthy",
|
"status": "healthy",
|
||||||
"role": "writer"
|
"role": "writer"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "meta-fuse",
|
"name": "meta-fuse",
|
||||||
"url": "http://meta-fuse-dev",
|
"url": "http://metafuse-app",
|
||||||
"api": "http://meta-fuse-dev/api",
|
"api": "http://metafuse-app/api",
|
||||||
"status": "healthy",
|
"status": "healthy",
|
||||||
"role": "reader"
|
"role": "reader"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "meta-stremio",
|
"name": "meta-stremio",
|
||||||
"url": "http://meta-stremio-dev",
|
"url": "http://metastremio-app",
|
||||||
"api": "http://meta-stremio-dev/api",
|
"api": "http://metastremio-app/api",
|
||||||
"status": "healthy",
|
"status": "healthy",
|
||||||
"role": "reader"
|
"role": "reader"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"current": "meta-fuse",
|
"current": "meta-fuse",
|
||||||
"leader": {
|
"leader": {
|
||||||
"hostname": "meta-core-dev",
|
"hostname": "metacore-app",
|
||||||
"baseUrl": "http://localhost:8083",
|
"baseUrl": "http://localhost:8083",
|
||||||
"apiUrl": "http://meta-core:9000",
|
"apiUrl": "http://meta-core:9000",
|
||||||
"redisUrl": "redis://meta-core:6379",
|
"redisUrl": "redis://meta-core:6379",
|
||||||
|
|||||||
@@ -350,7 +350,7 @@ The `onFileComplete` callback is called when:
|
|||||||
```
|
```
|
||||||
[meta-fuse] Starting meta-fuse...
|
[meta-fuse] Starting meta-fuse...
|
||||||
[KVManager] Waiting for leader...
|
[KVManager] Waiting for leader...
|
||||||
[LeaderClient] Leader found: meta-core-dev at redis://meta-core:6379
|
[LeaderClient] Leader found: metacore-app at redis://meta-core:6379
|
||||||
[meta-fuse] KV Manager ready, initializing VFS with streaming bootstrap...
|
[meta-fuse] KV Manager ready, initializing VFS with streaming bootstrap...
|
||||||
[StreamingStateBuilder] Initialized with 12 VFS-relevant properties
|
[StreamingStateBuilder] Initialized with 12 VFS-relevant properties
|
||||||
[meta-fuse] Replaying meta:events stream from position 0...
|
[meta-fuse] Replaying meta:events stream from position 0...
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import type { RenamingConfig, RenamingRule, PreviewResponse } from '../vfs/types
|
|||||||
import { TEMPLATE_VARIABLES } from '../vfs/types/RenamingRuleTypes.js';
|
import { TEMPLATE_VARIABLES } from '../vfs/types/RenamingRuleTypes.js';
|
||||||
import { TemplateEngine } from '../vfs/template/TemplateEngine.js';
|
import { TemplateEngine } from '../vfs/template/TemplateEngine.js';
|
||||||
import { ConditionEvaluator } from '../vfs/template/ConditionEvaluator.js';
|
import { ConditionEvaluator } from '../vfs/template/ConditionEvaluator.js';
|
||||||
|
import { TokenStore } from '../webdav/TokenStore.js';
|
||||||
|
|
||||||
const logger = new Logger({ name: 'APIServer' });
|
const logger = new Logger({ name: 'APIServer' });
|
||||||
|
|
||||||
@@ -30,6 +31,7 @@ export class APIServer {
|
|||||||
private vfs: VirtualFileSystem;
|
private vfs: VirtualFileSystem;
|
||||||
private kvManager: KVManager | null = null;
|
private kvManager: KVManager | null = null;
|
||||||
private config: Required<APIServerConfig>;
|
private config: Required<APIServerConfig>;
|
||||||
|
private tokenStore: TokenStore;
|
||||||
|
|
||||||
constructor(vfs: VirtualFileSystem, config: APIServerConfig = {}, kvManager?: KVManager) {
|
constructor(vfs: VirtualFileSystem, config: APIServerConfig = {}, kvManager?: KVManager) {
|
||||||
this.vfs = vfs;
|
this.vfs = vfs;
|
||||||
@@ -38,6 +40,10 @@ export class APIServer {
|
|||||||
port: config.port ?? parseInt(process.env.API_PORT ?? '3000', 10),
|
port: config.port ?? parseInt(process.env.API_PORT ?? '3000', 10),
|
||||||
host: config.host ?? process.env.API_HOST ?? '0.0.0.0',
|
host: config.host ?? process.env.API_HOST ?? '0.0.0.0',
|
||||||
};
|
};
|
||||||
|
// CONFIG_DIR is the same dir ConfigStorage uses for renaming rules.
|
||||||
|
this.tokenStore = new TokenStore({
|
||||||
|
configDir: process.env.CONFIG_DIR ?? '/meta-fuse/config',
|
||||||
|
});
|
||||||
|
|
||||||
this.app = Fastify({
|
this.app = Fastify({
|
||||||
logger: false,
|
logger: false,
|
||||||
@@ -85,42 +91,70 @@ export class APIServer {
|
|||||||
this.app.post('/api/fuse/rules/validate', this.handleValidateRule.bind(this));
|
this.app.post('/api/fuse/rules/validate', this.handleValidateRule.bind(this));
|
||||||
this.app.get('/api/fuse/rules/variables', this.handleGetVariables.bind(this));
|
this.app.get('/api/fuse/rules/variables', this.handleGetVariables.bind(this));
|
||||||
|
|
||||||
// Service discovery — proxies to meta-core's /api/services, resolving the
|
// meta-discovery v1: neighbours heard over UDP, from this service's own
|
||||||
// current leader's URL via LeaderClient (no hardcoded hostname).
|
// map — no meta-core needed, so the nav renders even when the core is down.
|
||||||
this.app.get('/api/services', this.handleServices.bind(this));
|
this.app.get('/api/neighbors', this.handleNeighbors.bind(this));
|
||||||
|
|
||||||
|
// WebDAV access tokens (per-device basic-auth passwords for /webdav).
|
||||||
|
this.app.get('/api/webdav-tokens', this.handleListTokens.bind(this));
|
||||||
|
this.app.post('/api/webdav-tokens', this.handleCreateToken.bind(this));
|
||||||
|
this.app.delete('/api/webdav-tokens/:id', this.handleRevokeToken.bind(this));
|
||||||
|
}
|
||||||
|
|
||||||
|
private async handleListTokens(_req: FastifyRequest, reply: FastifyReply): Promise<void> {
|
||||||
|
reply.send({ tokens: this.tokenStore.list() });
|
||||||
|
}
|
||||||
|
|
||||||
|
private async handleCreateToken(
|
||||||
|
req: FastifyRequest<{ Body: { label?: string } }>,
|
||||||
|
reply: FastifyReply
|
||||||
|
): Promise<void> {
|
||||||
|
const label = (req.body?.label ?? '').toString();
|
||||||
|
if (label.length > 200) {
|
||||||
|
reply.status(400).send({ error: 'label too long (max 200 chars)' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const { plaintext, view } = this.tokenStore.create(label);
|
||||||
|
// The plaintext is included exactly once in this response — the dashboard
|
||||||
|
// surfaces it to the user and then discards it. Subsequent GETs do not
|
||||||
|
// include it.
|
||||||
|
reply.status(201).send({ ...view, token: plaintext });
|
||||||
|
}
|
||||||
|
|
||||||
|
private async handleRevokeToken(
|
||||||
|
req: FastifyRequest<{ Params: { id: string } }>,
|
||||||
|
reply: FastifyReply
|
||||||
|
): Promise<void> {
|
||||||
|
const ok = this.tokenStore.revoke(req.params.id);
|
||||||
|
if (!ok) {
|
||||||
|
reply.status(404).send({ error: 'token not found' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
reply.status(204).send();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Proxy handler that forwards /api/services to meta-core's canonical
|
* meta-discovery v1 neighbours, served from this service's own UDP map.
|
||||||
* registry endpoint using LeaderClient for discovery.
|
* `services` is an alias kept while older dashboard builds are around.
|
||||||
*/
|
*/
|
||||||
private async handleServices(_req: FastifyRequest, reply: FastifyReply): Promise<void> {
|
private async handleNeighbors(_request: FastifyRequest, reply: FastifyReply): Promise<void> {
|
||||||
try {
|
|
||||||
const leaderClient = this.kvManager?.getLeaderClient();
|
const leaderClient = this.kvManager?.getLeaderClient();
|
||||||
if (!leaderClient) {
|
if (!leaderClient) {
|
||||||
reply.status(503).send({ error: 'KVManager not initialized' });
|
void reply.send({ current: 'meta-fuse', enabled: false, count: 0, neighbors: [] });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const apiUrl = await leaderClient.getApiUrl();
|
const neighbors = leaderClient.getNeighbors();
|
||||||
if (!apiUrl) {
|
void reply.send({
|
||||||
reply.status(503).send({ error: 'Leader not available yet' });
|
current: 'meta-fuse',
|
||||||
return;
|
enabled: true,
|
||||||
}
|
count: neighbors.length,
|
||||||
const response = await fetch(`${apiUrl}/api/services`, {
|
neighbors,
|
||||||
signal: AbortSignal.timeout(5000),
|
services: neighbors,
|
||||||
|
self: leaderClient.self(),
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
|
||||||
reply.status(response.status).send({
|
|
||||||
error: `Upstream ${apiUrl} returned ${response.status}`,
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
reply.send(await response.json());
|
|
||||||
} catch (err: any) {
|
|
||||||
reply.status(502).send({ error: err?.message ?? String(err) });
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Start the server
|
* Start the server
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -0,0 +1,441 @@
|
|||||||
|
/**
|
||||||
|
* meta-discovery v1 — UDP multicast service discovery.
|
||||||
|
*
|
||||||
|
* Replaces the two file-based mechanisms that required a shared /meta-core
|
||||||
|
* volume: `locks/kv-leader.info` (locating meta-core at boot) and
|
||||||
|
* `services/<name>-<host>.json` (the dashboard nav registry). Both answered the
|
||||||
|
* same question — where is meta-core, and who else is on this network — so one
|
||||||
|
* announce packet answers both, and discovery scope becomes the docker network
|
||||||
|
* rather than the mounted volume.
|
||||||
|
*
|
||||||
|
* The normative spec is docs/project-architecture/service-discovery.md.
|
||||||
|
*
|
||||||
|
* ⚠ MIRRORED FILE. Byte-identical copies live in meta-sort-core, meta-fuse-core
|
||||||
|
* and meta-dup-core. They cannot share a package: meta-fuse-core and
|
||||||
|
* meta-dup-core do not depend on @metazla/meta-interface at all, and each
|
||||||
|
* submodule is its own Docker build context, so a workspace dep resolves
|
||||||
|
* outside the build. Edit one copy → edit all three, and
|
||||||
|
* `scripts/check-mirrors.sh` will tell you if you forgot.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import dgram from 'dgram';
|
||||||
|
import { hostname, networkInterfaces } from 'os';
|
||||||
|
|
||||||
|
export const PROTOCOL_VERSION = 1;
|
||||||
|
export const DEFAULT_GROUP = '239.255.77.1';
|
||||||
|
export const DEFAULT_PORT = 9399;
|
||||||
|
export const DEFAULT_INTERVAL_MS = 10_000;
|
||||||
|
/** A neighbour unseen for interval × this is dropped. Replaces the reaper. */
|
||||||
|
export const LIVENESS_FACTOR = 3;
|
||||||
|
|
||||||
|
export const TYPE_DISCOVERY = 'discovery';
|
||||||
|
export const TYPE_ANNOUNCE = 'announce';
|
||||||
|
export const ROLE_CORE = 'core';
|
||||||
|
export const ROLE_SERVICE = 'service';
|
||||||
|
|
||||||
|
/** Mirrors meta-core's GET /urls response minus redisUrl (retired). */
|
||||||
|
export interface MeshUrls {
|
||||||
|
hostname: string;
|
||||||
|
baseUrl: string;
|
||||||
|
apiUrl: string;
|
||||||
|
webdavUrl: string;
|
||||||
|
webdavUrlInternal: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface MeshMessage {
|
||||||
|
v: number;
|
||||||
|
type: string;
|
||||||
|
name?: string;
|
||||||
|
instance?: string;
|
||||||
|
role?: string;
|
||||||
|
version?: string;
|
||||||
|
status?: string;
|
||||||
|
baseUrl?: string;
|
||||||
|
/** Present only when role === 'core'. */
|
||||||
|
urls?: MeshUrls;
|
||||||
|
/** Reserved for a future HMAC; v1 ignores it. */
|
||||||
|
token?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface MeshNeighbor extends MeshMessage {
|
||||||
|
/** Source address taken from the packet, never from the payload. */
|
||||||
|
addr: string;
|
||||||
|
lastSeen: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface MeshNodeConfig {
|
||||||
|
name: string;
|
||||||
|
instance?: string;
|
||||||
|
role?: string;
|
||||||
|
version?: string;
|
||||||
|
group?: string;
|
||||||
|
port?: number;
|
||||||
|
intervalMs?: number;
|
||||||
|
enabled?: boolean;
|
||||||
|
/** Rebuilt on every announce so the payload never goes stale. */
|
||||||
|
payload?: () => { baseUrl?: string; status?: string; urls?: MeshUrls };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** IPv4 addresses of every up, non-internal interface. */
|
||||||
|
function localInterfaceAddresses(): string[] {
|
||||||
|
const out: string[] = [];
|
||||||
|
const nets = networkInterfaces();
|
||||||
|
for (const name of Object.keys(nets)) {
|
||||||
|
for (const ni of nets[name] ?? []) {
|
||||||
|
// Node has flip-flopped between 'IPv4' and 4 for `family`.
|
||||||
|
const isV4 = (ni as { family: string | number }).family === 'IPv4' ||
|
||||||
|
(ni as { family: string | number }).family === 4;
|
||||||
|
if (isV4 && !ni.internal && ni.address) out.push(ni.address);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** First non-internal IPv4 address, or the hostname. Matches the Go helper. */
|
||||||
|
export function localIPv4(): string {
|
||||||
|
return localInterfaceAddresses()[0] ?? hostname();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* One participant in the mesh: announces itself, answers probes, and keeps a
|
||||||
|
* TTL map of everyone else.
|
||||||
|
*/
|
||||||
|
export class MeshNode {
|
||||||
|
private cfg: Required<Omit<MeshNodeConfig, 'payload'>> & Pick<MeshNodeConfig, 'payload'>;
|
||||||
|
private socket: dgram.Socket | null = null;
|
||||||
|
private timer: NodeJS.Timeout | null = null;
|
||||||
|
private neighbors = new Map<string, MeshNeighbor>();
|
||||||
|
private ifaceAddrs: string[] = [];
|
||||||
|
private listeners: ((n: MeshNeighbor) => void)[] = [];
|
||||||
|
private started = false;
|
||||||
|
|
||||||
|
constructor(config: MeshNodeConfig) {
|
||||||
|
this.cfg = {
|
||||||
|
name: config.name,
|
||||||
|
instance: config.instance ?? hostname(),
|
||||||
|
role: config.role ?? ROLE_SERVICE,
|
||||||
|
version: config.version ?? '',
|
||||||
|
group: config.group ?? DEFAULT_GROUP,
|
||||||
|
port: config.port ?? DEFAULT_PORT,
|
||||||
|
intervalMs: config.intervalMs ?? DEFAULT_INTERVAL_MS,
|
||||||
|
enabled: config.enabled ?? true,
|
||||||
|
payload: config.payload,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async start(): Promise<void> {
|
||||||
|
if (this.started || !this.cfg.enabled) {
|
||||||
|
if (!this.cfg.enabled) console.log('[meshdisco] Disabled by configuration');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.started = true;
|
||||||
|
|
||||||
|
await new Promise<void>((resolve) => {
|
||||||
|
const socket = dgram.createSocket({ type: 'udp4', reuseAddr: true });
|
||||||
|
this.socket = socket;
|
||||||
|
|
||||||
|
socket.on('message', (buf, rinfo) => this.onMessage(buf, rinfo));
|
||||||
|
socket.on('error', (err) => {
|
||||||
|
// Never fatal: a host that blocks multicast must degrade, not
|
||||||
|
// take the service down.
|
||||||
|
console.error('[meshdisco] Socket error:', err.message);
|
||||||
|
});
|
||||||
|
|
||||||
|
socket.bind(this.cfg.port, '0.0.0.0', () => {
|
||||||
|
try {
|
||||||
|
socket.setMulticastTTL(1); // link-local only
|
||||||
|
} catch (e) {
|
||||||
|
console.warn('[meshdisco] Could not set multicast TTL:', e);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Join on EVERY interface. A container on two docker networks
|
||||||
|
// that joins only the default route silently sees one network.
|
||||||
|
this.ifaceAddrs = localInterfaceAddresses();
|
||||||
|
let joined = 0;
|
||||||
|
for (const addr of this.ifaceAddrs) {
|
||||||
|
try {
|
||||||
|
socket.addMembership(this.cfg.group, addr);
|
||||||
|
joined++;
|
||||||
|
} catch (e) {
|
||||||
|
console.warn(`[meshdisco] Join ${this.cfg.group} on ${addr} failed:`, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
console.log(
|
||||||
|
`[meshdisco] Listening on ${this.cfg.group}:${this.cfg.port} as ` +
|
||||||
|
`${this.cfg.name}/${this.cfg.instance} (joined ${joined} of ${this.ifaceAddrs.length} interfaces)`
|
||||||
|
);
|
||||||
|
resolve();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
this.announce();
|
||||||
|
this.probe();
|
||||||
|
this.timer = setInterval(() => this.announce(), this.cfg.intervalMs);
|
||||||
|
// Don't hold the event loop open on shutdown.
|
||||||
|
this.timer.unref?.();
|
||||||
|
}
|
||||||
|
|
||||||
|
async stop(): Promise<void> {
|
||||||
|
if (!this.started) return;
|
||||||
|
this.started = false;
|
||||||
|
if (this.timer) { clearInterval(this.timer); this.timer = null; }
|
||||||
|
// Final "stopping" announce so neighbours drop us immediately rather
|
||||||
|
// than waiting out the staleness window.
|
||||||
|
this.announce('stopping');
|
||||||
|
await new Promise<void>((resolve) => {
|
||||||
|
if (!this.socket) return resolve();
|
||||||
|
try { this.socket.close(() => resolve()); } catch { resolve(); }
|
||||||
|
});
|
||||||
|
this.socket = null;
|
||||||
|
this.listeners = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Multicast a probe; every listener replies immediately. */
|
||||||
|
probe(): void {
|
||||||
|
this.send({ v: PROTOCOL_VERSION, type: TYPE_DISCOVERY });
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Everyone heard from inside the staleness window, sorted by name. */
|
||||||
|
getNeighbors(): MeshNeighbor[] {
|
||||||
|
const cutoff = Date.now() - this.cfg.intervalMs * LIVENESS_FACTOR;
|
||||||
|
const out: MeshNeighbor[] = [];
|
||||||
|
for (const [key, nb] of this.neighbors) {
|
||||||
|
if (nb.lastSeen < cutoff) { this.neighbors.delete(key); continue; }
|
||||||
|
out.push(nb);
|
||||||
|
}
|
||||||
|
return out.sort((a, b) => (a.name ?? '').localeCompare(b.name ?? ''));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** One row per service name, most recently seen instance wins. */
|
||||||
|
getNeighborsByName(): MeshNeighbor[] {
|
||||||
|
const best = new Map<string, MeshNeighbor>();
|
||||||
|
for (const nb of this.getNeighbors()) {
|
||||||
|
const cur = best.get(nb.name ?? '');
|
||||||
|
if (!cur || nb.lastSeen > cur.lastSeen) best.set(nb.name ?? '', nb);
|
||||||
|
}
|
||||||
|
return [...best.values()].sort((a, b) => (a.name ?? '').localeCompare(b.name ?? ''));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Cores only — what a locator filters on. */
|
||||||
|
getCores(): MeshNeighbor[] {
|
||||||
|
return this.getNeighbors().filter((n) => n.role === ROLE_CORE && n.urls);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** This node's own announce, so a UI can render itself without waiting. */
|
||||||
|
self(): MeshNeighbor {
|
||||||
|
return { ...this.buildAnnounce('running'), addr: '', lastSeen: Date.now() };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Fires for every announce received (after the self-echo filter). */
|
||||||
|
onAnnounce(cb: (n: MeshNeighbor) => void): void {
|
||||||
|
this.listeners.push(cb);
|
||||||
|
}
|
||||||
|
|
||||||
|
private onMessage(buf: Buffer, rinfo: dgram.RemoteInfo): void {
|
||||||
|
let msg: MeshMessage;
|
||||||
|
try {
|
||||||
|
msg = JSON.parse(buf.toString('utf8')) as MeshMessage;
|
||||||
|
} catch {
|
||||||
|
return; // foreign traffic on the group
|
||||||
|
}
|
||||||
|
if (msg.v !== PROTOCOL_VERSION) return;
|
||||||
|
// Drop our own multicast echo.
|
||||||
|
if (msg.instance && msg.instance === this.cfg.instance && msg.name === this.cfg.name) return;
|
||||||
|
|
||||||
|
if (msg.type === TYPE_DISCOVERY) {
|
||||||
|
this.replyTo(rinfo);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (msg.type !== TYPE_ANNOUNCE || !msg.name) return;
|
||||||
|
|
||||||
|
const key = msg.instance ? `${msg.name}|${msg.instance}` : msg.name;
|
||||||
|
if (msg.status === 'stopping') { this.neighbors.delete(key); return; }
|
||||||
|
|
||||||
|
const nb: MeshNeighbor = { ...msg, addr: rinfo.address, lastSeen: Date.now() };
|
||||||
|
this.neighbors.set(key, nb);
|
||||||
|
for (const cb of this.listeners) {
|
||||||
|
try { cb(nb); } catch (e) { console.error('[meshdisco] Listener threw:', e); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private buildAnnounce(status: string): MeshMessage {
|
||||||
|
const msg: MeshMessage = {
|
||||||
|
v: PROTOCOL_VERSION,
|
||||||
|
type: TYPE_ANNOUNCE,
|
||||||
|
name: this.cfg.name,
|
||||||
|
instance: this.cfg.instance,
|
||||||
|
role: this.cfg.role,
|
||||||
|
version: this.cfg.version,
|
||||||
|
status,
|
||||||
|
};
|
||||||
|
if (this.cfg.payload) {
|
||||||
|
const p = this.cfg.payload();
|
||||||
|
if (p.baseUrl) msg.baseUrl = p.baseUrl;
|
||||||
|
if (p.status && status === 'running') msg.status = p.status;
|
||||||
|
// Only a core may carry a URLs block — a service announcing one
|
||||||
|
// would let any container impersonate meta-core.
|
||||||
|
if (this.cfg.role === ROLE_CORE && p.urls) msg.urls = p.urls;
|
||||||
|
}
|
||||||
|
return msg;
|
||||||
|
}
|
||||||
|
|
||||||
|
private announce(status = 'running'): void {
|
||||||
|
this.send(this.buildAnnounce(status));
|
||||||
|
}
|
||||||
|
|
||||||
|
private replyTo(rinfo: dgram.RemoteInfo): void {
|
||||||
|
const body = Buffer.from(JSON.stringify(this.buildAnnounce('running')));
|
||||||
|
try {
|
||||||
|
this.socket?.send(body, rinfo.port, rinfo.address);
|
||||||
|
} catch (e) {
|
||||||
|
console.warn('[meshdisco] Reply failed:', e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Writes once per interface — the default route alone reaches one network. */
|
||||||
|
private send(msg: MeshMessage): void {
|
||||||
|
const socket = this.socket;
|
||||||
|
if (!socket) return;
|
||||||
|
const body = Buffer.from(JSON.stringify(msg));
|
||||||
|
for (const addr of this.ifaceAddrs) {
|
||||||
|
try {
|
||||||
|
socket.setMulticastInterface(addr);
|
||||||
|
socket.send(body, this.cfg.port, this.cfg.group);
|
||||||
|
} catch (e) {
|
||||||
|
console.warn(`[meshdisco] Send on ${addr} failed:`, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface MetaCoreLocatorConfig {
|
||||||
|
/** This service's name, for its own announce. */
|
||||||
|
serviceName: string;
|
||||||
|
/** Browser-facing URL for the nav menu. */
|
||||||
|
baseUrl?: string;
|
||||||
|
version?: string;
|
||||||
|
/**
|
||||||
|
* Explicit meta-core API URL. When set this ALWAYS wins and the wire is
|
||||||
|
* never consulted for core selection — see the spec's "the pin always
|
||||||
|
* wins". This is what stops a client box from latching onto a gateway
|
||||||
|
* box's core when both are reachable on a shared network.
|
||||||
|
*/
|
||||||
|
metaCoreUrl?: string;
|
||||||
|
group?: string;
|
||||||
|
port?: number;
|
||||||
|
intervalMs?: number;
|
||||||
|
enabled?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Locates meta-core over UDP, replacing the read of
|
||||||
|
* /meta-core/locks/kv-leader.info.
|
||||||
|
*/
|
||||||
|
export class MetaCoreLocator {
|
||||||
|
private node: MeshNode;
|
||||||
|
private cfg: MetaCoreLocatorConfig;
|
||||||
|
private current: MeshUrls | null = null;
|
||||||
|
private changeCallbacks: (() => void)[] = [];
|
||||||
|
|
||||||
|
constructor(config: MetaCoreLocatorConfig) {
|
||||||
|
this.cfg = config;
|
||||||
|
this.node = new MeshNode({
|
||||||
|
name: config.serviceName,
|
||||||
|
role: ROLE_SERVICE,
|
||||||
|
version: config.version,
|
||||||
|
group: config.group,
|
||||||
|
port: config.port,
|
||||||
|
intervalMs: config.intervalMs,
|
||||||
|
enabled: config.enabled,
|
||||||
|
payload: () => ({ baseUrl: config.baseUrl ?? `http://${localIPv4()}` }),
|
||||||
|
});
|
||||||
|
|
||||||
|
this.node.onAnnounce((nb) => {
|
||||||
|
if (nb.role !== ROLE_CORE || !nb.urls) return;
|
||||||
|
if (this.cfg.metaCoreUrl) return; // pinned: the wire cannot move us
|
||||||
|
|
||||||
|
const prev = this.current;
|
||||||
|
if (!prev) {
|
||||||
|
this.current = nb.urls;
|
||||||
|
console.log(`[meshdisco] meta-core discovered at ${nb.urls.apiUrl} (${nb.addr})`);
|
||||||
|
this.notifyChange();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (prev.apiUrl === nb.urls.apiUrl) {
|
||||||
|
this.current = nb.urls; // refresh the rest of the fields
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// A second, different core is announcing. Do not flap between
|
||||||
|
// them — keep the first and say so loudly, because on a PCS box
|
||||||
|
// this means a client container can see the gateway's core.
|
||||||
|
console.warn(
|
||||||
|
`[meshdisco] Ignoring a second meta-core at ${nb.urls.apiUrl} (${nb.addr}); ` +
|
||||||
|
`staying with ${prev.apiUrl}. Set META_CORE_URL to pin this explicitly.`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async start(): Promise<void> {
|
||||||
|
if (this.cfg.metaCoreUrl) {
|
||||||
|
console.log(`[meshdisco] meta-core pinned to ${this.cfg.metaCoreUrl}; discovery is advisory`);
|
||||||
|
}
|
||||||
|
await this.node.start();
|
||||||
|
}
|
||||||
|
|
||||||
|
async stop(): Promise<void> {
|
||||||
|
await this.node.stop();
|
||||||
|
this.changeCallbacks = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The pin if set, else whatever discovery elected. */
|
||||||
|
getApiUrl(): string | null {
|
||||||
|
if (this.cfg.metaCoreUrl) return this.cfg.metaCoreUrl;
|
||||||
|
return this.current?.apiUrl ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Full URLs block. null when pinned and /urls has not been fetched yet. */
|
||||||
|
getUrls(): MeshUrls | null {
|
||||||
|
return this.current;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Block until meta-core is located. Probes immediately and re-probes every
|
||||||
|
* 500ms — the same loop shape as the old LeaderClient.waitForLeader, so the
|
||||||
|
* 30s boot timeout semantics are preserved exactly.
|
||||||
|
*/
|
||||||
|
async waitForCore(timeoutMs = 30_000): Promise<string> {
|
||||||
|
const deadline = Date.now() + timeoutMs;
|
||||||
|
let logged = false;
|
||||||
|
while (Date.now() < deadline) {
|
||||||
|
const url = this.getApiUrl();
|
||||||
|
if (url) return url;
|
||||||
|
if (!logged) { console.log('[meshdisco] Waiting for meta-core...'); logged = true; }
|
||||||
|
this.node.probe();
|
||||||
|
await new Promise((r) => setTimeout(r, 500));
|
||||||
|
}
|
||||||
|
throw new Error(`[meshdisco] No meta-core found within ${timeoutMs}ms`);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Fires when the elected core's apiUrl changes. Replaces the fs.watch. */
|
||||||
|
onChange(cb: () => void): void {
|
||||||
|
this.changeCallbacks.push(cb);
|
||||||
|
}
|
||||||
|
|
||||||
|
getNeighbors(): MeshNeighbor[] {
|
||||||
|
return this.node.getNeighborsByName();
|
||||||
|
}
|
||||||
|
|
||||||
|
self(): MeshNeighbor {
|
||||||
|
return this.node.self();
|
||||||
|
}
|
||||||
|
|
||||||
|
probe(): void {
|
||||||
|
this.node.probe();
|
||||||
|
}
|
||||||
|
|
||||||
|
private notifyChange(): void {
|
||||||
|
for (const cb of this.changeCallbacks) {
|
||||||
|
try { cb(); } catch (e) { console.error('[meshdisco] Change callback threw:', e); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,6 +11,7 @@ import 'dotenv/config';
|
|||||||
import { Logger } from 'tslog';
|
import { Logger } from 'tslog';
|
||||||
import { KVManager } from './kv/KVManager.js';
|
import { KVManager } from './kv/KVManager.js';
|
||||||
import { RedisClient, StreamMessage } from './kv/RedisClient.js';
|
import { RedisClient, StreamMessage } from './kv/RedisClient.js';
|
||||||
|
import { SSEEventClient, type SSEEvent } from './kv/SSEEventClient.js';
|
||||||
import { VirtualFileSystem } from './vfs/VirtualFileSystem.js';
|
import { VirtualFileSystem } from './vfs/VirtualFileSystem.js';
|
||||||
import { StreamingStateBuilder } from './vfs/StreamingStateBuilder.js';
|
import { StreamingStateBuilder } from './vfs/StreamingStateBuilder.js';
|
||||||
import { APIServer } from './api/APIServer.js';
|
import { APIServer } from './api/APIServer.js';
|
||||||
@@ -69,6 +70,9 @@ async function main(): Promise<void> {
|
|||||||
serviceName: 'meta-fuse',
|
serviceName: 'meta-fuse',
|
||||||
apiPort: config.apiPort,
|
apiPort: config.apiPort,
|
||||||
baseUrl: config.baseUrl,
|
baseUrl: config.baseUrl,
|
||||||
|
// Pin: when META_CORE_URL is set, UDP discovery never overrides it.
|
||||||
|
// See docs/project-architecture/service-discovery.md.
|
||||||
|
metaCoreUrl: process.env.META_CORE_URL,
|
||||||
redisPrefix: config.redisPrefix,
|
redisPrefix: config.redisPrefix,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -76,13 +80,16 @@ async function main(): Promise<void> {
|
|||||||
let vfs: VirtualFileSystem | null = null;
|
let vfs: VirtualFileSystem | null = null;
|
||||||
let stateBuilder: StreamingStateBuilder | null = null;
|
let stateBuilder: StreamingStateBuilder | null = null;
|
||||||
let apiServer: APIServer | null = null;
|
let apiServer: APIServer | null = null;
|
||||||
|
let sseClient: SSEEventClient | null = null;
|
||||||
|
|
||||||
// Graceful shutdown
|
// Graceful shutdown
|
||||||
const shutdown = async (signal: string): Promise<void> => {
|
const shutdown = async (signal: string): Promise<void> => {
|
||||||
logger.info(`Received ${signal}, shutting down...`);
|
logger.info(`Received ${signal}, shutting down...`);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Stop stream consumer first
|
// Stop SSE consumer first
|
||||||
|
if (sseClient) await sseClient.stop();
|
||||||
|
// Stop legacy stream consumer if it ever ran
|
||||||
if (redisClient) {
|
if (redisClient) {
|
||||||
redisClient.stopStreamConsumer();
|
redisClient.stopStreamConsumer();
|
||||||
}
|
}
|
||||||
@@ -155,35 +162,52 @@ async function main(): Promise<void> {
|
|||||||
// This enables vfs.refresh() to replay the event stream
|
// This enables vfs.refresh() to replay the event stream
|
||||||
vfs.setStreamingStateBuilder(stateBuilder);
|
vfs.setStreamingStateBuilder(stateBuilder);
|
||||||
|
|
||||||
// Bootstrap: Replay meta:events stream from position 0
|
// Bootstrap + live stream via SSE on /api/events/meta.
|
||||||
// This rebuilds state from all historical events
|
//
|
||||||
logger.info(`Replaying ${EVENTS_STREAM} stream from position 0 (streaming bootstrap)...`);
|
// We persist the cursor; on a clean restart we resume from where
|
||||||
const bootstrapStart = Date.now();
|
// we left off. On a `gap` event (cursor trimmed out of retention)
|
||||||
|
// we fall back to replaying from the oldest available entry,
|
||||||
const lastId = await redisClient.replayStream(
|
// which is good enough to rebuild VFS state because every property
|
||||||
EVENTS_STREAM,
|
// change has been republished into the stream by meta-core.
|
||||||
'0',
|
const apiUrl = leaderInfo?.apiUrl;
|
||||||
async (message: StreamMessage) => {
|
if (!apiUrl) {
|
||||||
|
throw new Error('meta-core apiUrl not available from leader info; cannot start SSE consumer');
|
||||||
|
}
|
||||||
|
logger.info(`Starting SSE consumer for /api/events/meta (apiUrl=${apiUrl})...`);
|
||||||
|
sseClient = new SSEEventClient({
|
||||||
|
url: `${apiUrl.replace(/\/+$/, '')}/api/events/meta`,
|
||||||
|
// Deliberately NOT persisting the cursor. meta-fuse holds
|
||||||
|
// VFS state purely in memory, so each restart needs to
|
||||||
|
// rebuild from a full event replay. Setting cursorPath to
|
||||||
|
// null + initialCursor to "0-0" forces the gap-handling
|
||||||
|
// path which resumes from the oldest available stream
|
||||||
|
// entry — i.e. effectively a full bootstrap.
|
||||||
|
cursorPath: null,
|
||||||
|
logTag: '[meta-fuse SSE]',
|
||||||
|
initialCursor: '0-0',
|
||||||
|
onEvent: async (e: SSEEvent) => {
|
||||||
|
// Translate SSE event back into the StreamMessage shape
|
||||||
|
// StreamingStateBuilder expects.
|
||||||
|
const message: StreamMessage = {
|
||||||
|
id: e.id,
|
||||||
|
type: e.event as any,
|
||||||
|
key: e.data?.key,
|
||||||
|
path: e.data?.path,
|
||||||
|
size: e.data?.size,
|
||||||
|
midhash256: e.data?.midhash256,
|
||||||
|
oldPath: e.data?.oldPath,
|
||||||
|
watcherId: e.data?.watcherId,
|
||||||
|
timestamp: e.data?.timestamp ?? e.data?.ts,
|
||||||
|
} as StreamMessage;
|
||||||
await handleStreamingEvent(message, stateBuilder!);
|
await handleStreamingEvent(message, stateBuilder!);
|
||||||
},
|
},
|
||||||
100 // Batch size
|
onGap: (payload) => {
|
||||||
);
|
logger.warn(`SSE cursor ${payload.requested} trimmed; resuming from ${payload.resumeFrom}`);
|
||||||
|
|
||||||
const bootstrapTime = Date.now() - bootstrapStart;
|
|
||||||
const stats = vfs.getStats();
|
|
||||||
logger.info(`Streaming bootstrap complete: ${stats.fileCount} files in ${bootstrapTime}ms`);
|
|
||||||
|
|
||||||
// Start live stream consumer from where replay left off
|
|
||||||
logger.info(`Starting live stream consumer from ${lastId}...`);
|
|
||||||
redisClient.startSimpleStreamConsumer(
|
|
||||||
EVENTS_STREAM,
|
|
||||||
lastId,
|
|
||||||
async (message: StreamMessage) => {
|
|
||||||
await handleStreamingEvent(message, stateBuilder!);
|
|
||||||
},
|
},
|
||||||
5000 // 5 second block timeout
|
});
|
||||||
).catch(error => {
|
// Fire-and-forget; start() returns when stop() fires.
|
||||||
logger.error('Stream consumer error:', error);
|
sseClient.start().catch((error) => {
|
||||||
|
logger.error('SSE consumer terminated:', error);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Initialize API server (with kvManager for service discovery)
|
// Initialize API server (with kvManager for service discovery)
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ export interface IKVClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Leader lock file content format (kv-leader.info)
|
* meta-core's identity and URL set (from its UDP announce, or /urls)
|
||||||
* Written by meta-core leader, read by other services
|
* Written by meta-core leader, read by other services
|
||||||
*/
|
*/
|
||||||
export interface LeaderLockInfo {
|
export interface LeaderLockInfo {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* KV Manager for meta-fuse (FOLLOWER-only)
|
* KV Manager for meta-fuse (FOLLOWER-only)
|
||||||
*
|
*
|
||||||
* Simplified KV manager that:
|
* Simplified KV manager that:
|
||||||
* 1. Discovers the leader via LeaderClient (reads kv-leader.info)
|
* 1. Locates meta-core via LeaderClient (UDP announce, meta-discovery v1)
|
||||||
* 2. Creates Redis client connection
|
* 2. Creates Redis client connection
|
||||||
* 3. Handles reconnection on leader failure
|
* 3. Handles reconnection on leader failure
|
||||||
*
|
*
|
||||||
@@ -13,7 +13,6 @@
|
|||||||
import { hostname } from 'os';
|
import { hostname } from 'os';
|
||||||
import { Logger } from 'tslog';
|
import { Logger } from 'tslog';
|
||||||
import { LeaderClient } from './LeaderClient.js';
|
import { LeaderClient } from './LeaderClient.js';
|
||||||
import { ServiceRegistration } from './ServiceRegistration.js';
|
|
||||||
import { RedisClient } from './RedisClient.js';
|
import { RedisClient } from './RedisClient.js';
|
||||||
import type { LeaderLockInfo } from './IKVClient.js';
|
import type { LeaderLockInfo } from './IKVClient.js';
|
||||||
|
|
||||||
@@ -48,7 +47,6 @@ interface KVManagerConfig {
|
|||||||
export class KVManager {
|
export class KVManager {
|
||||||
private config: Required<KVManagerConfig>;
|
private config: Required<KVManagerConfig>;
|
||||||
private leaderClient: LeaderClient | null = null;
|
private leaderClient: LeaderClient | null = null;
|
||||||
private serviceRegistration: ServiceRegistration | null = null;
|
|
||||||
private redisClient: RedisClient | null = null;
|
private redisClient: RedisClient | null = null;
|
||||||
private isStarted = false;
|
private isStarted = false;
|
||||||
private isShuttingDown = false;
|
private isShuttingDown = false;
|
||||||
@@ -80,14 +78,15 @@ export class KVManager {
|
|||||||
|
|
||||||
logger.info(`Starting KVManager for ${this.config.serviceName}...`);
|
logger.info(`Starting KVManager for ${this.config.serviceName}...`);
|
||||||
|
|
||||||
// Initialize and start service registration for heartbeat
|
// No separate service registration step any more: the LeaderClient's
|
||||||
const apiUrl = this.config.baseUrl || `http://${hostname()}:${this.config.apiPort}`;
|
// discovery node announces this service on the same UDP group it
|
||||||
this.serviceRegistration = new ServiceRegistration({
|
// listens on, so being discoverable and discovering are one thing.
|
||||||
metaCorePath: this.config.metaCorePath,
|
// Browser-facing URL for the nav menu, in the order the spec requires:
|
||||||
serviceName: this.config.serviceName,
|
// PUBLIC_URL (reachable when there is no Caddy perimeter in front — a
|
||||||
apiUrl
|
// debug-direct port) -> BASE_URL (the Caddy URL) -> container host.
|
||||||
});
|
// Announcing a Caddy URL on a stack with no Caddy running is what puts
|
||||||
await this.serviceRegistration.start();
|
// dead links in every neighbour's menu.
|
||||||
|
const apiUrl = process.env.PUBLIC_URL || this.config.baseUrl || `http://${hostname()}:${this.config.apiPort}`;
|
||||||
|
|
||||||
// If direct Redis URL provided, skip leader discovery
|
// If direct Redis URL provided, skip leader discovery
|
||||||
if (this.config.redisUrl) {
|
if (this.config.redisUrl) {
|
||||||
@@ -99,8 +98,9 @@ export class KVManager {
|
|||||||
|
|
||||||
// Use leader client
|
// Use leader client
|
||||||
this.leaderClient = new LeaderClient({
|
this.leaderClient = new LeaderClient({
|
||||||
metaCorePath: this.config.metaCorePath,
|
metaCoreUrl: this.config.metaCoreUrl || undefined,
|
||||||
metaCoreUrl: this.config.metaCoreUrl || undefined
|
serviceName: this.config.serviceName,
|
||||||
|
baseUrl: apiUrl,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Set up leader change callback
|
// Set up leader change callback
|
||||||
@@ -113,7 +113,7 @@ export class KVManager {
|
|||||||
try {
|
try {
|
||||||
const leaderInfo = await this.leaderClient.waitForLeader(30000);
|
const leaderInfo = await this.leaderClient.waitForLeader(30000);
|
||||||
logger.info(`Connecting to Redis at ${leaderInfo.redisUrl}...`);
|
logger.info(`Connecting to Redis at ${leaderInfo.redisUrl}...`);
|
||||||
await this.connectToRedis(leaderInfo.redisUrl);
|
await this.connectToRedis(leaderInfo.redisUrl, leaderInfo.apiUrl);
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
logger.error(`Failed to connect to leader: ${error.message}`);
|
logger.error(`Failed to connect to leader: ${error.message}`);
|
||||||
throw error;
|
throw error;
|
||||||
@@ -141,7 +141,7 @@ export class KVManager {
|
|||||||
try {
|
try {
|
||||||
const leaderInfo = await this.leaderClient.waitForLeader(30000);
|
const leaderInfo = await this.leaderClient.waitForLeader(30000);
|
||||||
logger.info(`Reconnecting to Redis at ${leaderInfo.redisUrl}...`);
|
logger.info(`Reconnecting to Redis at ${leaderInfo.redisUrl}...`);
|
||||||
await this.connectToRedis(leaderInfo.redisUrl);
|
await this.connectToRedis(leaderInfo.redisUrl, leaderInfo.apiUrl);
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
logger.error(`Failed to reconnect: ${error.message}`);
|
logger.error(`Failed to reconnect: ${error.message}`);
|
||||||
}
|
}
|
||||||
@@ -163,10 +163,6 @@ export class KVManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Stop service registration (if it was started)
|
// Stop service registration (if it was started)
|
||||||
if (this.serviceRegistration) {
|
|
||||||
await this.serviceRegistration.stop();
|
|
||||||
this.serviceRegistration = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Disconnect Redis
|
// Disconnect Redis
|
||||||
await this.disconnectRedis();
|
await this.disconnectRedis();
|
||||||
@@ -178,20 +174,28 @@ export class KVManager {
|
|||||||
/**
|
/**
|
||||||
* Connect to Redis
|
* Connect to Redis
|
||||||
*/
|
*/
|
||||||
private async connectToRedis(url: string): Promise<void> {
|
private async connectToRedis(url: string, apiUrl?: string): Promise<void> {
|
||||||
try {
|
try {
|
||||||
// Disconnect existing client if any
|
// Disconnect existing client if any
|
||||||
await this.disconnectRedis();
|
await this.disconnectRedis();
|
||||||
|
|
||||||
// Create new client
|
// Create new client. When apiUrl is supplied, reads route
|
||||||
|
// through meta-core HTTP (api-mediated-access PR C).
|
||||||
|
// When url is also empty, the client is HTTP-only and never
|
||||||
|
// opens a Redis socket (post-PR D state).
|
||||||
this.redisClient = new RedisClient({
|
this.redisClient = new RedisClient({
|
||||||
url,
|
url, // may be '' in PR D world
|
||||||
prefix: this.config.redisPrefix,
|
prefix: this.config.redisPrefix,
|
||||||
filesVolume: this.config.filesPath
|
filesVolume: this.config.filesPath,
|
||||||
|
metaCoreApiUrl: apiUrl,
|
||||||
});
|
});
|
||||||
|
|
||||||
await this.redisClient.connect();
|
await this.redisClient.connect();
|
||||||
|
if (url) {
|
||||||
logger.info('Connected to Redis');
|
logger.info('Connected to Redis');
|
||||||
|
} else {
|
||||||
|
logger.info('Storage client ready (HTTP-only mode, no Redis)');
|
||||||
|
}
|
||||||
|
|
||||||
// Notify ready
|
// Notify ready
|
||||||
this.notifyReady();
|
this.notifyReady();
|
||||||
@@ -343,9 +347,6 @@ export class KVManager {
|
|||||||
/**
|
/**
|
||||||
* Get service registration instance
|
* Get service registration instance
|
||||||
*/
|
*/
|
||||||
getServiceRegistration(): ServiceRegistration | null {
|
|
||||||
return this.serviceRegistration;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get configured paths
|
* Get configured paths
|
||||||
|
|||||||
@@ -1,29 +1,48 @@
|
|||||||
/**
|
/**
|
||||||
* LeaderClient - Client for reading leader info from meta-core
|
* LeaderClient - locates meta-core and exposes its URLs.
|
||||||
*
|
*
|
||||||
* This replaces the old LeaderDiscovery.ts by delegating leader election
|
* Since meta-discovery v1 this is a thin adapter over MetaCoreLocator
|
||||||
* to meta-core (Go sidecar) and just reading the results.
|
* (../discovery/meshdisco.js): meta-core is found by UDP announce instead of by
|
||||||
|
* reading /meta-core/locks/kv-leader.info, which means this service no longer
|
||||||
|
* needs the /meta-core volume mounted at all.
|
||||||
*
|
*
|
||||||
* Features:
|
* The public surface is deliberately unchanged so KVManager and its callers did
|
||||||
* - Reads kv-leader.info file for leader URLs
|
* not have to move: getLeaderInfo / getUrls / getApiUrl / getWebdavUrl*,
|
||||||
* - Calls meta-core /urls API for current leader URLs
|
* waitForLeader (same 30s default), startWatching / onChange (the fs.watch on
|
||||||
* - Watches for leader changes via file system watcher
|
* the lock dir became "an announce arrived carrying a different apiUrl").
|
||||||
|
*
|
||||||
|
* Precedence is the pin: when metaCoreUrl (META_CORE_URL) is set it always
|
||||||
|
* wins and the wire is never consulted for core selection. See
|
||||||
|
* docs/project-architecture/service-discovery.md.
|
||||||
|
*
|
||||||
|
* The name "leader" is legacy: meta-core's flock election is vestigial, and
|
||||||
|
* redisUrl has been empty since the api-mediated-access lockdown.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { promises as fs } from 'fs';
|
|
||||||
import { watch, FSWatcher } from 'fs';
|
|
||||||
import { dirname } from 'path';
|
|
||||||
import { Logger } from 'tslog';
|
import { Logger } from 'tslog';
|
||||||
|
import { MetaCoreLocator, type MeshNeighbor } from '../discovery/meshdisco.js';
|
||||||
import type { LeaderLockInfo } from './IKVClient.js';
|
import type { LeaderLockInfo } from './IKVClient.js';
|
||||||
|
|
||||||
const logger = new Logger({ name: 'LeaderClient' });
|
const logger = new Logger({ name: 'LeaderClient' });
|
||||||
|
|
||||||
export interface LeaderClientConfig {
|
export interface LeaderClientConfig {
|
||||||
/** Path to META_CORE_VOLUME (e.g., /meta-core) */
|
/**
|
||||||
metaCorePath: string;
|
* @deprecated Unused since meta-discovery v1. Kept so existing callers
|
||||||
|
* compile unchanged; nothing reads the volume any more.
|
||||||
|
*/
|
||||||
|
metaCorePath?: string;
|
||||||
|
|
||||||
/** meta-core API URL (e.g., http://meta-core:9000 or http://localhost:9000) */
|
/** meta-core API URL. When set, discovery never overrides it. */
|
||||||
metaCoreUrl?: string;
|
metaCoreUrl?: string;
|
||||||
|
|
||||||
|
/** This service's name, used for its own announce. */
|
||||||
|
serviceName?: string;
|
||||||
|
|
||||||
|
/** Browser-facing URL announced for the nav menu. */
|
||||||
|
baseUrl?: string;
|
||||||
|
|
||||||
|
/** Service version, display only. */
|
||||||
|
version?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface URLsResponse {
|
export interface URLsResponse {
|
||||||
@@ -38,57 +57,75 @@ export interface URLsResponse {
|
|||||||
|
|
||||||
export class LeaderClient {
|
export class LeaderClient {
|
||||||
private config: LeaderClientConfig;
|
private config: LeaderClientConfig;
|
||||||
private infoFilePath: string;
|
private locator: MetaCoreLocator;
|
||||||
private leaderInfo: LeaderLockInfo | null = null;
|
private leaderInfo: LeaderLockInfo | null = null;
|
||||||
private watcher: FSWatcher | null = null;
|
|
||||||
private onChangeCallbacks: (() => void)[] = [];
|
private onChangeCallbacks: (() => void)[] = [];
|
||||||
|
private started = false;
|
||||||
|
|
||||||
// URL caching
|
// Only used on the pinned path, where URLs still come from GET /urls.
|
||||||
|
// A discovered core carries them in the announce itself.
|
||||||
private cachedUrls: URLsResponse | null = null;
|
private cachedUrls: URLsResponse | null = null;
|
||||||
private urlsCacheTime: number = 0;
|
private urlsCacheTime: number = 0;
|
||||||
private readonly urlsCacheTTL: number = 5000; // 5 seconds
|
private readonly urlsCacheTTL: number = 5000;
|
||||||
|
|
||||||
constructor(config: LeaderClientConfig) {
|
constructor(config: LeaderClientConfig) {
|
||||||
this.config = config;
|
this.config = config;
|
||||||
this.infoFilePath = `${config.metaCorePath}/locks/kv-leader.info`;
|
this.locator = new MetaCoreLocator({
|
||||||
|
serviceName: config.serviceName ?? 'meta-fuse',
|
||||||
|
baseUrl: config.baseUrl,
|
||||||
|
version: config.version,
|
||||||
|
metaCoreUrl: config.metaCoreUrl,
|
||||||
|
enabled: process.env.ENABLE_UDP_DISCOVERY !== 'false' &&
|
||||||
|
process.env.ENABLE_UDP_DISCOVERY !== '0',
|
||||||
|
});
|
||||||
|
this.locator.onChange(() => {
|
||||||
|
this.cachedUrls = null;
|
||||||
|
this.urlsCacheTime = 0;
|
||||||
|
this.notifyChange();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private async ensureStarted(): Promise<void> {
|
||||||
|
if (this.started) return;
|
||||||
|
this.started = true;
|
||||||
|
await this.locator.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read API URL from file (plain text format)
|
* Guard against a rollback reintroducing direct Redis exposure.
|
||||||
|
* api-mediated-access PR D removed redisUrl; ALLOW_LEGACY_REDIS_URL=1
|
||||||
|
* downgrades this to a warning during a deliberate temporary rollback.
|
||||||
*/
|
*/
|
||||||
private async getApiUrlFromFile(): Promise<string | null> {
|
private assertNoRedisUrl(redisUrl: string | undefined): void {
|
||||||
try {
|
if (!redisUrl) return;
|
||||||
const content = await fs.readFile(this.infoFilePath, 'utf-8');
|
const msg =
|
||||||
return content.trim() || null;
|
'meta-core still publishes redisUrl; direct Redis access was retired ' +
|
||||||
} catch (error: any) {
|
'by the api-mediated-access lockdown. Verify meta-core version.';
|
||||||
logger.error(`Failed to read API URL from file: ${error.message}`);
|
if (process.env.ALLOW_LEGACY_REDIS_URL === '1') {
|
||||||
return null;
|
logger.warn('WARNING: ' + msg);
|
||||||
|
} else {
|
||||||
|
throw new Error(msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetch URLs from meta-core /urls API with caching
|
|
||||||
*/
|
|
||||||
private async fetchUrls(apiUrl: string): Promise<URLsResponse | null> {
|
private async fetchUrls(apiUrl: string): Promise<URLsResponse | null> {
|
||||||
// Check cache
|
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
if (this.cachedUrls && (now - this.urlsCacheTime) < this.urlsCacheTTL) {
|
if (this.cachedUrls && (now - this.urlsCacheTime) < this.urlsCacheTTL) {
|
||||||
return this.cachedUrls;
|
return this.cachedUrls;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(`${apiUrl}/urls`, {
|
const response = await fetch(`${apiUrl}/urls`, {
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
headers: { 'Accept': 'application/json' },
|
headers: { 'Accept': 'application/json' },
|
||||||
signal: AbortSignal.timeout(5000)
|
signal: AbortSignal.timeout(5000)
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
logger.error(`Failed to fetch URLs: ${response.status} ${response.statusText}`);
|
logger.error(`Failed to fetch URLs: ${response.status} ${response.statusText}`);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
const parsed = await response.json() as URLsResponse;
|
||||||
this.cachedUrls = await response.json() as URLsResponse;
|
this.assertNoRedisUrl(parsed.redisUrl);
|
||||||
|
this.cachedUrls = parsed;
|
||||||
this.urlsCacheTime = now;
|
this.urlsCacheTime = now;
|
||||||
return this.cachedUrls;
|
return this.cachedUrls;
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
@@ -98,23 +135,37 @@ export class LeaderClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read leader info from file and /urls API
|
* Resolve meta-core's URLs — straight from the announce when discovered
|
||||||
|
* (no HTTP hop needed), or over HTTP when pinned.
|
||||||
*/
|
*/
|
||||||
|
async getUrls(): Promise<URLsResponse | null> {
|
||||||
|
await this.ensureStarted();
|
||||||
|
|
||||||
|
const wire = this.locator.getUrls();
|
||||||
|
if (wire && !this.config.metaCoreUrl) {
|
||||||
|
return {
|
||||||
|
hostname: wire.hostname,
|
||||||
|
baseUrl: wire.baseUrl,
|
||||||
|
apiUrl: wire.apiUrl,
|
||||||
|
redisUrl: '',
|
||||||
|
webdavUrl: wire.webdavUrl,
|
||||||
|
webdavUrlInternal: wire.webdavUrlInternal,
|
||||||
|
isLeader: true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const apiUrl = this.locator.getApiUrl();
|
||||||
|
if (!apiUrl) {
|
||||||
|
logger.error('No meta-core API URL available');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return this.fetchUrls(apiUrl);
|
||||||
|
}
|
||||||
|
|
||||||
async getLeaderInfo(): Promise<LeaderLockInfo | null> {
|
async getLeaderInfo(): Promise<LeaderLockInfo | null> {
|
||||||
try {
|
try {
|
||||||
// Read API URL from file (plain text)
|
const urls = await this.getUrls();
|
||||||
const apiUrl = await this.getApiUrlFromFile();
|
if (!urls) return null;
|
||||||
if (!apiUrl) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fetch full info from /urls API
|
|
||||||
const urls = await this.fetchUrls(apiUrl);
|
|
||||||
if (!urls) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert URLsResponse to LeaderLockInfo
|
|
||||||
this.leaderInfo = {
|
this.leaderInfo = {
|
||||||
hostname: urls.hostname,
|
hostname: urls.hostname,
|
||||||
baseUrl: urls.baseUrl,
|
baseUrl: urls.baseUrl,
|
||||||
@@ -123,7 +174,7 @@ export class LeaderClient {
|
|||||||
webdavUrl: urls.webdavUrl,
|
webdavUrl: urls.webdavUrl,
|
||||||
webdavUrlInternal: urls.webdavUrlInternal,
|
webdavUrlInternal: urls.webdavUrlInternal,
|
||||||
timestamp: Date.now(),
|
timestamp: Date.now(),
|
||||||
pid: 0 // Unknown for remote leader
|
pid: 0
|
||||||
};
|
};
|
||||||
return this.leaderInfo;
|
return this.leaderInfo;
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
@@ -132,138 +183,64 @@ export class LeaderClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get Redis URL from leader info
|
|
||||||
*/
|
|
||||||
async getRedisUrl(): Promise<string | null> {
|
async getRedisUrl(): Promise<string | null> {
|
||||||
const info = await this.getLeaderInfo();
|
return (await this.getLeaderInfo())?.redisUrl ?? null;
|
||||||
return info?.redisUrl ?? null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get WebDAV URL from leader info (external, via nginx/HTTPS)
|
|
||||||
*/
|
|
||||||
async getWebdavUrl(): Promise<string | null> {
|
async getWebdavUrl(): Promise<string | null> {
|
||||||
const info = await this.getLeaderInfo();
|
return (await this.getLeaderInfo())?.webdavUrl ?? null;
|
||||||
return info?.webdavUrl ?? null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** Internal WebDAV URL — use for container-to-container access. */
|
||||||
* Get internal WebDAV URL from leader info (direct to port 9000)
|
|
||||||
* Use this for container-to-container communication
|
|
||||||
*/
|
|
||||||
async getWebdavUrlInternal(): Promise<string | null> {
|
async getWebdavUrlInternal(): Promise<string | null> {
|
||||||
const info = await this.getLeaderInfo();
|
return (await this.getLeaderInfo())?.webdavUrlInternal ?? null;
|
||||||
return info?.webdavUrlInternal ?? null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get meta-core API URL from leader info
|
|
||||||
*/
|
|
||||||
async getApiUrl(): Promise<string | null> {
|
async getApiUrl(): Promise<string | null> {
|
||||||
const info = await this.getLeaderInfo();
|
return (await this.getLeaderInfo())?.apiUrl ?? null;
|
||||||
return info?.apiUrl ?? null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Call meta-core /urls API to get current URLs
|
* Block until meta-core is reachable. Probes immediately then every 500ms,
|
||||||
* Useful for getting URLs when you don't want to read the file directly
|
* matching the previous file-polling loop's timing exactly.
|
||||||
*/
|
|
||||||
async getUrls(): Promise<URLsResponse | null> {
|
|
||||||
// First try using configured metaCoreUrl
|
|
||||||
let apiUrl: string | null = this.config.metaCoreUrl ?? null;
|
|
||||||
|
|
||||||
// Fall back to reading from file
|
|
||||||
if (!apiUrl) {
|
|
||||||
apiUrl = await this.getApiUrlFromFile();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!apiUrl) {
|
|
||||||
logger.error('No meta-core API URL available');
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.fetchUrls(apiUrl);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wait for leader info to be available
|
|
||||||
*/
|
*/
|
||||||
async waitForLeader(timeoutMs: number = 30000): Promise<LeaderLockInfo> {
|
async waitForLeader(timeoutMs: number = 30000): Promise<LeaderLockInfo> {
|
||||||
const startTime = Date.now();
|
await this.ensureStarted();
|
||||||
const pollInterval = 500;
|
const deadline = Date.now() + timeoutMs;
|
||||||
|
|
||||||
while (Date.now() - startTime < timeoutMs) {
|
await this.locator.waitForCore(timeoutMs);
|
||||||
|
|
||||||
|
while (Date.now() < deadline) {
|
||||||
const info = await this.getLeaderInfo();
|
const info = await this.getLeaderInfo();
|
||||||
if (info) {
|
if (info) {
|
||||||
logger.info(`Leader found: ${info.hostname} at ${info.redisUrl}`);
|
logger.info(`meta-core found: ${info.hostname} at ${info.apiUrl}`);
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
logger.debug('Waiting for meta-core...');
|
||||||
logger.debug('Waiting for leader...');
|
await new Promise(resolve => setTimeout(resolve, 500));
|
||||||
await new Promise(resolve => setTimeout(resolve, pollInterval));
|
|
||||||
}
|
}
|
||||||
|
throw new Error(`No meta-core found within ${timeoutMs}ms`);
|
||||||
throw new Error(`No leader found within ${timeoutMs}ms`);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Start watching for leader changes
|
* Previously an fs.watch on the lock directory. Discovery is always
|
||||||
|
* listening, so this only has to make sure the node is running.
|
||||||
*/
|
*/
|
||||||
startWatching(): void {
|
startWatching(): void {
|
||||||
if (this.watcher) {
|
void this.ensureStarted();
|
||||||
return; // Already watching
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const lockDir = dirname(this.infoFilePath);
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.watcher = watch(lockDir, (eventType, filename) => {
|
|
||||||
if (filename === 'kv-leader.info') {
|
|
||||||
logger.debug(`Lock file ${eventType}, invalidating cache...`);
|
|
||||||
// Invalidate cache to force fresh API call
|
|
||||||
this.cachedUrls = null;
|
|
||||||
this.urlsCacheTime = 0;
|
|
||||||
|
|
||||||
this.getLeaderInfo().then(() => {
|
|
||||||
this.notifyChange();
|
|
||||||
}).catch((err) => logger.error(`Error reloading leader info: ${err.message}`));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
this.watcher.on('error', (error: any) => {
|
|
||||||
logger.warn(`File watcher error: ${error.message}`);
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.info(`Watching for leader changes in ${lockDir}`);
|
|
||||||
} catch (error: any) {
|
|
||||||
logger.error(`Failed to start watching: ${error.message}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stop watching for leader changes
|
|
||||||
*/
|
|
||||||
stopWatching(): void {
|
stopWatching(): void {
|
||||||
if (this.watcher) {
|
// No-op: the locator keeps listening until close().
|
||||||
this.watcher.close();
|
|
||||||
this.watcher = null;
|
|
||||||
logger.debug('Stopped watching for leader changes');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Register callback for leader changes
|
|
||||||
*/
|
|
||||||
onChange(callback: () => void): this {
|
onChange(callback: () => void): this {
|
||||||
this.onChangeCallbacks.push(callback);
|
this.onChangeCallbacks.push(callback);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Notify all change callbacks
|
|
||||||
*/
|
|
||||||
private notifyChange(): void {
|
private notifyChange(): void {
|
||||||
|
logger.debug('meta-core changed, invalidating cache...');
|
||||||
for (const callback of this.onChangeCallbacks) {
|
for (const callback of this.onChangeCallbacks) {
|
||||||
try {
|
try {
|
||||||
callback();
|
callback();
|
||||||
@@ -273,18 +250,23 @@ export class LeaderClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get cached leader info (without re-reading file)
|
|
||||||
*/
|
|
||||||
getCachedLeaderInfo(): LeaderLockInfo | null {
|
getCachedLeaderInfo(): LeaderLockInfo | null {
|
||||||
return this.leaderInfo;
|
return this.leaderInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** Neighbours for the nav menu (one row per service name). */
|
||||||
* Clean up resources
|
getNeighbors(): MeshNeighbor[] {
|
||||||
*/
|
return this.locator.getNeighbors();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** This service's own announce, so the menu can show itself. */
|
||||||
|
self(): MeshNeighbor {
|
||||||
|
return this.locator.self();
|
||||||
|
}
|
||||||
|
|
||||||
close(): void {
|
close(): void {
|
||||||
this.stopWatching();
|
|
||||||
this.onChangeCallbacks = [];
|
this.onChangeCallbacks = [];
|
||||||
|
void this.locator.stop();
|
||||||
|
this.started = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,121 @@
|
|||||||
|
/**
|
||||||
|
* MetaCoreApiClient — HTTP read client against meta-core for meta-fuse.
|
||||||
|
*
|
||||||
|
* meta-fuse needs to read file metadata (property GETs, full-record fetch,
|
||||||
|
* hashId enumeration) as it builds the VFS. After the api-mediated-access
|
||||||
|
* lockdown lands these go through meta-core's /meta/{hash} family instead
|
||||||
|
* of direct Redis reads.
|
||||||
|
*
|
||||||
|
* Only the methods meta-fuse actually calls are implemented. See
|
||||||
|
* meta-core docs/api-mediated-access.md for the full surface.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export interface MetaCoreApiClientConfig {
|
||||||
|
apiUrl: string;
|
||||||
|
timeoutMs?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class MetaCoreApiClient {
|
||||||
|
private apiUrl: string;
|
||||||
|
private timeoutMs: number;
|
||||||
|
|
||||||
|
constructor(config: MetaCoreApiClientConfig) {
|
||||||
|
this.apiUrl = config.apiUrl.replace(/\/+$/, '');
|
||||||
|
this.timeoutMs = config.timeoutMs ?? 30000;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /meta/{hash}/{prop}. Returns the raw string value or null on 404.
|
||||||
|
* meta-core sends text/plain for property reads.
|
||||||
|
*/
|
||||||
|
async getProperty(hashId: string, property: string): Promise<string | null> {
|
||||||
|
const path = `/meta/${encodeURIComponent(hashId)}/${this.encodePropertyPath(property)}`;
|
||||||
|
const url = `${this.apiUrl}${path}`;
|
||||||
|
const response = await fetch(url, {
|
||||||
|
method: 'GET',
|
||||||
|
signal: AbortSignal.timeout(this.timeoutMs),
|
||||||
|
headers: { Accept: 'text/plain' },
|
||||||
|
});
|
||||||
|
if (response.status === 404) return null;
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`[MetaCoreApiClient] GET ${path} → ${response.status} ${response.statusText}`);
|
||||||
|
}
|
||||||
|
const text = await response.text();
|
||||||
|
return text === '' ? null : text;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /meta/{hash}. Returns the flat property map or null on 404.
|
||||||
|
*/
|
||||||
|
async getMetadataFlat(hashId: string): Promise<Record<string, string> | null> {
|
||||||
|
const path = `/meta/${encodeURIComponent(hashId)}`;
|
||||||
|
const body = await this.fetchJsonAllowing404('GET', path);
|
||||||
|
if (body === null) return null;
|
||||||
|
const flat = (body as any)?.metadata;
|
||||||
|
if (!flat || typeof flat !== 'object') return null;
|
||||||
|
return flat as Record<string, string>;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /meta. Enumerates every known hashId.
|
||||||
|
*/
|
||||||
|
async getAllHashIds(): Promise<string[]> {
|
||||||
|
const body = await this.fetchJson('GET', '/meta');
|
||||||
|
const ids = (body as any)?.hashIds;
|
||||||
|
return Array.isArray(ids) ? ids : [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /health on meta-core. Used as the connectivity probe.
|
||||||
|
*/
|
||||||
|
async health(): Promise<boolean> {
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${this.apiUrl}/health`, {
|
||||||
|
method: 'GET',
|
||||||
|
signal: AbortSignal.timeout(Math.min(this.timeoutMs, 5000)),
|
||||||
|
headers: { Accept: 'application/json' },
|
||||||
|
});
|
||||||
|
return response.ok;
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private encodePropertyPath(property: string): string {
|
||||||
|
return property
|
||||||
|
.split('/')
|
||||||
|
.map(segment => encodeURIComponent(segment))
|
||||||
|
.join('/');
|
||||||
|
}
|
||||||
|
|
||||||
|
private async fetchJson(method: string, path: string): Promise<unknown> {
|
||||||
|
const url = `${this.apiUrl}${path}`;
|
||||||
|
const response = await fetch(url, {
|
||||||
|
method,
|
||||||
|
signal: AbortSignal.timeout(this.timeoutMs),
|
||||||
|
headers: { Accept: 'application/json' },
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`[MetaCoreApiClient] ${method} ${path} → ${response.status} ${response.statusText}`);
|
||||||
|
}
|
||||||
|
const text = await response.text();
|
||||||
|
if (!text) return null;
|
||||||
|
try { return JSON.parse(text); } catch { return text; }
|
||||||
|
}
|
||||||
|
|
||||||
|
private async fetchJsonAllowing404(method: string, path: string): Promise<unknown> {
|
||||||
|
const url = `${this.apiUrl}${path}`;
|
||||||
|
const response = await fetch(url, {
|
||||||
|
method,
|
||||||
|
signal: AbortSignal.timeout(this.timeoutMs),
|
||||||
|
headers: { Accept: 'application/json' },
|
||||||
|
});
|
||||||
|
if (response.status === 404) return null;
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`[MetaCoreApiClient] ${method} ${path} → ${response.status} ${response.statusText}`);
|
||||||
|
}
|
||||||
|
const text = await response.text();
|
||||||
|
if (!text) return null;
|
||||||
|
try { return JSON.parse(text); } catch { return text; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,6 +12,7 @@ import { Redis } from 'ioredis';
|
|||||||
import { Logger } from 'tslog';
|
import { Logger } from 'tslog';
|
||||||
import * as os from 'os';
|
import * as os from 'os';
|
||||||
import type { IKVClient, KeyValuePair } from './IKVClient.js';
|
import type { IKVClient, KeyValuePair } from './IKVClient.js';
|
||||||
|
import { MetaCoreApiClient } from './MetaCoreApiClient.js';
|
||||||
|
|
||||||
const logger = new Logger({ name: 'RedisClient' });
|
const logger = new Logger({ name: 'RedisClient' });
|
||||||
|
|
||||||
@@ -74,7 +75,6 @@ export interface FileMetadata {
|
|||||||
|
|
||||||
// Title information (for folder organization)
|
// Title information (for folder organization)
|
||||||
title?: string;
|
title?: string;
|
||||||
titles?: { eng?: string; [key: string]: string | undefined };
|
|
||||||
originalTitle?: string;
|
originalTitle?: string;
|
||||||
fileName?: string;
|
fileName?: string;
|
||||||
|
|
||||||
@@ -104,15 +104,27 @@ export interface RedisClientConfig {
|
|||||||
prefix?: string;
|
prefix?: string;
|
||||||
filesVolume?: string;
|
filesVolume?: string;
|
||||||
reconnectInterval?: number;
|
reconnectInterval?: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta-core HTTP API base URL. When set, read methods (getProperty,
|
||||||
|
* getProperties, getMetadataFlat, getAllHashIds, health) route through
|
||||||
|
* the /meta/{hash} HTTP family instead of touching Redis directly.
|
||||||
|
*
|
||||||
|
* This is the meta-fuse half of the api-mediated-access lockdown (see
|
||||||
|
* meta-core docs/api-mediated-access.md). Reads stay on Redis when
|
||||||
|
* left unset so tests / one-off scripts still work.
|
||||||
|
*/
|
||||||
|
metaCoreApiUrl?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class RedisClient implements Partial<IKVClient> {
|
export class RedisClient implements Partial<IKVClient> {
|
||||||
private client: Redis | null = null;
|
private client: Redis | null = null;
|
||||||
private subscriber: Redis | null = null;
|
private subscriber: Redis | null = null;
|
||||||
private config: Required<RedisClientConfig>;
|
private config: Required<Omit<RedisClientConfig, 'metaCoreApiUrl'>> & Pick<RedisClientConfig, 'metaCoreApiUrl'>;
|
||||||
private isConnected = false;
|
private isConnected = false;
|
||||||
private reconnectTimer: NodeJS.Timeout | null = null;
|
private reconnectTimer: NodeJS.Timeout | null = null;
|
||||||
private subscriptions: Map<string, (message: string) => void> = new Map();
|
private subscriptions: Map<string, (message: string) => void> = new Map();
|
||||||
|
private apiClient: MetaCoreApiClient | null = null;
|
||||||
|
|
||||||
// Stream consumer state
|
// Stream consumer state
|
||||||
private streamConsumerRunning = false;
|
private streamConsumerRunning = false;
|
||||||
@@ -125,20 +137,33 @@ export class RedisClient implements Partial<IKVClient> {
|
|||||||
prefix: config.prefix ?? process.env.REDIS_PREFIX ?? '',
|
prefix: config.prefix ?? process.env.REDIS_PREFIX ?? '',
|
||||||
filesVolume: config.filesVolume ?? process.env.FILES_VOLUME ?? '/files',
|
filesVolume: config.filesVolume ?? process.env.FILES_VOLUME ?? '/files',
|
||||||
reconnectInterval: config.reconnectInterval ?? 5000,
|
reconnectInterval: config.reconnectInterval ?? 5000,
|
||||||
|
metaCoreApiUrl: config.metaCoreApiUrl,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (this.config.metaCoreApiUrl) {
|
||||||
|
this.apiClient = new MetaCoreApiClient({ apiUrl: this.config.metaCoreApiUrl });
|
||||||
|
logger.info(`Reads routed through meta-core API at ${this.config.metaCoreApiUrl}`);
|
||||||
|
}
|
||||||
|
|
||||||
// Unique consumer name for this instance
|
// Unique consumer name for this instance
|
||||||
this.consumerName = `${os.hostname()}-${process.pid}`;
|
this.consumerName = `${os.hostname()}-${process.pid}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Connect to Redis
|
* Connect to Redis. In HTTP-only mode (no URL + apiClient set) this is
|
||||||
|
* a no-op — reads route through MetaCoreApiClient and stream
|
||||||
|
* consumption is owned by SSEEventClient at the index.ts layer.
|
||||||
*/
|
*/
|
||||||
async connect(): Promise<void> {
|
async connect(): Promise<void> {
|
||||||
if (this.client && this.isConnected) {
|
if (this.client && this.isConnected) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.apiClient && !this.config.url) {
|
||||||
|
logger.info('HTTP-only mode — no direct Redis connection');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
this.client = new Redis(this.config.url, {
|
this.client = new Redis(this.config.url, {
|
||||||
retryStrategy: (times: number) => {
|
retryStrategy: (times: number) => {
|
||||||
@@ -236,9 +261,18 @@ export class RedisClient implements Partial<IKVClient> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if connected
|
* Check if the metadata backend is reachable.
|
||||||
|
*
|
||||||
|
* In HTTP-only mode (api-mediated-access PR D) there's no Redis socket;
|
||||||
|
* reachability is signalled by having an apiClient configured. The
|
||||||
|
* health badge is keyed off this; reporting `false` there would make
|
||||||
|
* the UI permanently show "Disconnected" even though the service is
|
||||||
|
* working fine over HTTP.
|
||||||
*/
|
*/
|
||||||
get connected(): boolean {
|
get connected(): boolean {
|
||||||
|
if (this.apiClient && !this.config.url) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
return this.isConnected;
|
return this.isConnected;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -255,6 +289,15 @@ export class RedisClient implements Partial<IKVClient> {
|
|||||||
* @returns The property value or null if not found
|
* @returns The property value or null if not found
|
||||||
*/
|
*/
|
||||||
async getProperty(hashId: string, property: string): Promise<string | null> {
|
async getProperty(hashId: string, property: string): Promise<string | null> {
|
||||||
|
if (this.apiClient) {
|
||||||
|
try {
|
||||||
|
return await this.apiClient.getProperty(hashId, property);
|
||||||
|
} catch (error: any) {
|
||||||
|
logger.error(`HTTP getProperty failed for ${hashId}/${property}:`, error.message);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!this.client || !this.isConnected) {
|
if (!this.client || !this.isConnected) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -579,12 +622,6 @@ export class RedisClient implements Partial<IKVClient> {
|
|||||||
mtime = isNaN(parsed) ? parseFloat(data.mtime) : parsed;
|
mtime = isNaN(parsed) ? parseFloat(data.mtime) : parsed;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse titles - can be nested object or simple string
|
|
||||||
let titles: { eng?: string; [key: string]: string | undefined } | undefined;
|
|
||||||
if (data['titles/eng']) {
|
|
||||||
titles = { eng: data['titles/eng'] };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse season/episode (can be 0 for specials)
|
// Parse season/episode (can be 0 for specials)
|
||||||
const season = data.season !== undefined ? parseInt(data.season, 10) : undefined;
|
const season = data.season !== undefined ? parseInt(data.season, 10) : undefined;
|
||||||
const episode = data.episode !== undefined ? parseInt(data.episode, 10) : undefined;
|
const episode = data.episode !== undefined ? parseInt(data.episode, 10) : undefined;
|
||||||
@@ -603,12 +640,19 @@ export class RedisClient implements Partial<IKVClient> {
|
|||||||
mtime,
|
mtime,
|
||||||
ctime: data.ctime ? parseFloat(data.ctime) : mtime,
|
ctime: data.ctime ? parseFloat(data.ctime) : mtime,
|
||||||
|
|
||||||
// Identification
|
// Identification.
|
||||||
hashId: hashId ?? data.cid_midhash256 ?? data.hashId,
|
//
|
||||||
|
// `hashId` is always supplied by the caller — every `parseMetadata`
|
||||||
|
// call site derives it from the Redis key (`file:<hashId>/…`), so the
|
||||||
|
// fallbacks below it were already unreachable. The two that used to sit
|
||||||
|
// here (`data.cid_midhash256`, then `data.hashId`) were also the wrong
|
||||||
|
// shape: `cid_*` fields no longer exist on records, and meta-core
|
||||||
|
// rejects them at the write boundary. Kept as a single defensive `??`
|
||||||
|
// rather than a chain of dead ones. See METADATA_KEYS.md §14.13.
|
||||||
|
hashId: hashId ?? data.hashId,
|
||||||
|
|
||||||
// Title information
|
// Title information
|
||||||
title: data.title,
|
title: data.title,
|
||||||
titles,
|
|
||||||
originalTitle: data.originalTitle,
|
originalTitle: data.originalTitle,
|
||||||
fileName: data.fileName,
|
fileName: data.fileName,
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,229 @@
|
|||||||
|
/**
|
||||||
|
* SSEEventClient — HTTP Server-Sent Events client for meta-core event streams.
|
||||||
|
*
|
||||||
|
* Replaces direct Redis Streams consumption. See the same-named module in
|
||||||
|
* meta-sort for the design rationale (meta-core docs/api-mediated-access.md).
|
||||||
|
*/
|
||||||
|
import { promises as fs } from 'fs';
|
||||||
|
import { dirname } from 'path';
|
||||||
|
|
||||||
|
export interface SSEEvent {
|
||||||
|
id: string;
|
||||||
|
event: string;
|
||||||
|
data: any;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SSEClientOptions {
|
||||||
|
url: string;
|
||||||
|
cursorPath: string | null;
|
||||||
|
onEvent: (e: SSEEvent) => Promise<void> | void;
|
||||||
|
onGap?: (payload: { requested: string; resumeFrom: string; reason: string }) => Promise<void> | void;
|
||||||
|
logTag?: string;
|
||||||
|
reconnectBaseMs?: number;
|
||||||
|
reconnectMaxMs?: number;
|
||||||
|
flushIntervalMs?: number;
|
||||||
|
/** When set, sent as Last-Event-ID on the *first* connect (e.g. to
|
||||||
|
* force replay from a specific point). After the first event the
|
||||||
|
* persisted cursor takes over. */
|
||||||
|
initialCursor?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class SSEEventClient {
|
||||||
|
private readonly opts: Required<Omit<SSEClientOptions, 'onGap' | 'initialCursor'>> & Pick<SSEClientOptions, 'onGap' | 'initialCursor'>;
|
||||||
|
private cursor: string = '';
|
||||||
|
private cursorDirty = false;
|
||||||
|
private abort: AbortController | null = null;
|
||||||
|
private flushTimer: NodeJS.Timeout | null = null;
|
||||||
|
private stopped = false;
|
||||||
|
private backoff = 0;
|
||||||
|
private firstConnect = true;
|
||||||
|
|
||||||
|
constructor(options: SSEClientOptions) {
|
||||||
|
this.opts = {
|
||||||
|
url: options.url,
|
||||||
|
cursorPath: options.cursorPath,
|
||||||
|
onEvent: options.onEvent,
|
||||||
|
onGap: options.onGap,
|
||||||
|
logTag: options.logTag ?? '[SSE]',
|
||||||
|
reconnectBaseMs: options.reconnectBaseMs ?? 500,
|
||||||
|
reconnectMaxMs: options.reconnectMaxMs ?? 30_000,
|
||||||
|
flushIntervalMs: options.flushIntervalMs ?? 2000,
|
||||||
|
initialCursor: options.initialCursor,
|
||||||
|
};
|
||||||
|
this.backoff = this.opts.reconnectBaseMs;
|
||||||
|
}
|
||||||
|
|
||||||
|
async start(): Promise<void> {
|
||||||
|
await this.loadCursor();
|
||||||
|
if (!this.cursor && this.opts.initialCursor) {
|
||||||
|
this.cursor = this.opts.initialCursor;
|
||||||
|
}
|
||||||
|
this.startFlushTimer();
|
||||||
|
await this.runLoop();
|
||||||
|
}
|
||||||
|
|
||||||
|
async stop(): Promise<void> {
|
||||||
|
this.stopped = true;
|
||||||
|
if (this.abort) {
|
||||||
|
this.abort.abort();
|
||||||
|
this.abort = null;
|
||||||
|
}
|
||||||
|
if (this.flushTimer) {
|
||||||
|
clearInterval(this.flushTimer);
|
||||||
|
this.flushTimer = null;
|
||||||
|
}
|
||||||
|
await this.flushCursor();
|
||||||
|
}
|
||||||
|
|
||||||
|
getCursor(): string {
|
||||||
|
return this.cursor;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async loadCursor(): Promise<void> {
|
||||||
|
if (!this.opts.cursorPath) return;
|
||||||
|
try {
|
||||||
|
const data = await fs.readFile(this.opts.cursorPath, 'utf-8');
|
||||||
|
const trimmed = data.trim();
|
||||||
|
if (trimmed) {
|
||||||
|
this.cursor = trimmed;
|
||||||
|
console.log(`${this.opts.logTag} Resuming from cursor ${this.cursor}`);
|
||||||
|
}
|
||||||
|
} catch (err: any) {
|
||||||
|
if (err.code !== 'ENOENT') {
|
||||||
|
console.warn(`${this.opts.logTag} Could not read cursor file ${this.opts.cursorPath}: ${err.message}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private startFlushTimer(): void {
|
||||||
|
this.flushTimer = setInterval(() => {
|
||||||
|
if (this.cursorDirty) {
|
||||||
|
this.flushCursor().catch(err =>
|
||||||
|
console.warn(`${this.opts.logTag} Cursor flush failed: ${err.message}`)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}, this.opts.flushIntervalMs);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async flushCursor(): Promise<void> {
|
||||||
|
if (!this.opts.cursorPath || !this.cursorDirty) return;
|
||||||
|
this.cursorDirty = false;
|
||||||
|
try {
|
||||||
|
await fs.mkdir(dirname(this.opts.cursorPath), { recursive: true });
|
||||||
|
await fs.writeFile(this.opts.cursorPath, this.cursor, 'utf-8');
|
||||||
|
} catch (err: any) {
|
||||||
|
this.cursorDirty = true;
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async runLoop(): Promise<void> {
|
||||||
|
while (!this.stopped) {
|
||||||
|
try {
|
||||||
|
await this.connect();
|
||||||
|
this.backoff = this.opts.reconnectBaseMs;
|
||||||
|
} catch (err: any) {
|
||||||
|
if (this.stopped) return;
|
||||||
|
console.warn(`${this.opts.logTag} Stream error, reconnecting in ${this.backoff}ms: ${err?.message ?? err}`);
|
||||||
|
await this.sleep(this.backoff);
|
||||||
|
this.backoff = Math.min(this.backoff * 2, this.opts.reconnectMaxMs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async connect(): Promise<void> {
|
||||||
|
this.abort = new AbortController();
|
||||||
|
const headers: Record<string, string> = {
|
||||||
|
Accept: 'text/event-stream',
|
||||||
|
'Cache-Control': 'no-cache',
|
||||||
|
};
|
||||||
|
if (this.cursor) {
|
||||||
|
headers['Last-Event-ID'] = this.cursor;
|
||||||
|
}
|
||||||
|
this.firstConnect = false;
|
||||||
|
|
||||||
|
const response = await fetch(this.opts.url, {
|
||||||
|
method: 'GET',
|
||||||
|
headers,
|
||||||
|
signal: this.abort.signal,
|
||||||
|
});
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status} ${response.statusText}`);
|
||||||
|
if (!response.body) throw new Error('Response has no body');
|
||||||
|
|
||||||
|
const reader = response.body.getReader();
|
||||||
|
const decoder = new TextDecoder('utf-8');
|
||||||
|
let buffer = '';
|
||||||
|
|
||||||
|
try {
|
||||||
|
while (!this.stopped) {
|
||||||
|
const { value, done } = await reader.read();
|
||||||
|
if (done) return;
|
||||||
|
buffer += decoder.decode(value, { stream: true });
|
||||||
|
let idx: number;
|
||||||
|
while ((idx = buffer.indexOf('\n\n')) !== -1) {
|
||||||
|
const rawChunk = buffer.slice(0, idx);
|
||||||
|
buffer = buffer.slice(idx + 2);
|
||||||
|
await this.handleChunk(rawChunk);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
try { reader.releaseLock(); } catch { /* nothing useful */ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async handleChunk(chunk: string): Promise<void> {
|
||||||
|
let id = '';
|
||||||
|
let event = '';
|
||||||
|
const dataLines: string[] = [];
|
||||||
|
for (const rawLine of chunk.split('\n')) {
|
||||||
|
if (!rawLine || rawLine.startsWith(':')) continue;
|
||||||
|
const colon = rawLine.indexOf(':');
|
||||||
|
if (colon === -1) continue;
|
||||||
|
const field = rawLine.slice(0, colon);
|
||||||
|
let value = rawLine.slice(colon + 1);
|
||||||
|
if (value.startsWith(' ')) value = value.slice(1);
|
||||||
|
switch (field) {
|
||||||
|
case 'id': id = value; break;
|
||||||
|
case 'event': event = value; break;
|
||||||
|
case 'data': dataLines.push(value); break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (dataLines.length === 0) return;
|
||||||
|
|
||||||
|
let data: any;
|
||||||
|
try {
|
||||||
|
data = JSON.parse(dataLines.join('\n'));
|
||||||
|
} catch (err: any) {
|
||||||
|
console.warn(`${this.opts.logTag} Skipping unparseable event ${id || '(no id)'}: ${err.message}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const ev: SSEEvent = { id, event: event || 'message', data };
|
||||||
|
if (ev.event === 'gap') {
|
||||||
|
if (this.opts.onGap) {
|
||||||
|
await this.opts.onGap(ev.data);
|
||||||
|
} else {
|
||||||
|
console.warn(`${this.opts.logTag} Gap event (cursor ${ev.data?.requested} trimmed): resumed from ${ev.data?.resumeFrom}`);
|
||||||
|
}
|
||||||
|
if (typeof ev.data?.resumeFrom === 'string' && ev.data.resumeFrom) {
|
||||||
|
this.cursor = ev.data.resumeFrom;
|
||||||
|
this.cursorDirty = true;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await this.opts.onEvent(ev);
|
||||||
|
} catch (err: any) {
|
||||||
|
console.error(`${this.opts.logTag} onEvent handler failed for ${ev.id}: ${err?.stack ?? err}`);
|
||||||
|
}
|
||||||
|
if (ev.id) {
|
||||||
|
this.cursor = ev.id;
|
||||||
|
this.cursorDirty = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private sleep(ms: number): Promise<void> {
|
||||||
|
return new Promise(resolve => setTimeout(resolve, ms));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,211 +0,0 @@
|
|||||||
/**
|
|
||||||
* Service Registration using shared filesystem
|
|
||||||
*
|
|
||||||
* Each service registers itself in /meta-core/services/{service-name}-{hostname}.json
|
|
||||||
* with its base URL, status, and heartbeat timestamp.
|
|
||||||
*
|
|
||||||
* Service discovery is centralized in meta-core - this class only handles registration.
|
|
||||||
* For service discovery, use the /api/services endpoint (proxied to meta-core via nginx).
|
|
||||||
*
|
|
||||||
* Each service must call start() to register itself and begin heartbeat updates.
|
|
||||||
* meta-core runs a cleanup process that removes services with stale heartbeats.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { promises as fs } from 'fs';
|
|
||||||
import { hostname } from 'os';
|
|
||||||
import { Logger } from 'tslog';
|
|
||||||
import type { ServiceInfo } from './IKVClient.js';
|
|
||||||
|
|
||||||
const logger = new Logger({ name: 'ServiceRegistration' });
|
|
||||||
|
|
||||||
interface ServiceRegistrationConfig {
|
|
||||||
/** Path to META_CORE_VOLUME (e.g., /meta-core) */
|
|
||||||
metaCorePath: string;
|
|
||||||
|
|
||||||
/** Service name */
|
|
||||||
serviceName: string;
|
|
||||||
|
|
||||||
/** Base URL for the service */
|
|
||||||
apiUrl: string;
|
|
||||||
|
|
||||||
/** Heartbeat interval in ms (default: 30000) */
|
|
||||||
heartbeatInterval?: number;
|
|
||||||
|
|
||||||
/** Stale threshold in ms (default: 60000) */
|
|
||||||
staleThreshold?: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class ServiceRegistration {
|
|
||||||
private config: ServiceRegistrationConfig;
|
|
||||||
private servicesDir: string;
|
|
||||||
private serviceFilePath: string;
|
|
||||||
private heartbeatTimer: NodeJS.Timeout | null = null;
|
|
||||||
private isShuttingDown = false;
|
|
||||||
private isStarted = false;
|
|
||||||
private currentHostname: string;
|
|
||||||
|
|
||||||
constructor(config: ServiceRegistrationConfig) {
|
|
||||||
this.config = {
|
|
||||||
heartbeatInterval: 30000,
|
|
||||||
staleThreshold: 60000,
|
|
||||||
...config
|
|
||||||
};
|
|
||||||
|
|
||||||
this.currentHostname = hostname();
|
|
||||||
this.servicesDir = `${this.config.metaCorePath}/services`;
|
|
||||||
// Use hostname-based file naming
|
|
||||||
this.serviceFilePath = `${this.servicesDir}/${this.config.serviceName}-${this.currentHostname}.json`;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Ensure services directory exists
|
|
||||||
*/
|
|
||||||
private async ensureServicesDir(): Promise<void> {
|
|
||||||
await fs.mkdir(this.servicesDir, { recursive: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Build service info for this service
|
|
||||||
*/
|
|
||||||
private buildServiceInfo(status: ServiceInfo['status']): ServiceInfo {
|
|
||||||
return {
|
|
||||||
name: this.config.serviceName,
|
|
||||||
hostname: this.currentHostname,
|
|
||||||
baseUrl: this.config.apiUrl,
|
|
||||||
status,
|
|
||||||
lastHeartbeat: new Date().toISOString()
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register this service by writing service info to the shared filesystem.
|
|
||||||
* meta-core's cleanup process monitors these files and removes stale entries.
|
|
||||||
*/
|
|
||||||
async register(): Promise<void> {
|
|
||||||
await this.ensureServicesDir();
|
|
||||||
|
|
||||||
const info = this.buildServiceInfo('running');
|
|
||||||
await fs.writeFile(this.serviceFilePath, JSON.stringify(info, null, 2));
|
|
||||||
|
|
||||||
logger.info(`Registered ${this.config.serviceName}-${this.currentHostname}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update service status
|
|
||||||
*/
|
|
||||||
async updateStatus(status: ServiceInfo['status']): Promise<void> {
|
|
||||||
try {
|
|
||||||
const content = await fs.readFile(this.serviceFilePath, 'utf-8');
|
|
||||||
const info = JSON.parse(content) as ServiceInfo;
|
|
||||||
|
|
||||||
info.status = status;
|
|
||||||
info.lastHeartbeat = new Date().toISOString();
|
|
||||||
|
|
||||||
await fs.writeFile(this.serviceFilePath, JSON.stringify(info, null, 2));
|
|
||||||
} catch (error) {
|
|
||||||
logger.error('Failed to update status:', error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send heartbeat (update lastHeartbeat timestamp)
|
|
||||||
*/
|
|
||||||
async heartbeat(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const content = await fs.readFile(this.serviceFilePath, 'utf-8');
|
|
||||||
const info = JSON.parse(content) as ServiceInfo;
|
|
||||||
|
|
||||||
info.lastHeartbeat = new Date().toISOString();
|
|
||||||
|
|
||||||
await fs.writeFile(this.serviceFilePath, JSON.stringify(info, null, 2));
|
|
||||||
} catch (error: any) {
|
|
||||||
// If file was deleted, re-register
|
|
||||||
if (error.code === 'ENOENT') {
|
|
||||||
await this.register();
|
|
||||||
} else {
|
|
||||||
logger.error('Heartbeat failed:', error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Start heartbeat loop
|
|
||||||
*/
|
|
||||||
startHeartbeat(): void {
|
|
||||||
this.heartbeatTimer = setInterval(async () => {
|
|
||||||
if (this.isShuttingDown) return;
|
|
||||||
await this.heartbeat();
|
|
||||||
}, this.config.heartbeatInterval);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stop heartbeat loop
|
|
||||||
*/
|
|
||||||
stopHeartbeat(): void {
|
|
||||||
if (this.heartbeatTimer) {
|
|
||||||
clearInterval(this.heartbeatTimer);
|
|
||||||
this.heartbeatTimer = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Unregister this service (on shutdown)
|
|
||||||
*/
|
|
||||||
async unregister(): Promise<void> {
|
|
||||||
this.isShuttingDown = true;
|
|
||||||
this.stopHeartbeat();
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Remove the service file
|
|
||||||
await fs.unlink(this.serviceFilePath);
|
|
||||||
logger.info(`Unregistered ${this.config.serviceName}-${this.currentHostname}`);
|
|
||||||
} catch (error: any) {
|
|
||||||
if (error.code !== 'ENOENT') {
|
|
||||||
logger.error('Failed to unregister:', error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ========================================================================
|
|
||||||
// Lifecycle
|
|
||||||
// ========================================================================
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Full startup sequence: register service and start heartbeat loop.
|
|
||||||
*/
|
|
||||||
async start(): Promise<void> {
|
|
||||||
if (this.isStarted) return;
|
|
||||||
|
|
||||||
await this.register();
|
|
||||||
this.startHeartbeat();
|
|
||||||
this.isStarted = true;
|
|
||||||
|
|
||||||
logger.info(`Started ${this.config.serviceName} at ${this.config.apiUrl}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Full shutdown sequence
|
|
||||||
*/
|
|
||||||
async stop(): Promise<void> {
|
|
||||||
if (!this.isStarted) return;
|
|
||||||
|
|
||||||
await this.unregister();
|
|
||||||
this.isStarted = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ========================================================================
|
|
||||||
// Getters
|
|
||||||
// ========================================================================
|
|
||||||
|
|
||||||
getServiceFilePath(): string {
|
|
||||||
return this.serviceFilePath;
|
|
||||||
}
|
|
||||||
|
|
||||||
getServicesDir(): string {
|
|
||||||
return this.servicesDir;
|
|
||||||
}
|
|
||||||
|
|
||||||
getIsStarted(): boolean {
|
|
||||||
return this.isStarted;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -13,7 +13,6 @@
|
|||||||
*/
|
*/
|
||||||
export interface MediaMeta {
|
export interface MediaMeta {
|
||||||
// Title information
|
// Title information
|
||||||
titles?: { eng?: string; [key: string]: string | undefined };
|
|
||||||
originalTitle?: string;
|
originalTitle?: string;
|
||||||
title?: string;
|
title?: string;
|
||||||
|
|
||||||
@@ -62,7 +61,8 @@ export function renamingRule(metadata: Partial<MediaMeta>, filepath?: string): s
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get title - try various fields
|
// Get title - try various fields
|
||||||
const title = metadata.titles?.eng || metadata.originalTitle;
|
// The display name — never the `titles/*` name set (METADATA_KEYS.md §3).
|
||||||
|
const title = metadata.title || metadata.originalTitle;
|
||||||
if (!title) {
|
if (!title) {
|
||||||
if (metadata.fileType !== 'torrent') {
|
if (metadata.fileType !== 'torrent') {
|
||||||
// Don't warn for torrent files because they don't always have a title
|
// Don't warn for torrent files because they don't always have a title
|
||||||
|
|||||||
@@ -174,12 +174,6 @@ export class VirtualFileSystem implements VFSUpdateCallback {
|
|||||||
mtime = isNaN(parsed) ? parseFloat(props.mtime) : parsed;
|
mtime = isNaN(parsed) ? parseFloat(props.mtime) : parsed;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse titles - can be from nested paths like 'titles/eng'
|
|
||||||
let titles: { eng?: string; [key: string]: string | undefined } | undefined;
|
|
||||||
if (props['titles/eng']) {
|
|
||||||
titles = { eng: props['titles/eng'] };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse season/episode
|
// Parse season/episode
|
||||||
const season = props.season !== undefined ? parseInt(props.season, 10) : undefined;
|
const season = props.season !== undefined ? parseInt(props.season, 10) : undefined;
|
||||||
const episode = props.episode !== undefined ? parseInt(props.episode, 10) : undefined;
|
const episode = props.episode !== undefined ? parseInt(props.episode, 10) : undefined;
|
||||||
@@ -212,7 +206,6 @@ export class VirtualFileSystem implements VFSUpdateCallback {
|
|||||||
ctime: props.ctime ? parseFloat(props.ctime) : mtime,
|
ctime: props.ctime ? parseFloat(props.ctime) : mtime,
|
||||||
hashId,
|
hashId,
|
||||||
title: props.title,
|
title: props.title,
|
||||||
titles,
|
|
||||||
originalTitle: props.originalTitle,
|
originalTitle: props.originalTitle,
|
||||||
fileName,
|
fileName,
|
||||||
season,
|
season,
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
* Old behavior:
|
* Old behavior:
|
||||||
* - Only processes video, subtitle, torrent files
|
* - Only processes video, subtitle, torrent files
|
||||||
* - Requires extension
|
* - Requires extension
|
||||||
* - Title from titles.eng || originalTitle
|
* - Title from title || originalTitle
|
||||||
* - Files without title/extension are hidden (not in Unsorted)
|
* - Files without title/extension are hidden (not in Unsorted)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ export type ConditionOperator =
|
|||||||
*/
|
*/
|
||||||
export interface Condition {
|
export interface Condition {
|
||||||
type: ConditionOperator;
|
type: ConditionOperator;
|
||||||
field: string; // Metadata field path, e.g., "titles.eng", "season", "fileType"
|
field: string; // Metadata field path, e.g., "title", "season", "fileType"
|
||||||
value?: string | number | boolean; // Required for EQUALS, NOT_EQUALS, CONTAINS, MATCHES
|
value?: string | number | boolean; // Required for EQUALS, NOT_EQUALS, CONTAINS, MATCHES
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,7 +83,7 @@ export interface PreviewResponse {
|
|||||||
*/
|
*/
|
||||||
export interface TemplateVariable {
|
export interface TemplateVariable {
|
||||||
name: string; // Display name
|
name: string; // Display name
|
||||||
path: string; // Field path (e.g., "titles.eng")
|
path: string; // Field path (e.g., "title")
|
||||||
type: 'string' | 'number' | 'boolean';
|
type: 'string' | 'number' | 'boolean';
|
||||||
description: string;
|
description: string;
|
||||||
example?: string;
|
example?: string;
|
||||||
@@ -93,7 +93,6 @@ export interface TemplateVariable {
|
|||||||
* List of all available template variables
|
* List of all available template variables
|
||||||
*/
|
*/
|
||||||
export const TEMPLATE_VARIABLES: TemplateVariable[] = [
|
export const TEMPLATE_VARIABLES: TemplateVariable[] = [
|
||||||
{ name: 'English Title', path: 'titles.eng', type: 'string', description: 'English title from metadata', example: 'Breaking Bad' },
|
|
||||||
{ name: 'Original Title', path: 'originalTitle', type: 'string', description: 'Original/native title', example: 'Breaking Bad' },
|
{ name: 'Original Title', path: 'originalTitle', type: 'string', description: 'Original/native title', example: 'Breaking Bad' },
|
||||||
{ name: 'Title', path: 'title', type: 'string', description: 'Simple title field', example: 'Breaking Bad' },
|
{ name: 'Title', path: 'title', type: 'string', description: 'Simple title field', example: 'Breaking Bad' },
|
||||||
{ name: 'Season', path: 'season', type: 'number', description: 'Season number', example: '1' },
|
{ name: 'Season', path: 'season', type: 'number', description: 'Season number', example: '1' },
|
||||||
|
|||||||
@@ -0,0 +1,138 @@
|
|||||||
|
/**
|
||||||
|
* TokenStore — Per-device WebDAV access tokens.
|
||||||
|
*
|
||||||
|
* Tokens are minted from the OIDC-protected dashboard and used as the
|
||||||
|
* basic-auth password by WebDAV clients (Plex, Finder, etc.). The plaintext
|
||||||
|
* is shown to the user once at creation time; only sha256 hashes are
|
||||||
|
* persisted. The matching WsgiDAV DomainController
|
||||||
|
* (`docker/webdav_token_controller.py`) reads the same JSON file fresh on
|
||||||
|
* every auth request, so revocation is immediate.
|
||||||
|
*
|
||||||
|
* Tokens identify a *device*, not an OIDC user — multi-user support requires
|
||||||
|
* hash-lock to forward an X-Forwarded-User header (not currently the case),
|
||||||
|
* at which point a `userId` field can be added to the record.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import * as crypto from 'crypto';
|
||||||
|
import * as fs from 'fs';
|
||||||
|
import * as path from 'path';
|
||||||
|
import { Logger } from 'tslog';
|
||||||
|
|
||||||
|
const logger = new Logger({ name: 'TokenStore' });
|
||||||
|
|
||||||
|
/** Length of the random portion (in hex chars) of a generated token. */
|
||||||
|
const TOKEN_RANDOM_HEX_LEN = 32; // 16 bytes => 128 bits of entropy
|
||||||
|
/** Public prefix marker so support can grep logs for stray tokens. */
|
||||||
|
const TOKEN_PREFIX = 'mfwd_';
|
||||||
|
/** Number of hex chars (after the prefix) we surface in the dashboard list. */
|
||||||
|
const VISIBLE_PREFIX_LEN = 4;
|
||||||
|
|
||||||
|
export interface WebdavTokenRecord {
|
||||||
|
id: string;
|
||||||
|
label: string;
|
||||||
|
hash: string; // sha256(plaintext)
|
||||||
|
prefix: string; // first VISIBLE_PREFIX_LEN chars of the random portion
|
||||||
|
createdAt: string; // ISO 8601
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Public view shown in the dashboard list — no plaintext, no hash. */
|
||||||
|
export interface WebdavTokenView {
|
||||||
|
id: string;
|
||||||
|
label: string;
|
||||||
|
prefix: string;
|
||||||
|
createdAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface TokenFile {
|
||||||
|
tokens: WebdavTokenRecord[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TokenStoreOptions {
|
||||||
|
configDir: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class TokenStore {
|
||||||
|
private readonly file: string;
|
||||||
|
private readonly configDir: string;
|
||||||
|
|
||||||
|
constructor(opts: TokenStoreOptions) {
|
||||||
|
this.configDir = opts.configDir;
|
||||||
|
this.file = path.join(this.configDir, 'webdav-tokens.json');
|
||||||
|
this.ensureConfigDir();
|
||||||
|
}
|
||||||
|
|
||||||
|
private ensureConfigDir(): void {
|
||||||
|
if (!fs.existsSync(this.configDir)) {
|
||||||
|
fs.mkdirSync(this.configDir, { recursive: true });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private read(): TokenFile {
|
||||||
|
if (!fs.existsSync(this.file)) return { tokens: [] };
|
||||||
|
try {
|
||||||
|
const raw = fs.readFileSync(this.file, 'utf-8');
|
||||||
|
const parsed = JSON.parse(raw) as TokenFile;
|
||||||
|
if (!Array.isArray(parsed.tokens)) return { tokens: [] };
|
||||||
|
return parsed;
|
||||||
|
} catch (err) {
|
||||||
|
logger.warn(`Token store ${this.file} unreadable, treating as empty:`, err);
|
||||||
|
return { tokens: [] };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Atomic write — write to a sibling tmp file and rename. WsgiDAV's
|
||||||
|
* controller reads this file on every auth request, so a partial write
|
||||||
|
* would briefly fail authentication.
|
||||||
|
*/
|
||||||
|
private write(file: TokenFile): void {
|
||||||
|
const tmp = `${this.file}.tmp`;
|
||||||
|
fs.writeFileSync(tmp, JSON.stringify(file, null, 2), 'utf-8');
|
||||||
|
fs.renameSync(tmp, this.file);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Public list — no plaintext, no hash. */
|
||||||
|
list(): WebdavTokenView[] {
|
||||||
|
return this.read().tokens.map(({ id, label, prefix, createdAt }) => ({
|
||||||
|
id, label, prefix, createdAt,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mint a new token. Returns the plaintext exactly once — the caller is
|
||||||
|
* responsible for surfacing it to the user and forgetting it.
|
||||||
|
*/
|
||||||
|
create(label: string): { plaintext: string; view: WebdavTokenView } {
|
||||||
|
const random = crypto.randomBytes(TOKEN_RANDOM_HEX_LEN / 2).toString('hex');
|
||||||
|
const plaintext = `${TOKEN_PREFIX}${random}`;
|
||||||
|
const id = crypto.randomBytes(8).toString('hex');
|
||||||
|
const record: WebdavTokenRecord = {
|
||||||
|
id,
|
||||||
|
label: label.trim() || 'Unnamed token',
|
||||||
|
hash: crypto.createHash('sha256').update(plaintext).digest('hex'),
|
||||||
|
prefix: random.slice(0, VISIBLE_PREFIX_LEN),
|
||||||
|
createdAt: new Date().toISOString(),
|
||||||
|
};
|
||||||
|
|
||||||
|
const file = this.read();
|
||||||
|
file.tokens.push(record);
|
||||||
|
this.write(file);
|
||||||
|
|
||||||
|
logger.info(`Minted WebDAV token id=${id} label=${JSON.stringify(record.label)}`);
|
||||||
|
return {
|
||||||
|
plaintext,
|
||||||
|
view: { id, label: record.label, prefix: record.prefix, createdAt: record.createdAt },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Delete by id. Returns true if a record was removed. */
|
||||||
|
revoke(id: string): boolean {
|
||||||
|
const file = this.read();
|
||||||
|
const idx = file.tokens.findIndex(t => t.id === id);
|
||||||
|
if (idx < 0) return false;
|
||||||
|
file.tokens.splice(idx, 1);
|
||||||
|
this.write(file);
|
||||||
|
logger.info(`Revoked WebDAV token id=${id}`);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import { useState, useEffect, useCallback } from 'react';
|
import { useState, useEffect, useCallback } from 'react';
|
||||||
import { RulesEditor } from './components/RulesEditor';
|
import { RulesEditor } from './components/RulesEditor';
|
||||||
import ServiceNav from './components/ServiceNav';
|
import ServiceNav from './components/ServiceNav';
|
||||||
|
import { WebdavTokens } from './components/WebdavTokens';
|
||||||
|
|
||||||
interface Stats {
|
interface Stats {
|
||||||
fileCount: number;
|
fileCount: number;
|
||||||
@@ -39,6 +40,7 @@ function App() {
|
|||||||
const [refreshing, setRefreshing] = useState(false);
|
const [refreshing, setRefreshing] = useState(false);
|
||||||
const [showRules, setShowRules] = useState(false);
|
const [showRules, setShowRules] = useState(false);
|
||||||
const [showSetup, setShowSetup] = useState(false);
|
const [showSetup, setShowSetup] = useState(false);
|
||||||
|
const [showTokens, setShowTokens] = useState(false);
|
||||||
|
|
||||||
const fetchData = useCallback(async () => {
|
const fetchData = useCallback(async () => {
|
||||||
try {
|
try {
|
||||||
@@ -223,6 +225,17 @@ function App() {
|
|||||||
<RulesEditor onSave={fetchData} />
|
<RulesEditor onSave={fetchData} />
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div className="subsection">
|
||||||
|
<div
|
||||||
|
className="section-header-collapsible"
|
||||||
|
onClick={() => setShowTokens(!showTokens)}
|
||||||
|
>
|
||||||
|
<h3 className="subsection-title">WebDAV Access Tokens</h3>
|
||||||
|
<span className="collapse-icon">{showTokens ? '-' : '+'}</span>
|
||||||
|
</div>
|
||||||
|
{showTokens && <WebdavTokens />}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="section">
|
<div className="section">
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ interface RulesEditorProps {
|
|||||||
// Available metadata fields for conditions
|
// Available metadata fields for conditions
|
||||||
const AVAILABLE_FIELDS = [
|
const AVAILABLE_FIELDS = [
|
||||||
{ value: 'fileType', label: 'File Type', type: 'string' },
|
{ value: 'fileType', label: 'File Type', type: 'string' },
|
||||||
{ value: 'titles.eng', label: 'English Title', type: 'string' },
|
{ value: 'title', label: 'Title', type: 'string' },
|
||||||
{ value: 'originalTitle', label: 'Original Title', type: 'string' },
|
{ value: 'originalTitle', label: 'Original Title', type: 'string' },
|
||||||
{ value: 'season', label: 'Season', type: 'number' },
|
{ value: 'season', label: 'Season', type: 'number' },
|
||||||
{ value: 'episode', label: 'Episode', type: 'number' },
|
{ value: 'episode', label: 'Episode', type: 'number' },
|
||||||
@@ -53,7 +53,7 @@ function createEmptyRule(): RenamingRule {
|
|||||||
function createEmptyCondition(): Condition {
|
function createEmptyCondition(): Condition {
|
||||||
return {
|
return {
|
||||||
type: 'EXISTS',
|
type: 'EXISTS',
|
||||||
field: 'titles.eng',
|
field: 'title',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -197,7 +197,7 @@ function TemplateEditor({ template, onChange, variables }: TemplateEditorProps)
|
|||||||
<textarea
|
<textarea
|
||||||
value={template}
|
value={template}
|
||||||
onChange={e => onChange(e.target.value)}
|
onChange={e => onChange(e.target.value)}
|
||||||
placeholder="e.g., Movies/{titles.eng|originalTitle}{movieYear? ({movieYear})}/{fileName}.{extension}"
|
placeholder="e.g., Movies/{title|originalTitle}{movieYear? ({movieYear})}/{fileName}.{extension}"
|
||||||
rows={3}
|
rows={3}
|
||||||
className="template-input"
|
className="template-input"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,164 +1,53 @@
|
|||||||
import { useState, useEffect } from 'react';
|
import { useEffect } from 'react';
|
||||||
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||||
|
// @ts-ignore -- plain ES module, no .d.ts; imported for its side effect
|
||||||
|
// of defining the custom element.
|
||||||
|
import '../meta-service-menu.js';
|
||||||
|
|
||||||
interface ServiceInfo {
|
/**
|
||||||
name: string;
|
* ServiceNav — the neighbouring meta-* services, as a burger menu.
|
||||||
hostname: string;
|
*
|
||||||
baseUrl: string;
|
* Since meta-discovery v1 this is a thin wrapper around <meta-service-menu>,
|
||||||
status: string;
|
* a framework-free custom element shared by every meta-* UI (see
|
||||||
lastHeartbeat: string;
|
* scripts/check-mirrors.sh). The old implementation was ~165 lines of React
|
||||||
|
* that existed in four near-identical copies and polled meta-core's
|
||||||
|
* /api/services; the element polls this service's own /api/neighbors instead,
|
||||||
|
* so the nav still renders when meta-core is down.
|
||||||
|
*
|
||||||
|
* The element lives in shadow DOM and cannot see this app's CSS variables, so
|
||||||
|
* the four --mm-nav-* tokens below map our palette onto it.
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare global {
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-namespace
|
||||||
|
namespace JSX {
|
||||||
|
interface IntrinsicElements {
|
||||||
|
'meta-service-menu': React.DetailedHTMLProps<
|
||||||
|
React.HTMLAttributes<HTMLElement>,
|
||||||
|
HTMLElement
|
||||||
|
> & { current?: string; endpoint?: string; label?: string };
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ServicesResponse {
|
|
||||||
services: ServiceInfo[];
|
|
||||||
current: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const serviceIcons: Record<string, string> = {
|
|
||||||
'meta-sort': '📁',
|
|
||||||
'meta-fuse': '🗂️',
|
|
||||||
'meta-stremio': '🎬',
|
|
||||||
'meta-core': '⚙️',
|
|
||||||
'meta-dup': '🔍',
|
|
||||||
'meta-orbit': '🌐',
|
|
||||||
'default': '📦'
|
|
||||||
};
|
|
||||||
|
|
||||||
function formatServiceName(name: string): string {
|
|
||||||
return name.split('-').map(word =>
|
|
||||||
word.charAt(0).toUpperCase() + word.slice(1)
|
|
||||||
).join(' ');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function ServiceNav() {
|
function ServiceNav() {
|
||||||
const [services, setServices] = useState<ServiceInfo[]>([]);
|
|
||||||
const [loading, setLoading] = useState(true);
|
|
||||||
const currentService = 'meta-fuse';
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchServices = async () => {
|
// Import above is for the side effect of defining the element; this
|
||||||
try {
|
// keeps bundlers from tree-shaking it away in production builds.
|
||||||
const response = await fetch('/api/services');
|
|
||||||
if (response.ok) {
|
|
||||||
const data: ServicesResponse = await response.json();
|
|
||||||
setServices(data.services || []);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to fetch services:', error);
|
|
||||||
} finally {
|
|
||||||
setLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
fetchServices();
|
|
||||||
const interval = setInterval(fetchServices, 30000);
|
|
||||||
return () => clearInterval(interval);
|
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
if (loading) return null;
|
|
||||||
|
|
||||||
const sortedServices = [...services].sort((a, b) => a.name.localeCompare(b.name));
|
|
||||||
|
|
||||||
if (sortedServices.length === 0) return null;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<nav className="services-nav">
|
<>
|
||||||
<span className="services-nav-label">Services:</span>
|
<meta-service-menu current="meta-fuse" />
|
||||||
<div className="services-nav-items">
|
|
||||||
{sortedServices.map(service => {
|
|
||||||
const icon = serviceIcons[service.name] || serviceIcons.default;
|
|
||||||
const isActive = service.name === currentService;
|
|
||||||
return (
|
|
||||||
<a
|
|
||||||
key={service.name}
|
|
||||||
href={isActive ? '#' : service.baseUrl}
|
|
||||||
className={`service-link${isActive ? ' active' : ''}`}
|
|
||||||
onClick={(e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
if (!isActive) {
|
|
||||||
window.location.href = service.baseUrl;
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<span className="service-icon">{icon}</span>
|
|
||||||
<span>{formatServiceName(service.name)}</span>
|
|
||||||
<span className="service-status"></span>
|
|
||||||
</a>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<style>{`
|
<style>{`
|
||||||
.services-nav {
|
meta-service-menu {
|
||||||
background: var(--bg-secondary, #12121a);
|
--mm-nav-fg: var(--text-primary, #e0e0e0);
|
||||||
border-radius: 12px;
|
--mm-nav-bg: var(--bg-tertiary, var(--bg-secondary, #1a1a2e));
|
||||||
padding: 0.5rem;
|
--mm-nav-border: var(--border-color, rgba(255,255,255,0.14));
|
||||||
margin-bottom: 1.5rem;
|
--mm-nav-accent: var(--accent-primary, #4ecdc4);
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.5rem;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
border: 1px solid var(--border-color, #2a2a3a);
|
|
||||||
}
|
|
||||||
|
|
||||||
.services-nav-label {
|
|
||||||
color: var(--text-secondary, #a0a0a0);
|
|
||||||
font-size: 0.85rem;
|
|
||||||
padding: 0.5rem 0.75rem;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.services-nav-items {
|
|
||||||
display: flex;
|
|
||||||
gap: 0.5rem;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.service-link {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.4rem;
|
|
||||||
padding: 0.5rem 1rem;
|
|
||||||
border-radius: 8px;
|
|
||||||
text-decoration: none;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
font-weight: 500;
|
|
||||||
transition: all 0.2s;
|
|
||||||
color: var(--text-primary, #e0e0e0);
|
|
||||||
background: var(--bg-tertiary, #1a1a2a);
|
|
||||||
border: 1px solid var(--border-color, #2a2a3a);
|
|
||||||
}
|
|
||||||
|
|
||||||
.service-link:hover {
|
|
||||||
background: var(--border-color, #2a2a3a);
|
|
||||||
border-color: rgba(78, 205, 196, 0.5);
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.service-link.active {
|
|
||||||
background: linear-gradient(135deg, rgba(78, 205, 196, 0.2), rgba(68, 160, 141, 0.2));
|
|
||||||
border-color: rgba(78, 205, 196, 0.5);
|
|
||||||
}
|
|
||||||
|
|
||||||
.service-link .service-icon {
|
|
||||||
font-size: 1.1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.service-link .service-status {
|
|
||||||
width: 6px;
|
|
||||||
height: 6px;
|
|
||||||
border-radius: 50%;
|
|
||||||
background: var(--accent-primary, #4ecdc4);
|
|
||||||
margin-left: 0.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 600px) {
|
|
||||||
.services-nav {
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: flex-start;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
`}</style>
|
`}</style>
|
||||||
</nav>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,177 @@
|
|||||||
|
import { useCallback, useEffect, useState } from 'react';
|
||||||
|
|
||||||
|
interface TokenView {
|
||||||
|
id: string;
|
||||||
|
label: string;
|
||||||
|
prefix: string;
|
||||||
|
createdAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface CreatedToken extends TokenView {
|
||||||
|
token: string; // plaintext, surfaced only once
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatDate(iso: string): string {
|
||||||
|
try {
|
||||||
|
return new Date(iso).toLocaleString();
|
||||||
|
} catch {
|
||||||
|
return iso;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function WebdavTokens() {
|
||||||
|
const [tokens, setTokens] = useState<TokenView[]>([]);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [newLabel, setNewLabel] = useState('');
|
||||||
|
const [creating, setCreating] = useState(false);
|
||||||
|
const [justCreated, setJustCreated] = useState<CreatedToken | null>(null);
|
||||||
|
const [copied, setCopied] = useState(false);
|
||||||
|
|
||||||
|
const refresh = useCallback(async () => {
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/webdav-tokens');
|
||||||
|
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||||
|
const data = await res.json();
|
||||||
|
setTokens(data.tokens ?? []);
|
||||||
|
setError(null);
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
refresh();
|
||||||
|
}, [refresh]);
|
||||||
|
|
||||||
|
const create = async () => {
|
||||||
|
setCreating(true);
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/webdav-tokens', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ label: newLabel }),
|
||||||
|
});
|
||||||
|
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||||
|
const created: CreatedToken = await res.json();
|
||||||
|
setJustCreated(created);
|
||||||
|
setNewLabel('');
|
||||||
|
setCopied(false);
|
||||||
|
await refresh();
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
setCreating(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const revoke = async (id: string, label: string) => {
|
||||||
|
if (!confirm(`Revoke token "${label}"? Devices using it will lose WebDAV access immediately.`)) return;
|
||||||
|
try {
|
||||||
|
const res = await fetch(`/api/webdav-tokens/${id}`, { method: 'DELETE' });
|
||||||
|
if (!res.ok && res.status !== 204) throw new Error(`HTTP ${res.status}`);
|
||||||
|
await refresh();
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const copyToken = async () => {
|
||||||
|
if (!justCreated) return;
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(justCreated.token);
|
||||||
|
setCopied(true);
|
||||||
|
setTimeout(() => setCopied(false), 2000);
|
||||||
|
} catch {
|
||||||
|
// Clipboard API may be unavailable on http; fall back silently.
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (loading) return <div className="loading">Loading tokens…</div>;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="webdav-tokens">
|
||||||
|
<p className="info-note">
|
||||||
|
Generate one token per device and paste it as the basic-auth password
|
||||||
|
when you add the WebDAV mount in Plex / Finder / Windows Explorer / etc.
|
||||||
|
Any username works — the password is what authenticates. Revoke a
|
||||||
|
token to cut off that single device without affecting the others.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{error && <div className="error">{error}</div>}
|
||||||
|
|
||||||
|
{justCreated && (
|
||||||
|
<div className="info-box" style={{ borderColor: '#10b981' }}>
|
||||||
|
<h4>New token — copy it now</h4>
|
||||||
|
<p className="info-note">
|
||||||
|
This is the only time the full token will be shown. After you close
|
||||||
|
this banner only the prefix will appear in the list.
|
||||||
|
</p>
|
||||||
|
<div className="command-box" style={{ display: 'flex', gap: '0.5rem', alignItems: 'center' }}>
|
||||||
|
<code style={{ flex: 1, wordBreak: 'break-all' }}>{justCreated.token}</code>
|
||||||
|
<button onClick={copyToken} className="refresh-btn">
|
||||||
|
{copied ? 'Copied!' : 'Copy'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
onClick={() => setJustCreated(null)}
|
||||||
|
className="refresh-btn"
|
||||||
|
style={{ marginTop: '0.5rem' }}
|
||||||
|
>
|
||||||
|
Dismiss
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="card" style={{ marginTop: '1rem' }}>
|
||||||
|
<div className="card-header">
|
||||||
|
<span className="card-title">Generate token</span>
|
||||||
|
</div>
|
||||||
|
<div style={{ display: 'flex', gap: '0.5rem', marginTop: '0.5rem' }}>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={newLabel}
|
||||||
|
onChange={(e) => setNewLabel(e.target.value)}
|
||||||
|
placeholder="Label (e.g. 'Plex on living-room TV')"
|
||||||
|
maxLength={200}
|
||||||
|
style={{ flex: 1, padding: '0.5rem' }}
|
||||||
|
onKeyDown={(e) => { if (e.key === 'Enter' && !creating) create(); }}
|
||||||
|
/>
|
||||||
|
<button onClick={create} disabled={creating} className="refresh-btn">
|
||||||
|
{creating ? 'Generating…' : 'Generate'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="file-list" style={{ marginTop: '1rem' }}>
|
||||||
|
{tokens.length === 0 ? (
|
||||||
|
<div className="file-item">
|
||||||
|
<span className="file-name" style={{ color: '#64748b' }}>
|
||||||
|
No tokens yet — generate one to enable WebDAV access.
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
tokens.map((t) => (
|
||||||
|
<div key={t.id} className="file-item" style={{ justifyContent: 'space-between' }}>
|
||||||
|
<div>
|
||||||
|
<span className="file-name"><strong>{t.label}</strong></span>
|
||||||
|
<div className="info-note">
|
||||||
|
<code>mfwd_{t.prefix}…</code> · created {formatDate(t.createdAt)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
onClick={() => revoke(t.id, t.label)}
|
||||||
|
className="refresh-btn"
|
||||||
|
style={{ background: '#ef4444', color: 'white' }}
|
||||||
|
>
|
||||||
|
Revoke
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,303 @@
|
|||||||
|
/**
|
||||||
|
* <meta-service-menu> — the neighbouring meta-* services, as a burger menu.
|
||||||
|
*
|
||||||
|
* Replaces the eight divergent "services bar" implementations (four copies of
|
||||||
|
* a React `ServiceNav.tsx`, two mirrored `services.js`, two bespoke inline
|
||||||
|
* ones) with a single framework-free custom element. It drops into the React
|
||||||
|
* dashboards as a plain tag — no React dependency — and into the vanilla UIs
|
||||||
|
* as an ES module.
|
||||||
|
*
|
||||||
|
* Data comes from the host service's own `GET /api/neighbors`, same-origin.
|
||||||
|
* Never cross-origin: the dev stack's self-signed certs and the OIDC redirects
|
||||||
|
* make a fetch to a neighbour a dead end. Links are plain navigations.
|
||||||
|
*
|
||||||
|
* ⚠ MIRRORED FILE. Byte-identical copies live in every meta-* UI tree; see
|
||||||
|
* `scripts/check-mirrors.sh`. Edit one → edit all.
|
||||||
|
*
|
||||||
|
* Shadow DOM is not optional here. The eight UIs use four incompatible token
|
||||||
|
* vocabularies, and two of them define *different colours under the same
|
||||||
|
* names* (`--bg-secondary` is #12121a in meta-sort, #16213e in meta-core,
|
||||||
|
* #161b22 in meta-dup). meta-search and meta-share are also the only
|
||||||
|
* light-mode-capable UIs, so a hardcoded dark palette would break them.
|
||||||
|
* The element therefore styles itself from four tokens with dark defaults:
|
||||||
|
*
|
||||||
|
* --mm-nav-fg, --mm-nav-bg, --mm-nav-border, --mm-nav-accent
|
||||||
|
*
|
||||||
|
* Each host maps its own variables onto those, e.g.
|
||||||
|
* meta-service-menu { --mm-nav-bg: var(--bg-secondary); }
|
||||||
|
*
|
||||||
|
* Attributes:
|
||||||
|
* current name of the host service, so it can be marked and not linked
|
||||||
|
* endpoint override the default "/api/neighbors"
|
||||||
|
* label button tooltip (default "Services")
|
||||||
|
*
|
||||||
|
* Property:
|
||||||
|
* rewriteUrl optional (name, url, neighbour) => url, for hosts that must
|
||||||
|
* translate internal hostnames into browser-reachable ones
|
||||||
|
* (meta-gateway does this for its dev/prod split).
|
||||||
|
*/
|
||||||
|
|
||||||
|
const ICONS = {
|
||||||
|
"meta-core": "⚙️",
|
||||||
|
"meta-sort": "📁",
|
||||||
|
"meta-fuse": "🗂️",
|
||||||
|
"meta-stremio": "🎬",
|
||||||
|
"meta-dup": "🔍",
|
||||||
|
"meta-search": "🔎",
|
||||||
|
"meta-share": "🔗",
|
||||||
|
"meta-gateway": "🌉",
|
||||||
|
"meta-watch": "📺",
|
||||||
|
"meta-listen": "🎧",
|
||||||
|
"meta-read": "📖",
|
||||||
|
};
|
||||||
|
const DEFAULT_ICON = "📦";
|
||||||
|
const POLL_MS = 30000;
|
||||||
|
|
||||||
|
function titleCase(name) {
|
||||||
|
return String(name || "")
|
||||||
|
.split("-")
|
||||||
|
.map((w) => w.charAt(0).toUpperCase() + w.slice(1))
|
||||||
|
.join(" ");
|
||||||
|
}
|
||||||
|
|
||||||
|
const TEMPLATE = `
|
||||||
|
<style>
|
||||||
|
:host {
|
||||||
|
--_fg: var(--mm-nav-fg, #e8eaed);
|
||||||
|
--_bg: var(--mm-nav-bg, #1a1a2e);
|
||||||
|
--_border: var(--mm-nav-border, rgba(255, 255, 255, 0.14));
|
||||||
|
--_accent: var(--mm-nav-accent, #4ecdc4);
|
||||||
|
position: relative;
|
||||||
|
display: inline-block;
|
||||||
|
font-family: inherit;
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 1.4;
|
||||||
|
}
|
||||||
|
button.trigger {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0.4rem;
|
||||||
|
width: 2.1rem;
|
||||||
|
height: 2.1rem;
|
||||||
|
padding: 0;
|
||||||
|
cursor: pointer;
|
||||||
|
color: var(--_fg);
|
||||||
|
background: transparent;
|
||||||
|
border: 1px solid var(--_border);
|
||||||
|
border-radius: 8px;
|
||||||
|
font: inherit;
|
||||||
|
transition: border-color 0.15s, background 0.15s;
|
||||||
|
}
|
||||||
|
button.trigger:hover { border-color: var(--_accent); }
|
||||||
|
button.trigger:focus-visible {
|
||||||
|
outline: 2px solid var(--_accent);
|
||||||
|
outline-offset: 2px;
|
||||||
|
}
|
||||||
|
button.trigger[aria-expanded="true"] { border-color: var(--_accent); }
|
||||||
|
.bars { display: block; width: 15px; }
|
||||||
|
.bars span {
|
||||||
|
display: block;
|
||||||
|
height: 2px;
|
||||||
|
margin: 3px 0;
|
||||||
|
border-radius: 2px;
|
||||||
|
background: currentColor;
|
||||||
|
}
|
||||||
|
.panel {
|
||||||
|
position: absolute;
|
||||||
|
top: calc(100% + 6px);
|
||||||
|
right: 0;
|
||||||
|
z-index: 1000;
|
||||||
|
min-width: 13rem;
|
||||||
|
max-height: 70vh;
|
||||||
|
overflow-y: auto;
|
||||||
|
padding: 0.3rem;
|
||||||
|
background: var(--_bg);
|
||||||
|
border: 1px solid var(--_border);
|
||||||
|
border-radius: 10px;
|
||||||
|
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.35);
|
||||||
|
}
|
||||||
|
.panel[hidden] { display: none; }
|
||||||
|
a.item, .item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.55rem;
|
||||||
|
padding: 0.45rem 0.6rem;
|
||||||
|
border-radius: 6px;
|
||||||
|
color: var(--_fg);
|
||||||
|
text-decoration: none;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
a.item:hover { background: color-mix(in srgb, var(--_accent) 18%, transparent); }
|
||||||
|
.item.active { color: var(--_accent); font-weight: 600; cursor: default; }
|
||||||
|
.item.dead { opacity: 0.55; cursor: not-allowed; }
|
||||||
|
.icon { font-size: 1rem; line-height: 1; }
|
||||||
|
.dot {
|
||||||
|
width: 6px;
|
||||||
|
height: 6px;
|
||||||
|
margin-left: auto;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: var(--_accent);
|
||||||
|
}
|
||||||
|
.empty {
|
||||||
|
padding: 0.6rem;
|
||||||
|
opacity: 0.7;
|
||||||
|
font-size: 0.85em;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
/* Respect a host that opts out of motion. */
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
button.trigger { transition: none; }
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<button class="trigger" type="button" aria-haspopup="menu" aria-expanded="false">
|
||||||
|
<span class="bars" aria-hidden="true"><span></span><span></span><span></span></span>
|
||||||
|
</button>
|
||||||
|
<div class="panel" role="menu" hidden></div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
class MetaServiceMenu extends HTMLElement {
|
||||||
|
constructor() {
|
||||||
|
super();
|
||||||
|
this.attachShadow({ mode: "open" });
|
||||||
|
this.shadowRoot.innerHTML = TEMPLATE;
|
||||||
|
this._btn = this.shadowRoot.querySelector("button.trigger");
|
||||||
|
this._panel = this.shadowRoot.querySelector(".panel");
|
||||||
|
this._neighbors = [];
|
||||||
|
this._timer = null;
|
||||||
|
this._open = false;
|
||||||
|
|
||||||
|
this._onDocClick = (e) => {
|
||||||
|
if (!this._open) return;
|
||||||
|
if (e.composedPath().includes(this)) return;
|
||||||
|
this._setOpen(false);
|
||||||
|
};
|
||||||
|
this._onKey = (e) => {
|
||||||
|
if (e.key === "Escape" && this._open) {
|
||||||
|
this._setOpen(false);
|
||||||
|
this._btn.focus();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
connectedCallback() {
|
||||||
|
this._btn.title = this.getAttribute("label") || "Services";
|
||||||
|
this._btn.setAttribute("aria-label", this._btn.title);
|
||||||
|
this._btn.addEventListener("click", () => this._setOpen(!this._open));
|
||||||
|
document.addEventListener("click", this._onDocClick);
|
||||||
|
document.addEventListener("keydown", this._onKey);
|
||||||
|
|
||||||
|
this.refresh();
|
||||||
|
this._timer = setInterval(() => this.refresh(), POLL_MS);
|
||||||
|
}
|
||||||
|
|
||||||
|
disconnectedCallback() {
|
||||||
|
if (this._timer) clearInterval(this._timer);
|
||||||
|
this._timer = null;
|
||||||
|
document.removeEventListener("click", this._onDocClick);
|
||||||
|
document.removeEventListener("keydown", this._onKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
get endpoint() {
|
||||||
|
return this.getAttribute("endpoint") || "/api/neighbors";
|
||||||
|
}
|
||||||
|
|
||||||
|
get current() {
|
||||||
|
return this.getAttribute("current") || "";
|
||||||
|
}
|
||||||
|
|
||||||
|
async refresh() {
|
||||||
|
try {
|
||||||
|
const res = await fetch(this.endpoint, {
|
||||||
|
headers: { Accept: "application/json" },
|
||||||
|
});
|
||||||
|
if (!res.ok) throw new Error(String(res.status));
|
||||||
|
const data = await res.json();
|
||||||
|
// `services` is the legacy alias some backends still emit.
|
||||||
|
this._neighbors = data.neighbors || data.services || [];
|
||||||
|
} catch {
|
||||||
|
// Silent: the menu is navigation, not a health indicator. Keep whatever
|
||||||
|
// we last had rather than blanking the list on one failed poll.
|
||||||
|
}
|
||||||
|
this._render();
|
||||||
|
}
|
||||||
|
|
||||||
|
_setOpen(open) {
|
||||||
|
this._open = open;
|
||||||
|
this._panel.hidden = !open;
|
||||||
|
this._btn.setAttribute("aria-expanded", String(open));
|
||||||
|
if (open) this.refresh();
|
||||||
|
}
|
||||||
|
|
||||||
|
_render() {
|
||||||
|
const panel = this._panel;
|
||||||
|
panel.textContent = "";
|
||||||
|
|
||||||
|
const seen = new Set();
|
||||||
|
const rows = [];
|
||||||
|
for (const n of this._neighbors) {
|
||||||
|
const name = n.name || "";
|
||||||
|
if (!name || seen.has(name)) continue;
|
||||||
|
seen.add(name);
|
||||||
|
rows.push(n);
|
||||||
|
}
|
||||||
|
// Always show the host itself, even before its own echo comes back.
|
||||||
|
if (this.current && !seen.has(this.current)) {
|
||||||
|
rows.push({ name: this.current, baseUrl: "" });
|
||||||
|
}
|
||||||
|
rows.sort((a, b) => String(a.name).localeCompare(String(b.name)));
|
||||||
|
|
||||||
|
if (rows.length === 0) {
|
||||||
|
const empty = document.createElement("div");
|
||||||
|
empty.className = "empty";
|
||||||
|
empty.textContent = "No services found";
|
||||||
|
panel.appendChild(empty);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const n of rows) {
|
||||||
|
const isActive = n.name === this.current;
|
||||||
|
let url = n.baseUrl || "";
|
||||||
|
if (typeof this.rewriteUrl === "function") {
|
||||||
|
try {
|
||||||
|
url = this.rewriteUrl(n.name, url, n) || "";
|
||||||
|
} catch {
|
||||||
|
/* a bad hook must not blank the menu */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A neighbour with no reachable URL is shown but not linked — better
|
||||||
|
// than a link that goes nowhere.
|
||||||
|
const el = document.createElement(isActive || !url ? "span" : "a");
|
||||||
|
el.className =
|
||||||
|
"item" + (isActive ? " active" : "") + (!isActive && !url ? " dead" : "");
|
||||||
|
if (el.tagName === "A") {
|
||||||
|
el.href = url;
|
||||||
|
el.setAttribute("role", "menuitem");
|
||||||
|
}
|
||||||
|
if (!isActive && !url) el.title = "No reachable URL announced";
|
||||||
|
|
||||||
|
const icon = document.createElement("span");
|
||||||
|
icon.className = "icon";
|
||||||
|
icon.textContent = ICONS[n.name] || DEFAULT_ICON;
|
||||||
|
|
||||||
|
const label = document.createElement("span");
|
||||||
|
label.textContent = titleCase(n.name);
|
||||||
|
|
||||||
|
el.append(icon, label);
|
||||||
|
if (n.status === "running" || isActive) {
|
||||||
|
const dot = document.createElement("span");
|
||||||
|
dot.className = "dot";
|
||||||
|
dot.title = n.status || "running";
|
||||||
|
el.appendChild(dot);
|
||||||
|
}
|
||||||
|
panel.appendChild(el);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!customElements.get("meta-service-menu")) {
|
||||||
|
customElements.define("meta-service-menu", MetaServiceMenu);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default MetaServiceMenu;
|
||||||
Reference in New Issue
Block a user