@tonk/cli 0.1.2 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAuBlC,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAuBlC,eAAO,MAAM,aAAa,SAuZtB,CAAC"}
|
package/dist/commands/deploy.js
CHANGED
|
@@ -24,6 +24,7 @@ export const deployCommand = new Command('deploy')
|
|
|
24
24
|
.option('-k, --key <path>', 'Path to SSH key file')
|
|
25
25
|
.option('-u, --user <name>', 'SSH username', 'ec2-user')
|
|
26
26
|
.option('-t, --token <token>', 'Pinggy.io access token')
|
|
27
|
+
.option('-b, --backblaze', 'Enable Backblaze B2 storage for document backup')
|
|
27
28
|
.action(async (options) => {
|
|
28
29
|
const projectRoot = process.cwd();
|
|
29
30
|
const configFilePath = path.join(projectRoot, 'tonk.config.json');
|
|
@@ -38,8 +39,9 @@ You can provision a new EC2 instance with 'tonk config --provision' or configure
|
|
|
38
39
|
process.exit(1);
|
|
39
40
|
}
|
|
40
41
|
// Load settings from config file
|
|
42
|
+
let configData;
|
|
41
43
|
try {
|
|
42
|
-
|
|
44
|
+
configData = JSON.parse(fs.readFileSync(configFilePath, 'utf8'));
|
|
43
45
|
// Use config values as defaults if not provided in command options
|
|
44
46
|
if (!options.instance && configData.ec2 && configData.ec2.instance) {
|
|
45
47
|
options.instance = configData.ec2.instance;
|
|
@@ -58,6 +60,11 @@ You can provision a new EC2 instance with 'tonk config --provision' or configure
|
|
|
58
60
|
options.token = configData.pinggy.token;
|
|
59
61
|
console.log(chalk.blue(`Using Pinggy token from config`));
|
|
60
62
|
}
|
|
63
|
+
// Check if Backblaze is already configured
|
|
64
|
+
if (configData.backblaze && configData.backblaze.enabled) {
|
|
65
|
+
options.backblaze = true;
|
|
66
|
+
console.log(chalk.blue(`Backblaze B2 backup enabled from config`));
|
|
67
|
+
}
|
|
61
68
|
}
|
|
62
69
|
catch (error) {
|
|
63
70
|
console.error(chalk.red(`Error: Could not parse config file at ${configFilePath}. Please run 'tonk config' again.`));
|
|
@@ -74,6 +81,42 @@ You can provision a new EC2 instance with 'tonk config --provision' or configure
|
|
|
74
81
|
console.error(chalk.yellow("Please run 'tonk config' again."));
|
|
75
82
|
process.exit(1);
|
|
76
83
|
}
|
|
84
|
+
// If backblaze option wasn't explicitly set
|
|
85
|
+
// ask the user if they want to enable it
|
|
86
|
+
if (options.backblaze === undefined) {
|
|
87
|
+
const enableBackblaze = await promptUser(chalk.yellow('Would you like to enable Backblaze B2 backup for your document data? (yes/no): '));
|
|
88
|
+
options.backblaze = enableBackblaze
|
|
89
|
+
.toLowerCase()
|
|
90
|
+
.startsWith('y');
|
|
91
|
+
if (options.backblaze) {
|
|
92
|
+
console.log(chalk.green('Backblaze B2 backup will be enabled'));
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
console.log(chalk.blue('Backblaze B2 backup will not be enabled'));
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
// Set up Backblaze if requested and not already configured
|
|
99
|
+
if (options.backblaze &&
|
|
100
|
+
(!configData.backblaze || !configData.backblaze.enabled)) {
|
|
101
|
+
console.log(chalk.blue('Setting up Backblaze B2 backup for Automerge documents...'));
|
|
102
|
+
const b2KeyId = await promptUser(chalk.yellow('Enter your Backblaze B2 Application Key ID: '));
|
|
103
|
+
const b2Key = await promptUser(chalk.yellow('Enter your Backblaze B2 Application Key: '));
|
|
104
|
+
const b2BucketId = await promptUser(chalk.yellow('Enter your Backblaze B2 Bucket ID: '));
|
|
105
|
+
const b2BucketName = await promptUser(chalk.yellow('Enter your Backblaze B2 Bucket Name: '));
|
|
106
|
+
// Update config
|
|
107
|
+
configData.backblaze = {
|
|
108
|
+
enabled: true,
|
|
109
|
+
applicationKeyId: b2KeyId,
|
|
110
|
+
applicationKey: b2Key,
|
|
111
|
+
bucketId: b2BucketId,
|
|
112
|
+
bucketName: b2BucketName,
|
|
113
|
+
syncInterval: 5 * 60 * 1000, // 5 minutes default
|
|
114
|
+
maxRetries: 3,
|
|
115
|
+
};
|
|
116
|
+
// Save updated config
|
|
117
|
+
fs.writeFileSync(configFilePath, JSON.stringify(configData, null, 2), 'utf8');
|
|
118
|
+
console.log(chalk.green('Backblaze B2 configuration saved'));
|
|
119
|
+
}
|
|
77
120
|
try {
|
|
78
121
|
// 1. Build the application
|
|
79
122
|
console.log(chalk.blue('Building application...'));
|
|
@@ -105,8 +148,26 @@ You can provision a new EC2 instance with 'tonk config --provision' or configure
|
|
|
105
148
|
// 4. Copy to EC2
|
|
106
149
|
console.log(chalk.blue(`Copying to EC2 instance ${options.instance}...`));
|
|
107
150
|
execSync(`scp -i "${options.key}" "${tarFileName}" ${options.user}@${options.instance}:~/`, { cwd: projectRoot, stdio: 'inherit' });
|
|
151
|
+
// If Backblaze is configured, copy the config too
|
|
152
|
+
if (options.backblaze) {
|
|
153
|
+
execSync(`scp -i "${options.key}" "${configFilePath}" ${options.user}@${options.instance}:~/tonk-app/tonk.config.json`, { cwd: projectRoot, stdio: 'inherit' });
|
|
154
|
+
}
|
|
108
155
|
// 5. SSH into EC2 and deploy with Docker
|
|
109
156
|
console.log(chalk.blue('Deploying on EC2...'));
|
|
157
|
+
// Build the Docker run command with environment variables for Backblaze if configured
|
|
158
|
+
let dockerRunCmd = 'docker run -d --name tonk-app-container -p 8080:8080 -e PORT=8080';
|
|
159
|
+
// Add Backblaze environment variables if enabled
|
|
160
|
+
if (options.backblaze &&
|
|
161
|
+
configData.backblaze &&
|
|
162
|
+
configData.backblaze.enabled) {
|
|
163
|
+
dockerRunCmd += ` -e BACKBLAZE_ENABLED=true`;
|
|
164
|
+
dockerRunCmd += ` -e BACKBLAZE_APP_KEY_ID='${configData.backblaze.applicationKeyId}'`;
|
|
165
|
+
dockerRunCmd += ` -e BACKBLAZE_APP_KEY='${configData.backblaze.applicationKey}'`;
|
|
166
|
+
dockerRunCmd += ` -e BACKBLAZE_BUCKET_ID='${configData.backblaze.bucketId}'`;
|
|
167
|
+
dockerRunCmd += ` -e BACKBLAZE_BUCKET_NAME='${configData.backblaze.bucketName}'`;
|
|
168
|
+
dockerRunCmd += ` -e BACKBLAZE_SYNC_INTERVAL='${configData.backblaze.syncInterval || 300000}'`;
|
|
169
|
+
}
|
|
170
|
+
dockerRunCmd += ' tonk-app';
|
|
110
171
|
const sshCommand = `ssh -i "${options.key}" ${options.user}@${options.instance} '
|
|
111
172
|
mkdir -p tonk-app &&
|
|
112
173
|
tar -xzf ${tarFileName} -C tonk-app --strip-components=1 &&
|
|
@@ -114,7 +175,7 @@ You can provision a new EC2 instance with 'tonk config --provision' or configure
|
|
|
114
175
|
docker build -t tonk-app . &&
|
|
115
176
|
docker stop tonk-app-container || true &&
|
|
116
177
|
docker rm tonk-app-container || true &&
|
|
117
|
-
|
|
178
|
+
${dockerRunCmd} &&
|
|
118
179
|
sudo systemctl restart nginx.service
|
|
119
180
|
'`;
|
|
120
181
|
execSync(sshCommand, { cwd: projectRoot, stdio: 'inherit' });
|
|
@@ -124,6 +185,15 @@ You can provision a new EC2 instance with 'tonk config --provision' or configure
|
|
|
124
185
|
✅ Deployment successful!
|
|
125
186
|
Your app is now running at http://${options.instance}
|
|
126
187
|
`));
|
|
188
|
+
// Print Backblaze info if enabled
|
|
189
|
+
if (options.backblaze &&
|
|
190
|
+
configData.backblaze &&
|
|
191
|
+
configData.backblaze.enabled) {
|
|
192
|
+
console.log(chalk.green(`
|
|
193
|
+
Backblaze B2 backup is enabled for your Automerge documents.
|
|
194
|
+
Documents will be synced to your B2 bucket: ${configData.backblaze.bucketName}
|
|
195
|
+
`));
|
|
196
|
+
}
|
|
127
197
|
// 7. Set up reverse proxy with pinggy.io
|
|
128
198
|
console.log(chalk.blue('Setting up secure public access via pinggy.io...'));
|
|
129
199
|
// Prompt user for Pinggy token if not provided
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAC;AACrC,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,2CAA2C;AAC3C,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC;IAClC,KAAK,EAAE,OAAO,CAAC,KAAK;IACpB,MAAM,EAAE,OAAO,CAAC,MAAM;CACvB,CAAC,CAAC;AAEH,gCAAgC;AAChC,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,EAAE;IACtC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;YAC7B,OAAO,CAAC,MAAM,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC;KAC/C,WAAW,CAAC,0BAA0B,CAAC;KACvC,MAAM,CAAC,0BAA0B,EAAE,sBAAsB,CAAC;KAC1D,MAAM,CAAC,kBAAkB,EAAE,sBAAsB,CAAC;KAClD,MAAM,CAAC,mBAAmB,EAAE,cAAc,EAAE,UAAU,CAAC;KACvD,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC;KACvD,MAAM,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;IACtB,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAClC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;IAElE,8BAA8B;IAC9B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACnC,OAAO,CAAC,KAAK,CACX,KAAK,CAAC,GAAG,CAAC;wCACsB,cAAc;;;;SAI7C,CAAC,CACH,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,iCAAiC;IACjC,IAAI,CAAC;QACH,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAMlC,eAAO,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAMlC,eAAO,MAAM,YAAY,SAuHrB,CAAC"}
|
package/dist/commands/serve.js
CHANGED
|
@@ -7,12 +7,14 @@ export const serveCommand = new Command('serve')
|
|
|
7
7
|
.description('Start a Tonk app in production mode')
|
|
8
8
|
.option('-p, --port <port>', 'Port to run the server on', '8080')
|
|
9
9
|
.option('-d, --dist <path>', 'Path to the dist directory', 'dist')
|
|
10
|
+
.option('-b, --backblaze', 'Enable Backblaze B2 storage for document backup')
|
|
10
11
|
.action(async (options) => {
|
|
11
12
|
const projectRoot = process.cwd();
|
|
12
13
|
const port = parseInt(options.port, 10);
|
|
13
14
|
const distPath = path.isAbsolute(options.dist)
|
|
14
15
|
? options.dist
|
|
15
16
|
: path.join(projectRoot, options.dist);
|
|
17
|
+
const configFilePath = path.join(projectRoot, 'tonk.config.json');
|
|
16
18
|
// Check if the dist directory exists
|
|
17
19
|
if (!fs.existsSync(distPath)) {
|
|
18
20
|
console.error(chalk.red(`Error: Dist directory not found at ${distPath}. Make sure you've built the project first.`));
|
|
@@ -25,17 +27,56 @@ export const serveCommand = new Command('serve')
|
|
|
25
27
|
console.error(chalk.red(`Error: index.html not found in ${distPath}. The build output may be incomplete.`));
|
|
26
28
|
process.exit(1);
|
|
27
29
|
}
|
|
30
|
+
// Check for Backblaze configuration
|
|
31
|
+
let backblazeConfig = null;
|
|
32
|
+
if (options.backblaze || fs.existsSync(configFilePath)) {
|
|
33
|
+
try {
|
|
34
|
+
if (fs.existsSync(configFilePath)) {
|
|
35
|
+
const configData = JSON.parse(fs.readFileSync(configFilePath, 'utf8'));
|
|
36
|
+
// If backblaze is configured and enabled in the config file
|
|
37
|
+
if (configData.backblaze && configData.backblaze.enabled) {
|
|
38
|
+
backblazeConfig = {
|
|
39
|
+
enabled: true,
|
|
40
|
+
applicationKeyId: configData.backblaze.applicationKeyId,
|
|
41
|
+
applicationKey: configData.backblaze.applicationKey,
|
|
42
|
+
bucketId: configData.backblaze.bucketId,
|
|
43
|
+
bucketName: configData.backblaze.bucketName,
|
|
44
|
+
syncInterval: configData.backblaze.syncInterval || 300000, // 5 minutes default
|
|
45
|
+
maxRetries: configData.backblaze.maxRetries || 3,
|
|
46
|
+
};
|
|
47
|
+
console.log(chalk.blue('Backblaze B2 backup enabled from config'));
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
catch (error) {
|
|
52
|
+
console.warn(chalk.yellow(`Warning: Could not parse config file at ${configFilePath}. Backblaze backup will not be enabled.`));
|
|
53
|
+
console.warn(chalk.yellow(`Error details: ${error}`));
|
|
54
|
+
}
|
|
55
|
+
}
|
|
28
56
|
console.log(chalk.blue('Starting Tonk production server...'));
|
|
29
57
|
try {
|
|
30
|
-
// Start the production server
|
|
31
|
-
const
|
|
58
|
+
// Start the production server with Backblaze config if available
|
|
59
|
+
const serverConfig = {
|
|
32
60
|
port,
|
|
33
61
|
mode: 'production',
|
|
34
62
|
distPath,
|
|
35
63
|
verbose: true,
|
|
36
|
-
}
|
|
64
|
+
};
|
|
65
|
+
// Add Backblaze configuration if available
|
|
66
|
+
if (backblazeConfig) {
|
|
67
|
+
serverConfig.storage = {
|
|
68
|
+
backblaze: backblazeConfig,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
const server = await createServer(serverConfig);
|
|
37
72
|
// Log success info
|
|
38
73
|
console.log(chalk.green(`Server running at http://localhost:${port}`));
|
|
74
|
+
if (backblazeConfig) {
|
|
75
|
+
console.log(chalk.green(`
|
|
76
|
+
Backblaze B2 backup is enabled for your Automerge documents.
|
|
77
|
+
Documents will be synced to your B2 bucket: ${backblazeConfig.bucketName}
|
|
78
|
+
`));
|
|
79
|
+
}
|
|
39
80
|
console.log(chalk.blue('Press Ctrl+C to stop the server'));
|
|
40
81
|
// Handle process termination
|
|
41
82
|
const cleanup = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAC,YAAY,EAAC,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC;KAC7C,WAAW,CAAC,qCAAqC,CAAC;KAClD,MAAM,CAAC,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,CAAC;KAChE,MAAM,CAAC,mBAAmB,EAAE,4BAA4B,EAAE,MAAM,CAAC;KACjE,MAAM,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;IACtB,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAClC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;QAC5C,CAAC,CAAC,OAAO,CAAC,IAAI;QACd,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"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"}
|