Improve
This commit is contained in:
parent
37f1f6ac01
commit
450e62dd25
3 changed files with 144 additions and 228 deletions
|
|
@ -15,9 +15,7 @@ LABEL org.opencontainers.image.source="https://github.com/schmelczer/vault-link"
|
|||
LABEL org.opencontainers.image.licenses="MIT"
|
||||
LABEL org.opencontainers.image.authors="andras@schmelczer.dev"
|
||||
|
||||
|
||||
|
||||
COPY --from=builder --chown=vaultlink:vaultlink /build/local-client-cli/dist/cli.js /app/cli.js
|
||||
COPY --from=builder /build/local-client-cli/dist/cli.js /app/cli.js
|
||||
|
||||
WORKDIR /vault
|
||||
|
||||
|
|
|
|||
|
|
@ -1,57 +1,23 @@
|
|||
# VaultLink Local CLI
|
||||
|
||||
A standalone command-line interface for syncing VaultLink vaults to your local filesystem. This CLI wraps the VaultLink sync client and provides file watching capabilities for real-time synchronization.
|
||||
|
||||
## Features
|
||||
|
||||
- Real-time bidirectional sync between local filesystem and VaultLink server
|
||||
- File watching with automatic change detection
|
||||
- Cross-platform support (Linux, macOS, Windows)
|
||||
- Configuration via command-line arguments or JSON file
|
||||
- Comprehensive error handling and logging
|
||||
- Graceful shutdown on SIGINT/SIGTERM
|
||||
Standalone CLI for syncing VaultLink vaults to local filesystem with real-time bidirectional sync and file watching.
|
||||
|
||||
## Installation
|
||||
|
||||
### Using Docker (Recommended)
|
||||
|
||||
The easiest way to run VaultLink CLI is using Docker:
|
||||
### Docker (Recommended)
|
||||
|
||||
```bash
|
||||
docker pull ghcr.io/schmelczer/vault-link-cli:latest
|
||||
|
||||
# Run with all options via command line
|
||||
docker run -v /path/to/vault:/vault \
|
||||
ghcr.io/schmelczer/vault-link-cli:latest \
|
||||
-l /vault \
|
||||
-r https://sync.example.com \
|
||||
-r wss://sync.example.com \
|
||||
-t your-auth-token \
|
||||
-v default
|
||||
|
||||
# Or use a config file
|
||||
docker run -v /path/to/vault:/vault \
|
||||
-v /path/to/config.json:/config.json \
|
||||
ghcr.io/schmelczer/vault-link-cli:latest \
|
||||
-l /vault \
|
||||
-c /config.json
|
||||
```
|
||||
|
||||
### Using Docker Compose
|
||||
|
||||
```yaml
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
vaultlink-cli:
|
||||
image: ghcr.io/schmelczer/vault-link-cli:latest
|
||||
volumes:
|
||||
- ./vault:/vault
|
||||
- ./config.json:/config.json
|
||||
command: -l /vault -c /config.json
|
||||
restart: unless-stopped
|
||||
```
|
||||
|
||||
### From npm Package
|
||||
### npm
|
||||
|
||||
```bash
|
||||
npm install -g @schmelczer/local-client-cli
|
||||
|
|
@ -69,220 +35,172 @@ node dist/cli.js --help
|
|||
|
||||
## Usage
|
||||
|
||||
### Basic Usage
|
||||
|
||||
```bash
|
||||
vaultlink \
|
||||
--local-path ./my-vault \
|
||||
--remote-uri https://sync.example.com \
|
||||
--local-path ./vault \
|
||||
--remote-uri wss://sync.example.com \
|
||||
--token your-auth-token \
|
||||
--vault-name default
|
||||
```
|
||||
|
||||
### Using a Configuration File
|
||||
## Options
|
||||
|
||||
Create a `config.json` file:
|
||||
### Required
|
||||
|
||||
```json
|
||||
{
|
||||
"remoteUri": "https://sync.example.com",
|
||||
"token": "your-auth-token",
|
||||
"vaultName": "default",
|
||||
"syncConcurrency": 1,
|
||||
"maxFileSizeMB": 10,
|
||||
"ignorePatterns": [".git/**", "*.tmp"],
|
||||
"webSocketRetryIntervalMs": 3500
|
||||
}
|
||||
```
|
||||
| Option | Description |
|
||||
|--------|-------------|
|
||||
| `-l, --local-path <path>` | Local directory to sync |
|
||||
| `-r, --remote-uri <uri>` | Remote server WebSocket URI (ws:// or wss://) |
|
||||
| `-t, --token <token>` | Authentication token |
|
||||
| `-v, --vault-name <name>` | Vault name on server |
|
||||
|
||||
Then run:
|
||||
### Optional
|
||||
|
||||
```bash
|
||||
vaultlink --local-path ./my-vault --config config.json
|
||||
```
|
||||
| Option | Default | Description |
|
||||
|--------|---------|-------------|
|
||||
| `--sync-concurrency <number>` | `1` | Concurrent sync operations |
|
||||
| `--max-file-size-mb <number>` | `10` | Maximum file size in MB |
|
||||
| `--ignore-pattern <pattern>` | - | Glob pattern to ignore (repeatable) |
|
||||
| `--websocket-retry-interval-ms <ms>` | `3500` | WebSocket reconnection interval |
|
||||
| `--log-level <level>` | `INFO` | Log level: DEBUG, INFO, WARNING, ERROR |
|
||||
| `-h, --help` | - | Show help |
|
||||
| `-V, --version` | - | Show version |
|
||||
|
||||
### Command-Line Options
|
||||
### Auto-Ignored Patterns
|
||||
|
||||
#### Required Arguments
|
||||
|
||||
- `-l, --local-path <PATH>` - Local directory path to sync
|
||||
- `-r, --remote-uri <URI>` - Remote server URI (unless using --config)
|
||||
- `-t, --token <TOKEN>` - Authentication token (unless using --config)
|
||||
- `-v, --vault-name <NAME>` - Vault name (unless using --config)
|
||||
|
||||
#### Optional Arguments
|
||||
|
||||
- `-c, --config <FILE>` - Load configuration from JSON file
|
||||
- `--sync-concurrency <NUM>` - Number of concurrent sync operations (default: 1)
|
||||
- `--max-file-size-mb <NUM>` - Maximum file size in MB (default: 10)
|
||||
- `--ignore-pattern <PATTERN>` - Pattern to ignore (can be used multiple times)
|
||||
- `--websocket-retry-interval-ms <NUM>` - WebSocket retry interval in ms (default: 3500)
|
||||
- `-h, --help` - Print help message
|
||||
- `-V, --version` - Print version
|
||||
|
||||
### Ignore Patterns
|
||||
|
||||
Ignore patterns support glob syntax. The CLI automatically ignores:
|
||||
|
||||
- `.vaultlink/**` - Internal sync data directory
|
||||
- `.vaultlink/**` - Internal sync metadata
|
||||
- `.git/**` - Git repository files
|
||||
|
||||
You can add additional patterns:
|
||||
### Examples
|
||||
|
||||
Basic usage:
|
||||
```bash
|
||||
vaultlink \
|
||||
--local-path ./my-vault \
|
||||
--remote-uri https://sync.example.com \
|
||||
--token mytoken \
|
||||
--vault-name default \
|
||||
vaultlink -l ./vault -r wss://sync.example.com -t token123 -v default
|
||||
```
|
||||
|
||||
With ignore patterns:
|
||||
```bash
|
||||
vaultlink -l ./vault -r wss://sync.example.com -t token123 -v default \
|
||||
--ignore-pattern "*.tmp" \
|
||||
--ignore-pattern ".DS_Store" \
|
||||
--ignore-pattern "node_modules/**"
|
||||
```
|
||||
|
||||
With debug logging:
|
||||
```bash
|
||||
vaultlink -l ./vault -r wss://sync.example.com -t token123 -v default \
|
||||
--log-level DEBUG
|
||||
```
|
||||
|
||||
## Docker Deployment
|
||||
|
||||
### Self-Hosting with Docker
|
||||
|
||||
The CLI is designed to run as a long-lived container:
|
||||
### Docker Run
|
||||
|
||||
```bash
|
||||
# Create a vault directory
|
||||
mkdir -p ./vault
|
||||
|
||||
# Create config.json
|
||||
cat > config.json <<EOF
|
||||
{
|
||||
"remoteUri": "https://your-server.com",
|
||||
"token": "your-token",
|
||||
"vaultName": "default"
|
||||
}
|
||||
EOF
|
||||
|
||||
# Run the container
|
||||
docker run -d \
|
||||
--name vaultlink-sync \
|
||||
--restart unless-stopped \
|
||||
-v $(pwd)/vault:/vault \
|
||||
-v $(pwd)/config.json:/config.json \
|
||||
ghcr.io/schmelczer/vault-link-cli:latest \
|
||||
-l /vault -c /config.json
|
||||
-l /vault \
|
||||
-r wss://your-server.com \
|
||||
-t your-token \
|
||||
-v default
|
||||
```
|
||||
|
||||
### Kubernetes Deployment
|
||||
### Docker Compose
|
||||
|
||||
```yaml
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: vaultlink-cli
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: vaultlink-cli
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: vaultlink-cli
|
||||
spec:
|
||||
containers:
|
||||
- name: vaultlink-cli
|
||||
image: ghcr.io/schmelczer/vault-link-cli:latest
|
||||
args:
|
||||
- "-l"
|
||||
- "/vault"
|
||||
- "-c"
|
||||
- "/config/config.json"
|
||||
volumeMounts:
|
||||
- name: vault
|
||||
mountPath: /vault
|
||||
- name: config
|
||||
mountPath: /config
|
||||
volumes:
|
||||
- name: vault
|
||||
persistentVolumeClaim:
|
||||
claimName: vaultlink-pvc
|
||||
- name: config
|
||||
configMap:
|
||||
name: vaultlink-config
|
||||
services:
|
||||
vaultlink-cli:
|
||||
image: ghcr.io/schmelczer/vault-link-cli:latest
|
||||
volumes:
|
||||
- ./vault:/vault
|
||||
command:
|
||||
- "-l"
|
||||
- "/vault"
|
||||
- "-r"
|
||||
- "wss://sync.example.com"
|
||||
- "-t"
|
||||
- "your-token"
|
||||
- "-v"
|
||||
- "default"
|
||||
restart: unless-stopped
|
||||
```
|
||||
|
||||
## How It Works
|
||||
## Health Monitoring
|
||||
|
||||
1. **Initialization**: The CLI creates a `.vaultlink` directory in your local path to store sync metadata and state
|
||||
2. **Initial Sync**: On first run, all local files are synced to the server
|
||||
3. **File Watching**: The CLI watches for file system changes using Node's `fs.watch` API
|
||||
4. **Real-time Sync**: Any local changes are automatically synced to the server, and server changes are applied locally
|
||||
5. **Graceful Shutdown**: On Ctrl+C or termination signals, the CLI waits for pending operations to complete
|
||||
The Docker container includes a built-in healthcheck that monitors the WebSocket connection to the server.
|
||||
|
||||
### Healthcheck Configuration
|
||||
|
||||
- **Interval**: 30 seconds
|
||||
- **Timeout**: 10 seconds
|
||||
- **Start period**: 30 seconds (grace period for initial connection)
|
||||
- **Retries**: 3 failed checks before marking unhealthy
|
||||
|
||||
### How It Works
|
||||
|
||||
The CLI writes connection status to `/tmp/vaultlink-health.json` every 10 seconds and whenever the WebSocket connection status changes. The healthcheck script verifies:
|
||||
|
||||
1. The health file exists
|
||||
2. The status is recent (updated within last 30 seconds)
|
||||
3. The WebSocket connection is active
|
||||
|
||||
### Checking Container Health
|
||||
|
||||
```bash
|
||||
# View health status
|
||||
docker ps
|
||||
|
||||
# View detailed health check logs
|
||||
docker inspect --format='{{json .State.Health}}' vaultlink-sync | jq
|
||||
```
|
||||
|
||||
### Custom Healthcheck
|
||||
|
||||
To override the default healthcheck in docker-compose.yml:
|
||||
|
||||
```yaml
|
||||
services:
|
||||
vaultlink-cli:
|
||||
image: ghcr.io/schmelczer/vault-link-cli:latest
|
||||
healthcheck:
|
||||
test: ["CMD", "node", "/app/healthcheck.js"]
|
||||
interval: 15s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 20s
|
||||
```
|
||||
|
||||
## Development
|
||||
|
||||
### Building
|
||||
|
||||
Build:
|
||||
```bash
|
||||
npm run build
|
||||
# or from the parent folder, run
|
||||
docker build -f local-client-cli/Dockerfile .
|
||||
```
|
||||
|
||||
### Development Mode with Watch
|
||||
|
||||
```bash
|
||||
npm run dev
|
||||
```
|
||||
|
||||
### Running Tests
|
||||
|
||||
Test:
|
||||
```bash
|
||||
npm test
|
||||
```
|
||||
|
||||
Tests cover:
|
||||
- Filesystem operations (read, write, delete, rename, etc.)
|
||||
- CLI argument parsing and validation
|
||||
- Cross-platform path handling
|
||||
- Error handling
|
||||
Docker build:
|
||||
```bash
|
||||
cd frontend
|
||||
docker build -f local-client-cli/Dockerfile -t vault-link-cli:test .
|
||||
```
|
||||
|
||||
## Architecture
|
||||
## How It Works
|
||||
|
||||
The CLI consists of several key components:
|
||||
1. Creates `.vaultlink` directory for sync metadata
|
||||
2. Performs initial sync of local files to server
|
||||
3. Watches filesystem for changes using Node's `fs.watch`
|
||||
4. Syncs changes bidirectionally in real-time
|
||||
5. Handles graceful shutdown on SIGINT/SIGTERM
|
||||
|
||||
- **`cli.ts`**: Main entry point, orchestrates initialization and lifecycle
|
||||
- **`node-filesystem.ts`**: Node.js filesystem adapter implementing the `FileSystemOperations` interface with cross-platform path normalization
|
||||
- **`file-watcher.ts`**: Watches filesystem changes and triggers sync operations
|
||||
- **`args.ts`**: Command-line argument parser using `commander` library
|
||||
- **`config-loader.ts`**: JSON configuration file loader and merger
|
||||
|
||||
### Dependencies
|
||||
|
||||
- **commander**: Industry-standard CLI argument parsing with built-in help generation and validation
|
||||
- **sync-client**: Core VaultLink synchronization library
|
||||
|
||||
### Path Handling
|
||||
|
||||
The filesystem adapter ensures cross-platform compatibility by:
|
||||
- **API Contract**: Always accepts forward slashes (`/`) as input
|
||||
- **API Contract**: Always returns forward slashes (`/`) as output
|
||||
- **Implementation**: Converts between forward slashes and platform-native separators internally
|
||||
- **Windows Support**: Automatically converts `/` to `\` on Windows for filesystem operations
|
||||
|
||||
## Error Handling
|
||||
|
||||
The CLI provides robust error handling:
|
||||
|
||||
- Invalid arguments result in clear error messages and exit code 1
|
||||
- Connection failures are reported before starting sync
|
||||
- File operation errors are logged with context
|
||||
- Graceful shutdown ensures no data loss on termination
|
||||
|
||||
## Cross-Platform Support
|
||||
|
||||
The CLI is built with cross-platform compatibility:
|
||||
|
||||
- Uses Node's `path` module for platform-agnostic path handling
|
||||
- Automatically detects platform line endings (CRLF on Windows, LF on Unix)
|
||||
- File watching works on all platforms through Node's native `fs.watch`
|
||||
- Compiled with Webpack for Node target, ensuring broad compatibility
|
||||
- Path normalization ensures consistent behavior across Windows, macOS, and Linux
|
||||
## License
|
||||
|
||||
MIT
|
||||
|
|
|
|||
|
|
@ -2,29 +2,29 @@ const path = require("path");
|
|||
const webpack = require("webpack");
|
||||
|
||||
module.exports = {
|
||||
entry: "./src/cli.ts",
|
||||
target: "node",
|
||||
mode: "production",
|
||||
optimization: {
|
||||
minimize: false
|
||||
},
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /\.ts$/,
|
||||
use: "ts-loader"
|
||||
}
|
||||
]
|
||||
},
|
||||
resolve: {
|
||||
extensions: [".ts", ".js"]
|
||||
},
|
||||
output: {
|
||||
globalObject: "this",
|
||||
filename: "cli.js",
|
||||
path: path.resolve(__dirname, "dist")
|
||||
},
|
||||
plugins: [
|
||||
entry: "./src/cli.ts",
|
||||
target: "node",
|
||||
mode: "production",
|
||||
optimization: {
|
||||
minimize: false
|
||||
},
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /\.ts$/,
|
||||
use: "ts-loader"
|
||||
}
|
||||
]
|
||||
},
|
||||
resolve: {
|
||||
extensions: [".ts", ".js"]
|
||||
},
|
||||
output: {
|
||||
globalObject: "this",
|
||||
filename: "cli.js",
|
||||
path: path.resolve(__dirname, "dist")
|
||||
},
|
||||
plugins: [
|
||||
new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
|
||||
]
|
||||
]
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue