@minecraft-docker/mcctl 1.6.15 → 1.6.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/README.md +19 -21
- package/dist/commands/index.d.ts +1 -0
- package/dist/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +1 -0
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/update.d.ts +13 -0
- package/dist/commands/update.d.ts.map +1 -0
- package/dist/commands/update.js +117 -0
- package/dist/commands/update.js.map +1 -0
- package/dist/index.js +16 -2
- package/dist/index.js.map +1 -1
- package/dist/lib/update-checker.d.ts +23 -0
- package/dist/lib/update-checker.d.ts.map +1 -1
- package/dist/lib/update-checker.js +66 -5
- package/dist/lib/update-checker.js.map +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
|
|
|
5
5
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|
6
6
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
7
7
|
|
|
8
|
+
## [1.6.16] - 2026-01-31
|
|
9
|
+
|
|
10
|
+
### Changed
|
|
11
|
+
- Add README Changelog sync instructions to release-manager and technical-writer agents
|
|
12
|
+
- Ensure npm package page displays latest changelog entries in README.md
|
|
13
|
+
|
|
8
14
|
## [1.6.15] - 2026-01-31
|
|
9
15
|
|
|
10
16
|
### Added
|
package/README.md
CHANGED
|
@@ -73,27 +73,25 @@ mcctl logs myserver
|
|
|
73
73
|
|
|
74
74
|
## Changelog
|
|
75
75
|
|
|
76
|
-
### v1.6.
|
|
77
|
-
- **
|
|
78
|
-
- **
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
- **
|
|
89
|
-
|
|
90
|
-
### v1.
|
|
91
|
-
- **
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
- **feat**: World management commands (`mcctl world new/assign/release`)
|
|
96
|
-
- **feat**: Server backup and restore functionality
|
|
76
|
+
### v1.6.16 (2026-01-31)
|
|
77
|
+
- **chore**: Add README Changelog sync instructions to agent definitions
|
|
78
|
+
- **chore**: Ensure npm package page displays latest changelog entries
|
|
79
|
+
|
|
80
|
+
### v1.6.15 (2026-01-31)
|
|
81
|
+
- **feat**: New `mcctl backup init` command for interactive GitHub backup setup
|
|
82
|
+
- **fix**: Include `scripts/` directory in npm package for template initialization
|
|
83
|
+
|
|
84
|
+
### v1.6.14 (2026-01-31)
|
|
85
|
+
- **fix**: Sync all package versions to tag version before npm publish
|
|
86
|
+
|
|
87
|
+
### v1.6.13 (2026-01-31)
|
|
88
|
+
- **fix**: Sync CHANGELOG.md to CLI package for npm page display
|
|
89
|
+
|
|
90
|
+
### v1.6.12 (2026-01-31)
|
|
91
|
+
- **fix(critical)**: Add missing `EXTRA_ARGS=--universe /worlds/` to npm package template
|
|
92
|
+
|
|
93
|
+
### v1.6.11 (2026-01-31)
|
|
94
|
+
- **fix**: Include CHANGELOG.md in npm package for proper changelog display
|
|
97
95
|
|
|
98
96
|
[Full Changelog](https://github.com/smallmiro/minecraft-server-manager/releases)
|
|
99
97
|
|
package/dist/commands/index.d.ts
CHANGED
|
@@ -16,6 +16,7 @@ export { playerOnlineCommand, type PlayerOnlineCommandOptions } from './player-o
|
|
|
16
16
|
export { playerCommand, type PlayerCommandOptions } from './player.js';
|
|
17
17
|
export { migrateCommand, type MigrateCommandOptions } from './migrate.js';
|
|
18
18
|
export { modCommand, type ModCommandOptions } from './mod.js';
|
|
19
|
+
export { updateCommand, type UpdateCommandOptions } from './update.js';
|
|
19
20
|
export { consoleInitCommand, consoleServiceCommand, consoleUserCommand, consoleApiCommand, consoleRemoveCommand, deleteAdminImages, type ConsoleInitOptions, type ConsoleServiceOptions, type ConsoleUserCommandOptions, type ConsoleApiCommandOptions, type ConsoleRemoveOptions, } from './console/index.js';
|
|
20
21
|
export { adminInitCommand, adminServiceCommand, adminUserCommand, adminApiCommand, type AdminInitOptions, type AdminServiceOptions, type AdminUserCommandOptions, type AdminApiCommandOptions, } from './console/index.js';
|
|
21
22
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,KAAK,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,KAAK,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,KAAK,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,KAAK,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,KAAK,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,KAAK,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGvE,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,EACjB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,GAC1B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,GAC5B,MAAM,oBAAoB,CAAC"}
|
package/dist/commands/index.js
CHANGED
|
@@ -16,6 +16,7 @@ export { playerOnlineCommand } from './player-online.js';
|
|
|
16
16
|
export { playerCommand } from './player.js';
|
|
17
17
|
export { migrateCommand } from './migrate.js';
|
|
18
18
|
export { modCommand } from './mod.js';
|
|
19
|
+
export { updateCommand } from './update.js';
|
|
19
20
|
// Console commands (new names)
|
|
20
21
|
export { consoleInitCommand, consoleServiceCommand, consoleUserCommand, consoleApiCommand, consoleRemoveCommand, deleteAdminImages, } from './console/index.js';
|
|
21
22
|
// Backward compatibility aliases (deprecated - use console* instead)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,YAAY,EAA4B,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,WAAW,EAA2B,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,SAAS,EAAyB,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAA4B,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAA6B,MAAM,qBAAqB,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAgC,MAAM,gBAAgB,CAAC;AAChF,OAAO,EAAE,UAAU,EAA0B,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,WAAW,EAA2B,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAmC,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,cAAc,EAA8B,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,UAAU,EAA0B,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,YAAY,EAA4B,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,WAAW,EAA2B,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,SAAS,EAAyB,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAA4B,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAA6B,MAAM,qBAAqB,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAgC,MAAM,gBAAgB,CAAC;AAChF,OAAO,EAAE,UAAU,EAA0B,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,WAAW,EAA2B,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAmC,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,cAAc,EAA8B,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,UAAU,EAA0B,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAC;AAEvE,+BAA+B;AAC/B,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,GAMlB,MAAM,oBAAoB,CAAC;AAE5B,qEAAqE;AACrE,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,GAKhB,MAAM,oBAAoB,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Update command options
|
|
3
|
+
*/
|
|
4
|
+
export interface UpdateCommandOptions {
|
|
5
|
+
check?: boolean;
|
|
6
|
+
force?: boolean;
|
|
7
|
+
yes?: boolean;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Execute update command
|
|
11
|
+
*/
|
|
12
|
+
export declare function updateCommand(options: UpdateCommandOptions): Promise<number>;
|
|
13
|
+
//# sourceMappingURL=update.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAaA;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAyCD;;GAEG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4FlF"}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
import { log, colors } from '@minecraft-docker/shared';
|
|
2
|
+
import { getInstalledVersion, fetchLatestVersionForced, getCachedVersion, clearCache, isUpdateAvailable, } from '../lib/update-checker.js';
|
|
3
|
+
import { spawnSync } from 'child_process';
|
|
4
|
+
import * as prompts from '@clack/prompts';
|
|
5
|
+
const PACKAGE_NAME = '@minecraft-docker/mcctl';
|
|
6
|
+
/**
|
|
7
|
+
* Print version comparison box
|
|
8
|
+
*/
|
|
9
|
+
function printVersionInfo(currentVersion, latestVersion, hasUpdate) {
|
|
10
|
+
console.log('');
|
|
11
|
+
console.log(colors.bold('mcctl Version Info'));
|
|
12
|
+
console.log('');
|
|
13
|
+
console.log(` Installed: ${colors.cyan(currentVersion)}`);
|
|
14
|
+
console.log(` Latest: ${hasUpdate ? colors.yellow(latestVersion) : colors.green(latestVersion)}`);
|
|
15
|
+
console.log('');
|
|
16
|
+
if (hasUpdate) {
|
|
17
|
+
console.log(colors.yellow(` Update available: ${currentVersion} → ${latestVersion}`));
|
|
18
|
+
console.log('');
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
console.log(colors.green(' You are using the latest version.'));
|
|
22
|
+
console.log('');
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Execute npm install command using spawnSync (safe, no shell injection)
|
|
27
|
+
*/
|
|
28
|
+
function runNpmInstall() {
|
|
29
|
+
console.log('');
|
|
30
|
+
console.log(colors.dim(`Running: npm install -g ${PACKAGE_NAME}`));
|
|
31
|
+
console.log('');
|
|
32
|
+
const result = spawnSync('npm', ['install', '-g', PACKAGE_NAME], {
|
|
33
|
+
stdio: 'inherit',
|
|
34
|
+
});
|
|
35
|
+
return result.status === 0;
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Execute update command
|
|
39
|
+
*/
|
|
40
|
+
export async function updateCommand(options) {
|
|
41
|
+
const currentVersion = getInstalledVersion();
|
|
42
|
+
// If --force, clear cache first
|
|
43
|
+
if (options.force) {
|
|
44
|
+
clearCache();
|
|
45
|
+
}
|
|
46
|
+
// Get latest version
|
|
47
|
+
let latestVersion;
|
|
48
|
+
if (options.force) {
|
|
49
|
+
// Force fetch from npm
|
|
50
|
+
const spinner = prompts.spinner();
|
|
51
|
+
spinner.start('Checking for updates...');
|
|
52
|
+
latestVersion = await fetchLatestVersionForced();
|
|
53
|
+
if (!latestVersion) {
|
|
54
|
+
spinner.stop('Failed to fetch latest version from npm registry');
|
|
55
|
+
return 1;
|
|
56
|
+
}
|
|
57
|
+
spinner.stop('Version check complete');
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
// Try cache first, then fetch
|
|
61
|
+
latestVersion = getCachedVersion();
|
|
62
|
+
if (!latestVersion) {
|
|
63
|
+
const spinner = prompts.spinner();
|
|
64
|
+
spinner.start('Checking for updates...');
|
|
65
|
+
latestVersion = await fetchLatestVersionForced();
|
|
66
|
+
if (!latestVersion) {
|
|
67
|
+
spinner.stop('Failed to fetch latest version from npm registry');
|
|
68
|
+
return 1;
|
|
69
|
+
}
|
|
70
|
+
spinner.stop('Version check complete');
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
const hasUpdate = isUpdateAvailable(currentVersion, latestVersion);
|
|
74
|
+
// Print version info
|
|
75
|
+
printVersionInfo(currentVersion, latestVersion, hasUpdate);
|
|
76
|
+
// If --check, just show info and exit
|
|
77
|
+
if (options.check) {
|
|
78
|
+
return hasUpdate ? 1 : 0; // Exit code 1 if update available (useful for scripts)
|
|
79
|
+
}
|
|
80
|
+
// If no update available, we're done
|
|
81
|
+
if (!hasUpdate) {
|
|
82
|
+
return 0;
|
|
83
|
+
}
|
|
84
|
+
// Ask user if they want to update (unless --yes)
|
|
85
|
+
if (!options.yes) {
|
|
86
|
+
const confirm = await prompts.confirm({
|
|
87
|
+
message: `Update mcctl to ${latestVersion}?`,
|
|
88
|
+
});
|
|
89
|
+
if (prompts.isCancel(confirm) || !confirm) {
|
|
90
|
+
console.log('');
|
|
91
|
+
console.log(colors.dim('Update cancelled.'));
|
|
92
|
+
console.log('');
|
|
93
|
+
console.log(` To update manually, run:`);
|
|
94
|
+
console.log(colors.cyan(` npm install -g ${PACKAGE_NAME}`));
|
|
95
|
+
console.log('');
|
|
96
|
+
return 0;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
// Run npm install
|
|
100
|
+
const success = runNpmInstall();
|
|
101
|
+
if (success) {
|
|
102
|
+
console.log('');
|
|
103
|
+
console.log(colors.green('✓ mcctl updated successfully!'));
|
|
104
|
+
console.log('');
|
|
105
|
+
// Clear cache after successful update
|
|
106
|
+
clearCache();
|
|
107
|
+
return 0;
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
console.log('');
|
|
111
|
+
log.error('Update failed. Try running manually:');
|
|
112
|
+
console.log(colors.cyan(` sudo npm install -g ${PACKAGE_NAME}`));
|
|
113
|
+
console.log('');
|
|
114
|
+
return 1;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
//# sourceMappingURL=update.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { Paths, log, colors } from '@minecraft-docker/shared';
|
|
3
|
-
import { initCommand, statusCommand, createCommand, deleteCommand, worldCommand, backupCommand, execCommand, configCommand, opCommand, serverBackupCommand, serverRestoreCommand, whitelistCommand, banCommand, kickCommand, playerOnlineCommand, playerCommand, migrateCommand, modCommand, consoleInitCommand, consoleServiceCommand, consoleUserCommand, consoleApiCommand, consoleRemoveCommand, } from './commands/index.js';
|
|
3
|
+
import { initCommand, statusCommand, createCommand, deleteCommand, worldCommand, backupCommand, execCommand, configCommand, opCommand, serverBackupCommand, serverRestoreCommand, whitelistCommand, banCommand, kickCommand, playerOnlineCommand, playerCommand, migrateCommand, modCommand, updateCommand, consoleInitCommand, consoleServiceCommand, consoleUserCommand, consoleApiCommand, consoleRemoveCommand, } from './commands/index.js';
|
|
4
4
|
import { ShellExecutor } from './lib/shell.js';
|
|
5
5
|
import { checkForUpdates } from './lib/update-checker.js';
|
|
6
6
|
import { readFileSync } from 'fs';
|
|
@@ -192,6 +192,12 @@ ${colors.cyan('Migration:')}
|
|
|
192
192
|
${colors.bold('migrate worlds')} --all Migrate all servers
|
|
193
193
|
${colors.bold('migrate worlds')} --dry-run Preview changes without applying
|
|
194
194
|
|
|
195
|
+
${colors.cyan('Self Update:')}
|
|
196
|
+
${colors.bold('update')} Check and update mcctl to latest version
|
|
197
|
+
${colors.bold('update')} --check Check for updates only (no install)
|
|
198
|
+
${colors.bold('update')} --force Force check (ignore cache)
|
|
199
|
+
${colors.bold('update')} --yes Auto-confirm update
|
|
200
|
+
|
|
195
201
|
${colors.cyan('Console Management:')}
|
|
196
202
|
${colors.bold('console init')} [options] Initialize console service (create admin user)
|
|
197
203
|
--force Reinitialize (delete existing config)
|
|
@@ -281,7 +287,7 @@ function parseArgs(args) {
|
|
|
281
287
|
const key = arg.slice(2);
|
|
282
288
|
const nextArg = args[i + 1];
|
|
283
289
|
// Boolean-only flags (never take a value)
|
|
284
|
-
const booleanOnlyFlags = ['all', 'json', 'help', 'version', 'force', 'yes', 'follow', 'detail', 'watch', 'offline', 'no-start', 'list', 'dry-run', 'api', 'console', 'build', 'no-build', 'keep-config'];
|
|
290
|
+
const booleanOnlyFlags = ['all', 'json', 'help', 'version', 'force', 'yes', 'follow', 'detail', 'watch', 'offline', 'no-start', 'list', 'dry-run', 'api', 'console', 'build', 'no-build', 'keep-config', 'check'];
|
|
285
291
|
if (booleanOnlyFlags.includes(key)) {
|
|
286
292
|
result.flags[key] = true;
|
|
287
293
|
i++;
|
|
@@ -758,6 +764,14 @@ async function main() {
|
|
|
758
764
|
});
|
|
759
765
|
break;
|
|
760
766
|
}
|
|
767
|
+
case 'update': {
|
|
768
|
+
exitCode = await updateCommand({
|
|
769
|
+
check: flags['check'] === true,
|
|
770
|
+
force: flags['force'] === true,
|
|
771
|
+
yes: flags['yes'] === true,
|
|
772
|
+
});
|
|
773
|
+
break;
|
|
774
|
+
}
|
|
761
775
|
case 'admin': {
|
|
762
776
|
// Show deprecation warning for 'admin' command
|
|
763
777
|
log.warn('The "admin" command is deprecated. Please use "console" instead.');
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Check for updates and print notification if available
|
|
3
|
+
*/
|
|
4
|
+
/**
|
|
5
|
+
* Get the current version (exported for update command)
|
|
6
|
+
*/
|
|
7
|
+
export declare function getInstalledVersion(): string;
|
|
8
|
+
/**
|
|
9
|
+
* Force fetch latest version from npm (ignores cache)
|
|
10
|
+
*/
|
|
11
|
+
export declare function fetchLatestVersionForced(): Promise<string | null>;
|
|
12
|
+
/**
|
|
13
|
+
* Get cached latest version if available
|
|
14
|
+
*/
|
|
15
|
+
export declare function getCachedVersion(): string | null;
|
|
16
|
+
/**
|
|
17
|
+
* Clear the update check cache
|
|
18
|
+
*/
|
|
19
|
+
export declare function clearCache(): void;
|
|
20
|
+
/**
|
|
21
|
+
* Compare versions and return if update is available
|
|
22
|
+
*/
|
|
23
|
+
export declare function isUpdateAvailable(currentVersion: string, latestVersion: string): boolean;
|
|
1
24
|
/**
|
|
2
25
|
* Check for updates and print notification if available
|
|
3
26
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-checker.d.ts","sourceRoot":"","sources":["../../src/lib/update-checker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"update-checker.d.ts","sourceRoot":"","sources":["../../src/lib/update-checker.ts"],"names":[],"mappings":"AA8JA;;GAEG;AACH;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED;;GAEG;AACH,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAEvE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAGhD;AAED;;GAEG;AACH,wBAAgB,UAAU,IAAI,IAAI,CAQjC;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAExF;AAED;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAgCrD"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { homedir } from 'os';
|
|
2
2
|
import { join } from 'path';
|
|
3
|
-
import { readFileSync, writeFileSync, existsSync } from 'fs';
|
|
3
|
+
import { readFileSync, writeFileSync, existsSync, unlinkSync } from 'fs';
|
|
4
4
|
import { colors } from '@minecraft-docker/shared';
|
|
5
5
|
const PACKAGE_NAME = '@minecraft-docker/mcctl';
|
|
6
6
|
const CACHE_FILE = join(homedir(), '.mcctl-update-check.json');
|
|
@@ -112,6 +112,68 @@ function printUpdateNotification(currentVersion, latestVersion) {
|
|
|
112
112
|
console.log(colors.yellow(bottomBorder));
|
|
113
113
|
console.log('');
|
|
114
114
|
}
|
|
115
|
+
/**
|
|
116
|
+
* Check if cache should be invalidated
|
|
117
|
+
* Cache is invalid if:
|
|
118
|
+
* 1. Cache doesn't exist
|
|
119
|
+
* 2. Cache is older than CACHE_DURATION_MS (24 hours)
|
|
120
|
+
* 3. Cached version is older than current version (user upgraded)
|
|
121
|
+
*/
|
|
122
|
+
function isCacheValid(cache, currentVersion) {
|
|
123
|
+
if (!cache)
|
|
124
|
+
return false;
|
|
125
|
+
const now = Date.now();
|
|
126
|
+
const isExpired = (now - cache.lastCheck) >= CACHE_DURATION_MS;
|
|
127
|
+
if (isExpired)
|
|
128
|
+
return false;
|
|
129
|
+
// If cached version is older than current, invalidate cache
|
|
130
|
+
// This handles the case where user upgraded but cache still has old "latest" version
|
|
131
|
+
const cachedIsOlderThanCurrent = isNewerVersion(cache.latestVersion, currentVersion);
|
|
132
|
+
if (cachedIsOlderThanCurrent)
|
|
133
|
+
return false;
|
|
134
|
+
return true;
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* Check for updates and print notification if available
|
|
138
|
+
*/
|
|
139
|
+
/**
|
|
140
|
+
* Get the current version (exported for update command)
|
|
141
|
+
*/
|
|
142
|
+
export function getInstalledVersion() {
|
|
143
|
+
return getCurrentVersion();
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* Force fetch latest version from npm (ignores cache)
|
|
147
|
+
*/
|
|
148
|
+
export async function fetchLatestVersionForced() {
|
|
149
|
+
return fetchLatestVersion();
|
|
150
|
+
}
|
|
151
|
+
/**
|
|
152
|
+
* Get cached latest version if available
|
|
153
|
+
*/
|
|
154
|
+
export function getCachedVersion() {
|
|
155
|
+
const cache = readCache();
|
|
156
|
+
return cache?.latestVersion ?? null;
|
|
157
|
+
}
|
|
158
|
+
/**
|
|
159
|
+
* Clear the update check cache
|
|
160
|
+
*/
|
|
161
|
+
export function clearCache() {
|
|
162
|
+
try {
|
|
163
|
+
if (existsSync(CACHE_FILE)) {
|
|
164
|
+
unlinkSync(CACHE_FILE);
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
catch {
|
|
168
|
+
// Ignore errors
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
/**
|
|
172
|
+
* Compare versions and return if update is available
|
|
173
|
+
*/
|
|
174
|
+
export function isUpdateAvailable(currentVersion, latestVersion) {
|
|
175
|
+
return isNewerVersion(currentVersion, latestVersion);
|
|
176
|
+
}
|
|
115
177
|
/**
|
|
116
178
|
* Check for updates and print notification if available
|
|
117
179
|
*/
|
|
@@ -119,9 +181,8 @@ export async function checkForUpdates() {
|
|
|
119
181
|
try {
|
|
120
182
|
const currentVersion = getCurrentVersion();
|
|
121
183
|
const cache = readCache();
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
if (cache && (now - cache.lastCheck) < CACHE_DURATION_MS) {
|
|
184
|
+
// Check if cache is valid
|
|
185
|
+
if (isCacheValid(cache, currentVersion)) {
|
|
125
186
|
// Use cached version
|
|
126
187
|
if (isNewerVersion(currentVersion, cache.latestVersion)) {
|
|
127
188
|
printUpdateNotification(currentVersion, cache.latestVersion);
|
|
@@ -133,7 +194,7 @@ export async function checkForUpdates() {
|
|
|
133
194
|
if (latestVersion) {
|
|
134
195
|
// Update cache
|
|
135
196
|
writeCache({
|
|
136
|
-
lastCheck: now,
|
|
197
|
+
lastCheck: Date.now(),
|
|
137
198
|
latestVersion,
|
|
138
199
|
});
|
|
139
200
|
// Check if update is available
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-checker.js","sourceRoot":"","sources":["../../src/lib/update-checker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"update-checker.js","sourceRoot":"","sources":["../../src/lib/update-checker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@minecraft-docker/mcctl",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.16",
|
|
4
4
|
"description": "CLI tool for managing Docker Minecraft servers with mc-router",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -53,8 +53,8 @@
|
|
|
53
53
|
],
|
|
54
54
|
"dependencies": {
|
|
55
55
|
"@clack/prompts": "^0.8.0",
|
|
56
|
-
"@minecraft-docker/mod-source-modrinth": "^1.6.
|
|
57
|
-
"@minecraft-docker/shared": "^1.6.
|
|
56
|
+
"@minecraft-docker/mod-source-modrinth": "^1.6.16",
|
|
57
|
+
"@minecraft-docker/shared": "^1.6.16",
|
|
58
58
|
"commander": "^12.0.0",
|
|
59
59
|
"js-yaml": "^4.1.0",
|
|
60
60
|
"picocolors": "^1.1.0",
|