@fastybird/smart-panel-backend 0.2.0-alpha.1 → 0.2.0-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app.module.js +0 -17
- package/dist/app.module.js.map +1 -1
- package/dist/common/filters/not-found-exception.filter.d.ts +4 -0
- package/dist/common/filters/not-found-exception.filter.js +22 -1
- package/dist/common/filters/not-found-exception.filter.js.map +1 -1
- package/dist/common/utils/config.utils.d.ts +0 -1
- package/dist/common/utils/config.utils.js +1 -11
- package/dist/common/utils/config.utils.js.map +1 -1
- package/dist/main.js +12 -5
- package/dist/main.js.map +1 -1
- package/dist/modules/platform/platforms/abstract.platform.d.ts +32 -0
- package/dist/modules/platform/platforms/abstract.platform.js +216 -0
- package/dist/modules/platform/platforms/abstract.platform.js.map +1 -1
- package/dist/modules/platform/platforms/docker.platform.d.ts +2 -0
- package/dist/modules/platform/platforms/docker.platform.js +3 -0
- package/dist/modules/platform/platforms/docker.platform.js.map +1 -1
- package/dist/modules/platform/platforms/generic.platform.js +15 -15
- package/dist/modules/platform/platforms/generic.platform.js.map +1 -1
- package/dist/modules/platform/platforms/home-assistant.platform.d.ts +2 -0
- package/dist/modules/platform/platforms/home-assistant.platform.js +3 -0
- package/dist/modules/platform/platforms/home-assistant.platform.js.map +1 -1
- package/dist/modules/platform/platforms/raspberry.platform.js +15 -15
- package/dist/modules/platform/platforms/raspberry.platform.js.map +1 -1
- package/dist/modules/swagger/commands/serve-swagger.command.d.ts +14 -0
- package/dist/modules/swagger/commands/serve-swagger.command.js +60 -0
- package/dist/modules/swagger/commands/serve-swagger.command.js.map +1 -0
- package/dist/modules/swagger/swagger.module.js +2 -0
- package/dist/modules/swagger/swagger.module.js.map +1 -1
- package/dist/modules/system/scripts/update-worker.sh +291 -0
- package/dist/modules/system/services/update-executor.service.d.ts +4 -0
- package/dist/modules/system/services/update-executor.service.js +104 -1
- package/dist/modules/system/services/update-executor.service.js.map +1 -1
- package/dist/modules/users/controllers/users.controller.js +9 -0
- package/dist/modules/users/controllers/users.controller.js.map +1 -1
- package/dist/modules/users/dto/update-user.dto.d.ts +1 -0
- package/dist/modules/users/dto/update-user.dto.js +14 -1
- package/dist/modules/users/dto/update-user.dto.js.map +1 -1
- package/dist/modules/users/services/users.service.d.ts +1 -0
- package/dist/modules/users/services/users.service.js +10 -0
- package/dist/modules/users/services/users.service.js.map +1 -1
- package/dist/plugins/memory-storage/services/in-memory-timeseries.store.js +1 -1
- package/dist/plugins/memory-storage/services/in-memory-timeseries.store.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +3 -2
|
@@ -0,0 +1,291 @@
|
|
|
1
|
+
#!/bin/bash
|
|
2
|
+
set -e
|
|
3
|
+
|
|
4
|
+
VERSION="${1:-${UPDATE_VERSION:-latest}}"
|
|
5
|
+
STATUS_FILE="${STATUS_FILE:-/var/lib/smart-panel/update-status.json}"
|
|
6
|
+
INSTALL_TYPE="${INSTALL_TYPE:-npm}"
|
|
7
|
+
IMAGE_BASE_DIR="${IMAGE_BASE_DIR:-/opt/smart-panel}"
|
|
8
|
+
DOWNLOAD_URL="${DOWNLOAD_URL:-}"
|
|
9
|
+
|
|
10
|
+
# Capture once — used for all status writes so timeout detection works correctly
|
|
11
|
+
STARTED_AT="$(date -Iseconds)"
|
|
12
|
+
|
|
13
|
+
update_status() {
|
|
14
|
+
local status="$1"
|
|
15
|
+
local phase="$2"
|
|
16
|
+
local error="${3:-}"
|
|
17
|
+
local completed_at=""
|
|
18
|
+
|
|
19
|
+
if [ "$status" = "complete" ] || [ "$status" = "failed" ]; then
|
|
20
|
+
completed_at=$(date -Iseconds)
|
|
21
|
+
fi
|
|
22
|
+
|
|
23
|
+
local tmp_file="${STATUS_FILE}.tmp"
|
|
24
|
+
|
|
25
|
+
# Use printf with %s to prevent injection in JSON values.
|
|
26
|
+
# Escape double-quotes and backslashes in the error message.
|
|
27
|
+
local safe_error=""
|
|
28
|
+
if [ -n "$error" ]; then
|
|
29
|
+
safe_error=$(printf '%s' "$error" | sed 's/\\/\\\\/g; s/"/\\"/g')
|
|
30
|
+
fi
|
|
31
|
+
|
|
32
|
+
printf '{\n\t"status": "%s",\n\t"phase": "%s",\n\t"targetVersion": "%s",\n\t"startedAt": "%s"' \
|
|
33
|
+
"$status" "$phase" "$VERSION" "$STARTED_AT" > "$tmp_file"
|
|
34
|
+
|
|
35
|
+
if [ -n "$completed_at" ]; then
|
|
36
|
+
printf ',\n\t"completedAt": "%s"' "$completed_at" >> "$tmp_file"
|
|
37
|
+
fi
|
|
38
|
+
|
|
39
|
+
printf ',\n\t"error": "%s"' "$safe_error" >> "$tmp_file"
|
|
40
|
+
printf '\n}\n' >> "$tmp_file"
|
|
41
|
+
|
|
42
|
+
mv "$tmp_file" "$STATUS_FILE"
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
cleanup() {
|
|
46
|
+
local exit_code=$?
|
|
47
|
+
|
|
48
|
+
if [ $exit_code -ne 0 ]; then
|
|
49
|
+
# Only write a generic failure if a specific error wasn't already recorded
|
|
50
|
+
if [ -f "$STATUS_FILE" ] && grep -q '"status": "failed"' "$STATUS_FILE" 2>/dev/null; then
|
|
51
|
+
return
|
|
52
|
+
fi
|
|
53
|
+
update_status "failed" "failed" "Update process exited with code $exit_code"
|
|
54
|
+
fi
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
trap cleanup EXIT
|
|
58
|
+
|
|
59
|
+
# ──────────────────────────────────────────────────────────────
|
|
60
|
+
# Image-based update (Raspbian image installs)
|
|
61
|
+
# ──────────────────────────────────────────────────────────────
|
|
62
|
+
if [ "$INSTALL_TYPE" = "image" ]; then
|
|
63
|
+
# Verify passwordless sudo is available (required for systemctl, chown, ln).
|
|
64
|
+
# The sudoers policy must include /usr/bin/true for this check.
|
|
65
|
+
if ! sudo -n /usr/bin/true 2>/dev/null; then
|
|
66
|
+
update_status "failed" "failed" "Passwordless sudo is not available for this user"
|
|
67
|
+
exit 1
|
|
68
|
+
fi
|
|
69
|
+
# Strip leading 'v' prefix if present to avoid double-prefixed dirs like vv1.0.0
|
|
70
|
+
CLEAN_VERSION="${VERSION#v}"
|
|
71
|
+
NEW_VERSION_DIR="${IMAGE_BASE_DIR}/v${CLEAN_VERSION}"
|
|
72
|
+
CURRENT_LINK="${IMAGE_BASE_DIR}/current"
|
|
73
|
+
PREVIOUS_TARGET=""
|
|
74
|
+
|
|
75
|
+
# Save the current version for rollback
|
|
76
|
+
if [ -L "$CURRENT_LINK" ]; then
|
|
77
|
+
PREVIOUS_TARGET=$(readlink "$CURRENT_LINK")
|
|
78
|
+
fi
|
|
79
|
+
|
|
80
|
+
# Guard: refuse to overwrite the currently running version
|
|
81
|
+
# Resolve relative to IMAGE_BASE_DIR since PREVIOUS_TARGET may be relative
|
|
82
|
+
RESOLVED_PREV=$(cd "$IMAGE_BASE_DIR" && realpath "$PREVIOUS_TARGET" 2>/dev/null || true)
|
|
83
|
+
RESOLVED_NEW=$(cd "$IMAGE_BASE_DIR" && realpath "$NEW_VERSION_DIR" 2>/dev/null || true)
|
|
84
|
+
|
|
85
|
+
if [ -n "$PREVIOUS_TARGET" ] && [ -n "$RESOLVED_PREV" ] && [ -n "$RESOLVED_NEW" ] && [ "$RESOLVED_PREV" = "$RESOLVED_NEW" ]; then
|
|
86
|
+
update_status "failed" "failed" "Target version v${CLEAN_VERSION} is already the active version"
|
|
87
|
+
exit 1
|
|
88
|
+
fi
|
|
89
|
+
|
|
90
|
+
# ── Download ──
|
|
91
|
+
update_status "downloading" "downloading"
|
|
92
|
+
|
|
93
|
+
if [ -z "$DOWNLOAD_URL" ]; then
|
|
94
|
+
update_status "failed" "failed" "No download URL provided for image update"
|
|
95
|
+
exit 1
|
|
96
|
+
fi
|
|
97
|
+
|
|
98
|
+
TMP_TARBALL="/tmp/smart-panel-backend-v${CLEAN_VERSION}.tar.gz"
|
|
99
|
+
|
|
100
|
+
curl -fSL -o "$TMP_TARBALL" "$DOWNLOAD_URL" 2>&1 || {
|
|
101
|
+
update_status "failed" "failed" "Download failed from ${DOWNLOAD_URL}"
|
|
102
|
+
exit 1
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
# ── Extract ──
|
|
106
|
+
update_status "installing" "installing"
|
|
107
|
+
|
|
108
|
+
mkdir -p "$NEW_VERSION_DIR"
|
|
109
|
+
|
|
110
|
+
tar -xzf "$TMP_TARBALL" -C "$NEW_VERSION_DIR" 2>&1 || {
|
|
111
|
+
rm -rf "$NEW_VERSION_DIR"
|
|
112
|
+
rm -f "$TMP_TARBALL"
|
|
113
|
+
update_status "failed" "failed" "Failed to extract update archive"
|
|
114
|
+
exit 1
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
rm -f "$TMP_TARBALL"
|
|
118
|
+
|
|
119
|
+
# Create the image-install marker in the new version
|
|
120
|
+
touch "${NEW_VERSION_DIR}/.image-install" || {
|
|
121
|
+
rm -rf "$NEW_VERSION_DIR"
|
|
122
|
+
update_status "failed" "failed" "Failed to create image-install marker"
|
|
123
|
+
exit 1
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
# ── Verify dependencies ──
|
|
127
|
+
cd "$NEW_VERSION_DIR"
|
|
128
|
+
|
|
129
|
+
# The release tarball includes pre-built node_modules with native modules
|
|
130
|
+
# compiled for ARM64 by the CI arm-runner. Only install as fallback if
|
|
131
|
+
# node_modules is missing (e.g. manually extracted tarball without deps).
|
|
132
|
+
if [ ! -d "node_modules" ]; then
|
|
133
|
+
npm install --omit=dev 2>&1 || {
|
|
134
|
+
rm -rf "$NEW_VERSION_DIR"
|
|
135
|
+
update_status "failed" "failed" "npm install failed"
|
|
136
|
+
exit 1
|
|
137
|
+
}
|
|
138
|
+
fi
|
|
139
|
+
|
|
140
|
+
# Set ownership
|
|
141
|
+
sudo chown -R smart-panel:smart-panel "$NEW_VERSION_DIR" || {
|
|
142
|
+
rm -rf "$NEW_VERSION_DIR"
|
|
143
|
+
update_status "failed" "failed" "Failed to set ownership on ${NEW_VERSION_DIR}"
|
|
144
|
+
exit 1
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
# ── Stop service ──
|
|
148
|
+
update_status "stopping" "stopping"
|
|
149
|
+
sudo systemctl stop smart-panel 2>/dev/null || true
|
|
150
|
+
|
|
151
|
+
# ── Switch symlink (atomic on same filesystem) ──
|
|
152
|
+
sudo ln -sfn "$NEW_VERSION_DIR" "$CURRENT_LINK" || {
|
|
153
|
+
# Revert on failure
|
|
154
|
+
if [ -n "$PREVIOUS_TARGET" ]; then
|
|
155
|
+
sudo ln -sfn "$PREVIOUS_TARGET" "$CURRENT_LINK"
|
|
156
|
+
fi
|
|
157
|
+
sudo systemctl start smart-panel 2>/dev/null || true
|
|
158
|
+
update_status "failed" "failed" "Failed to switch version symlink"
|
|
159
|
+
exit 1
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
# ── Run database migrations ──
|
|
163
|
+
update_status "migrating" "migrating"
|
|
164
|
+
|
|
165
|
+
ENV_FILE="/etc/smart-panel/environment"
|
|
166
|
+
|
|
167
|
+
if [ -f "${NEW_VERSION_DIR}/dist/dataSource.js" ]; then
|
|
168
|
+
(
|
|
169
|
+
set -a
|
|
170
|
+
# shellcheck source=/dev/null
|
|
171
|
+
[ -f "$ENV_FILE" ] && . "$ENV_FILE"
|
|
172
|
+
set +a
|
|
173
|
+
cd "$NEW_VERSION_DIR"
|
|
174
|
+
node node_modules/typeorm/cli.js migration:run -d dist/dataSource.js
|
|
175
|
+
) 2>&1 || {
|
|
176
|
+
# Migration failed — revert symlink if possible
|
|
177
|
+
update_status "stopping" "stopping"
|
|
178
|
+
sudo systemctl stop smart-panel 2>/dev/null || true
|
|
179
|
+
|
|
180
|
+
if [ -n "$PREVIOUS_TARGET" ]; then
|
|
181
|
+
if sudo ln -sfn "$PREVIOUS_TARGET" "$CURRENT_LINK"; then
|
|
182
|
+
rm -rf "$NEW_VERSION_DIR"
|
|
183
|
+
update_status "failed" "failed" "Database migration failed — reverted to previous version"
|
|
184
|
+
else
|
|
185
|
+
# Symlink revert failed — keep new version so system stays bootable
|
|
186
|
+
update_status "failed" "failed" "Database migration failed — symlink revert also failed"
|
|
187
|
+
fi
|
|
188
|
+
else
|
|
189
|
+
# No previous version — keep current in place so system stays bootable
|
|
190
|
+
update_status "failed" "failed" "Database migration failed — no previous version to revert to"
|
|
191
|
+
fi
|
|
192
|
+
|
|
193
|
+
sudo systemctl start smart-panel 2>/dev/null || true
|
|
194
|
+
exit 1
|
|
195
|
+
}
|
|
196
|
+
fi
|
|
197
|
+
|
|
198
|
+
# ── Start service ──
|
|
199
|
+
update_status "starting" "starting"
|
|
200
|
+
sudo systemctl start smart-panel 2>&1 || {
|
|
201
|
+
# Try to revert if start fails
|
|
202
|
+
if [ -n "$PREVIOUS_TARGET" ]; then
|
|
203
|
+
sudo ln -sfn "$PREVIOUS_TARGET" "$CURRENT_LINK"
|
|
204
|
+
sudo systemctl start smart-panel 2>/dev/null || true
|
|
205
|
+
fi
|
|
206
|
+
update_status "failed" "failed" "Failed to start service after update"
|
|
207
|
+
exit 1
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
# ── Cleanup old versions (keep max 2 previous) ──
|
|
211
|
+
cd "$IMAGE_BASE_DIR"
|
|
212
|
+
|
|
213
|
+
# Use the known current version rather than re-reading the symlink,
|
|
214
|
+
# so cleanup is safe even if readlink fails unexpectedly
|
|
215
|
+
CURRENT_BASENAME="v${CLEAN_VERSION}"
|
|
216
|
+
|
|
217
|
+
if [ -n "$CURRENT_BASENAME" ]; then
|
|
218
|
+
# Only match semver-versioned directories (v<digits>.<digits>.<digits>*)
|
|
219
|
+
# to avoid accidentally deleting unrelated v-prefixed directories
|
|
220
|
+
# shellcheck disable=SC2010
|
|
221
|
+
OLD_VERSIONS=$(ls -d v[0-9]*.[0-9]*.[0-9]*/ 2>/dev/null | grep -v "^${CURRENT_BASENAME}/" | sort -V | head -n -2 || true)
|
|
222
|
+
|
|
223
|
+
for old_dir in $OLD_VERSIONS; do
|
|
224
|
+
rm -rf "${IMAGE_BASE_DIR}/${old_dir}"
|
|
225
|
+
done
|
|
226
|
+
fi
|
|
227
|
+
|
|
228
|
+
# ── Mark complete ──
|
|
229
|
+
update_status "complete" "complete"
|
|
230
|
+
trap - EXIT
|
|
231
|
+
exit 0
|
|
232
|
+
fi
|
|
233
|
+
|
|
234
|
+
# ──────────────────────────────────────────────────────────────
|
|
235
|
+
# NPM-based update (global npm installs)
|
|
236
|
+
# ──────────────────────────────────────────────────────────────
|
|
237
|
+
|
|
238
|
+
# Downloading / preparing
|
|
239
|
+
update_status "downloading" "downloading"
|
|
240
|
+
|
|
241
|
+
# Stop the service
|
|
242
|
+
update_status "stopping" "stopping"
|
|
243
|
+
sudo systemctl stop smart-panel 2>/dev/null || true
|
|
244
|
+
|
|
245
|
+
# Install the update
|
|
246
|
+
update_status "installing" "installing"
|
|
247
|
+
|
|
248
|
+
if [ "$VERSION" = "latest" ]; then
|
|
249
|
+
npm update -g @fastybird/smart-panel 2>&1 || {
|
|
250
|
+
update_status "failed" "failed" "npm update failed"
|
|
251
|
+
sudo systemctl start smart-panel 2>/dev/null || true
|
|
252
|
+
exit 1
|
|
253
|
+
}
|
|
254
|
+
else
|
|
255
|
+
npm install -g "@fastybird/smart-panel@$VERSION" 2>&1 || {
|
|
256
|
+
update_status "failed" "failed" "npm install failed for version $VERSION"
|
|
257
|
+
sudo systemctl start smart-panel 2>/dev/null || true
|
|
258
|
+
exit 1
|
|
259
|
+
}
|
|
260
|
+
fi
|
|
261
|
+
|
|
262
|
+
# Run database migrations
|
|
263
|
+
update_status "migrating" "migrating"
|
|
264
|
+
|
|
265
|
+
DATA_DIR="${FB_DATA_DIR:-/var/lib/smart-panel}"
|
|
266
|
+
DB_PATH="${FB_DB_PATH:-${DATA_DIR}/data}"
|
|
267
|
+
|
|
268
|
+
if [ -f "$(npm root -g)/@fastybird/smart-panel/dataSource.js" ]; then
|
|
269
|
+
node "$(npm root -g)/@fastybird/smart-panel/node_modules/typeorm/cli.js" \
|
|
270
|
+
migration:run \
|
|
271
|
+
-d "$(npm root -g)/@fastybird/smart-panel/dataSource.js" 2>&1 || {
|
|
272
|
+
update_status "failed" "failed" "Database migration failed"
|
|
273
|
+
sudo systemctl start smart-panel 2>/dev/null || true
|
|
274
|
+
exit 1
|
|
275
|
+
}
|
|
276
|
+
fi
|
|
277
|
+
|
|
278
|
+
# Start the service
|
|
279
|
+
update_status "starting" "starting"
|
|
280
|
+
sudo systemctl start smart-panel 2>&1 || {
|
|
281
|
+
update_status "failed" "failed" "Failed to start service after update"
|
|
282
|
+
exit 1
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
# Mark as complete
|
|
286
|
+
update_status "complete" "complete"
|
|
287
|
+
|
|
288
|
+
# Remove the exit trap since we completed successfully
|
|
289
|
+
trap - EXIT
|
|
290
|
+
|
|
291
|
+
exit 0
|
|
@@ -12,9 +12,13 @@ export interface UpdateProgressFile {
|
|
|
12
12
|
export declare class UpdateExecutorService implements OnModuleInit {
|
|
13
13
|
private readonly updateService;
|
|
14
14
|
private readonly logger;
|
|
15
|
+
private statusPollTimer;
|
|
16
|
+
private progressHighWaterMark;
|
|
15
17
|
constructor(updateService: UpdateService);
|
|
16
18
|
onModuleInit(): void;
|
|
17
19
|
private checkPendingUpdateStatus;
|
|
18
20
|
startUpdate(targetVersion: string): Promise<void>;
|
|
21
|
+
private startStatusPolling;
|
|
22
|
+
private stopStatusPolling;
|
|
19
23
|
private writeStatusFile;
|
|
20
24
|
}
|
|
@@ -51,10 +51,22 @@ const system_constants_1 = require("../system.constants");
|
|
|
51
51
|
const update_service_1 = require("./update.service");
|
|
52
52
|
const STATUS_FILE = '/var/lib/smart-panel/update-status.json';
|
|
53
53
|
const UPDATE_TIMEOUT_MS = 10 * 60 * 1000;
|
|
54
|
+
const STATUS_POLL_INTERVAL_MS = 3_000;
|
|
55
|
+
const STATUS_POLL_MAX_MS = UPDATE_TIMEOUT_MS + 30_000;
|
|
56
|
+
const PHASE_PROGRESS = {
|
|
57
|
+
downloading: 20,
|
|
58
|
+
installing: 45,
|
|
59
|
+
stopping: 45,
|
|
60
|
+
migrating: 65,
|
|
61
|
+
starting: 85,
|
|
62
|
+
complete: 100,
|
|
63
|
+
};
|
|
54
64
|
let UpdateExecutorService = class UpdateExecutorService {
|
|
55
65
|
constructor(updateService) {
|
|
56
66
|
this.updateService = updateService;
|
|
57
67
|
this.logger = (0, logger_1.createExtensionLogger)(system_constants_1.SYSTEM_MODULE_NAME, 'UpdateExecutorService');
|
|
68
|
+
this.statusPollTimer = null;
|
|
69
|
+
this.progressHighWaterMark = 0;
|
|
58
70
|
}
|
|
59
71
|
onModuleInit() {
|
|
60
72
|
this.checkPendingUpdateStatus();
|
|
@@ -158,7 +170,27 @@ let UpdateExecutorService = class UpdateExecutorService {
|
|
|
158
170
|
error: null,
|
|
159
171
|
startedAt: new Date(),
|
|
160
172
|
});
|
|
161
|
-
const updateScript = (0, path_1.join)(__dirname, '..', '
|
|
173
|
+
const updateScript = (0, path_1.join)(__dirname, '..', 'scripts', 'update-worker.sh');
|
|
174
|
+
if (!(0, fs_1.existsSync)(updateScript)) {
|
|
175
|
+
this.updateService.releaseUpdateLock();
|
|
176
|
+
const errorMsg = `Update worker script not found at ${updateScript}`;
|
|
177
|
+
this.logger.error(errorMsg);
|
|
178
|
+
this.updateService.setStatus({
|
|
179
|
+
status: system_constants_1.UpdateStatusType.FAILED,
|
|
180
|
+
phase: system_constants_1.UpdatePhase.FAILED,
|
|
181
|
+
progressPercent: null,
|
|
182
|
+
message: null,
|
|
183
|
+
error: errorMsg,
|
|
184
|
+
});
|
|
185
|
+
this.writeStatusFile({
|
|
186
|
+
status: system_constants_1.UpdateStatusType.FAILED,
|
|
187
|
+
phase: system_constants_1.UpdatePhase.FAILED,
|
|
188
|
+
targetVersion,
|
|
189
|
+
startedAt: new Date().toISOString(),
|
|
190
|
+
error: errorMsg,
|
|
191
|
+
});
|
|
192
|
+
throw new Error(errorMsg);
|
|
193
|
+
}
|
|
162
194
|
try {
|
|
163
195
|
const { spawn } = await Promise.resolve().then(() => __importStar(require('child_process')));
|
|
164
196
|
const child = spawn('bash', [updateScript, targetVersion], {
|
|
@@ -175,6 +207,7 @@ let UpdateExecutorService = class UpdateExecutorService {
|
|
|
175
207
|
});
|
|
176
208
|
child.unref();
|
|
177
209
|
this.logger.log(`Update worker spawned for version ${targetVersion} (PID: ${child.pid}, type: ${installType})`);
|
|
210
|
+
this.startStatusPolling();
|
|
178
211
|
}
|
|
179
212
|
catch (error) {
|
|
180
213
|
const err = error;
|
|
@@ -196,6 +229,76 @@ let UpdateExecutorService = class UpdateExecutorService {
|
|
|
196
229
|
throw error;
|
|
197
230
|
}
|
|
198
231
|
}
|
|
232
|
+
startStatusPolling() {
|
|
233
|
+
this.stopStatusPolling();
|
|
234
|
+
this.progressHighWaterMark = 10;
|
|
235
|
+
const startedAt = Date.now();
|
|
236
|
+
this.statusPollTimer = setInterval(() => {
|
|
237
|
+
if (Date.now() - startedAt > STATUS_POLL_MAX_MS) {
|
|
238
|
+
this.logger.error('Update status polling timed out');
|
|
239
|
+
this.updateService.setStatus({
|
|
240
|
+
status: system_constants_1.UpdateStatusType.FAILED,
|
|
241
|
+
phase: system_constants_1.UpdatePhase.FAILED,
|
|
242
|
+
progressPercent: null,
|
|
243
|
+
message: null,
|
|
244
|
+
error: 'Update timed out — no completion signal received',
|
|
245
|
+
});
|
|
246
|
+
this.updateService.releaseUpdateLock();
|
|
247
|
+
this.stopStatusPolling();
|
|
248
|
+
return;
|
|
249
|
+
}
|
|
250
|
+
if (!(0, fs_1.existsSync)(STATUS_FILE)) {
|
|
251
|
+
return;
|
|
252
|
+
}
|
|
253
|
+
try {
|
|
254
|
+
const raw = (0, fs_1.readFileSync)(STATUS_FILE, 'utf-8');
|
|
255
|
+
const fileStatus = JSON.parse(raw);
|
|
256
|
+
if (fileStatus.status === system_constants_1.UpdateStatusType.FAILED) {
|
|
257
|
+
this.logger.error(`Update worker failed: ${fileStatus.error ?? 'unknown error'}`);
|
|
258
|
+
this.updateService.setStatus({
|
|
259
|
+
status: system_constants_1.UpdateStatusType.FAILED,
|
|
260
|
+
phase: system_constants_1.UpdatePhase.FAILED,
|
|
261
|
+
progressPercent: null,
|
|
262
|
+
message: null,
|
|
263
|
+
error: fileStatus.error ?? 'Update failed with unknown error',
|
|
264
|
+
});
|
|
265
|
+
this.updateService.releaseUpdateLock();
|
|
266
|
+
this.stopStatusPolling();
|
|
267
|
+
}
|
|
268
|
+
else if (fileStatus.status === system_constants_1.UpdateStatusType.COMPLETE) {
|
|
269
|
+
this.updateService.setStatus({
|
|
270
|
+
status: system_constants_1.UpdateStatusType.COMPLETE,
|
|
271
|
+
phase: system_constants_1.UpdatePhase.COMPLETE,
|
|
272
|
+
progressPercent: 100,
|
|
273
|
+
message: `Successfully updated to ${fileStatus.targetVersion}`,
|
|
274
|
+
error: null,
|
|
275
|
+
});
|
|
276
|
+
this.updateService.releaseUpdateLock();
|
|
277
|
+
this.stopStatusPolling();
|
|
278
|
+
}
|
|
279
|
+
else {
|
|
280
|
+
const rawProgress = PHASE_PROGRESS[fileStatus.phase] ?? 10;
|
|
281
|
+
const progress = Math.max(this.progressHighWaterMark, rawProgress);
|
|
282
|
+
this.progressHighWaterMark = progress;
|
|
283
|
+
this.updateService.setStatus({
|
|
284
|
+
status: fileStatus.status ?? system_constants_1.UpdateStatusType.DOWNLOADING,
|
|
285
|
+
phase: fileStatus.phase ?? system_constants_1.UpdatePhase.DOWNLOADING,
|
|
286
|
+
progressPercent: progress,
|
|
287
|
+
message: `Update in progress: ${fileStatus.phase}...`,
|
|
288
|
+
error: null,
|
|
289
|
+
});
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
catch {
|
|
293
|
+
}
|
|
294
|
+
}, STATUS_POLL_INTERVAL_MS);
|
|
295
|
+
}
|
|
296
|
+
stopStatusPolling() {
|
|
297
|
+
if (this.statusPollTimer) {
|
|
298
|
+
clearInterval(this.statusPollTimer);
|
|
299
|
+
this.statusPollTimer = null;
|
|
300
|
+
}
|
|
301
|
+
}
|
|
199
302
|
writeStatusFile(status) {
|
|
200
303
|
try {
|
|
201
304
|
const dir = (0, path_1.dirname)(STATUS_FILE);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-executor.service.js","sourceRoot":"","sources":["../../../../src/modules/system/services/update-executor.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAAgG;AAChG,+BAAqC;AAErC,2CAA0D;AAE1D,mDAA+D;AAC/D,0DAAwF;AAExF,qDAAiD;AAWjD,MAAM,WAAW,GAAG,yCAAyC,CAAC;AAC9D,MAAM,iBAAiB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"update-executor.service.js","sourceRoot":"","sources":["../../../../src/modules/system/services/update-executor.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,6 +89,15 @@ let UsersController = class UsersController {
|
|
|
89
89
|
this.logger.warn('Attempted to change owner role');
|
|
90
90
|
throw new common_1.UnprocessableEntityException('The owner role cannot be changed');
|
|
91
91
|
}
|
|
92
|
+
if (updateDto.data.password && authenticatedUserId !== null && authenticatedUserId === id) {
|
|
93
|
+
if (!updateDto.data.currentPassword) {
|
|
94
|
+
throw new common_1.UnprocessableEntityException('Current password is required when changing your own password');
|
|
95
|
+
}
|
|
96
|
+
const isCurrentPasswordValid = await this.usersService.verifyPassword(user.id, updateDto.data.currentPassword);
|
|
97
|
+
if (!isCurrentPasswordValid) {
|
|
98
|
+
throw new common_1.UnprocessableEntityException('Current password is incorrect');
|
|
99
|
+
}
|
|
100
|
+
}
|
|
92
101
|
if (updateDto.data.email) {
|
|
93
102
|
const existingEmail = await this.usersService.findByEmail(updateDto.data.email);
|
|
94
103
|
if (existingEmail && existingEmail.id !== id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../../../src/modules/users/controllers/users.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,2CAawB;AACxB,6CAAwF;AAExF,mDAA+D;AAC/D,iFAA0E;AAE1E,sGAO8D;AAC9D,4DAA0D;AAC1D,4DAA0D;AAE1D,uDAA8C;AAC9C,yEAAuF;AACvF,6DAAyD;AACzD,wDAAiH;AAI1G,IAAM,eAAe,GAArB,MAAM,eAAe;IAG3B,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QAFtC,WAAM,GAAG,IAAA,8BAAqB,EAAC,mCAAiB,EAAE,iBAAiB,CAAC,CAAC;IAE5B,CAAC;IAiBrD,AAAN,KAAK,CAAC,OAAO;QACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAExC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAEhD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,KAAK,CAAC,MAAM,QAAQ,CAAC,CAAC;QAErD,MAAM,QAAQ,GAAG,IAAI,yCAAkB,EAAE,CAAC;QAE1C,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC;QAEtB,OAAO,QAAQ,CAAC;IACjB,CAAC;IAmBK,AAAN,KAAK,CAAC,OAAO,CAAmD,EAAU;QACzE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;QAE5C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAE1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAE9C,MAAM,QAAQ,GAAG,IAAI,wCAAiB,EAAE,CAAC;QAEzC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;QAErB,OAAO,QAAQ,CAAC;IACjB,CAAC;IAmBK,AAAN,KAAK,CAAC,MAAM,CACH,SAA2B,EACP,GAAa,EAClC,GAAY;QAEnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAG3D,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,0BAAQ,CAAC,KAAK,EAAE,CAAC;YAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;YAE7D,MAAM,IAAI,qCAA4B,CAAC,kDAAkD,CAAC,CAAC;QAC5F,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzF,IAAI,gBAAgB,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;YAExD,MAAM,IAAI,qCAA4B,CAAC,0CAA0C,CAAC,CAAC;QACpF,CAAC;QAED,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEhF,IAAI,aAAa,EAAE,CAAC;gBACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;gBAErD,MAAM,IAAI,qCAA4B,CAAC,uCAAuC,CAAC,CAAC;YACjF,CAAC;QACF,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE5D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAE7D,IAAA,yCAAiB,EAAC,GAAG,EAAE,GAAG,EAAE,qCAAmB,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAEnE,MAAM,QAAQ,GAAG,IAAI,wCAAiB,EAAE,CAAC;QAEzC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;QAErB,OAAO,QAAQ,CAAC;IACjB,CAAC;IAoBK,AAAN,KAAK,CAAC,MAAM,CACuC,EAAU,EACpD,SAA2B,EAC5B,GAAyB;QAEhC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE,EAAE,CAAC,CAAC;QAE/D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAE1C,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QAGrB,MAAM,mBAAmB,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QAG3G,IACC,mBAAmB,KAAK,IAAI;YAC5B,mBAAmB,KAAK,EAAE;YAC1B,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS;YACjC,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAChC,CAAC;YACF,MAAM,IAAI,qCAA4B,CAAC,iCAAiC,CAAC,CAAC;QAC3E,CAAC;QAGD,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,0BAAQ,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,0BAAQ,CAAC,KAAK,EAAE,CAAC;YAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YAEnD,MAAM,IAAI,qCAA4B,CAAC,kDAAkD,CAAC,CAAC;QAC5F,CAAC;QAGD,IAAI,IAAI,CAAC,IAAI,KAAK,0BAAQ,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,0BAAQ,CAAC,KAAK,EAAE,CAAC;YACjH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YAEnD,MAAM,IAAI,qCAA4B,CAAC,kCAAkC,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEhF,IAAI,aAAa,IAAI,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;gBAErD,MAAM,IAAI,qCAA4B,CAAC,uCAAuC,CAAC,CAAC;YACjF,CAAC;QACF,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QAE5E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;QAEpE,MAAM,QAAQ,GAAG,IAAI,wCAAiB,EAAE,CAAC;QAEzC,QAAQ,CAAC,IAAI,GAAG,WAAW,CAAC;QAE5B,OAAO,QAAQ,CAAC;IACjB,CAAC;IAiBK,AAAN,KAAK,CAAC,MAAM,CACuC,EAAU,EACrD,GAAyB;QAEhC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE,EAAE,CAAC,CAAC;QAE9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAE1C,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QAGrB,MAAM,mBAAmB,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QAG3G,IAAI,mBAAmB,KAAK,IAAI,IAAI,mBAAmB,KAAK,EAAE,EAAE,CAAC;YAChE,MAAM,IAAI,qCAA4B,CAAC,oCAAoC,CAAC,CAAC;QAC9E,CAAC;QAGD,IAAI,IAAI,CAAC,IAAI,KAAK,0BAAQ,CAAC,KAAK,EAAE,CAAC;YAClC,MAAM,IAAI,qCAA4B,CAAC,qCAAqC,CAAC,CAAC;QAC/E,CAAC;QAED,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAExC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,EAAE,CAAC,CAAC;IACzD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,EAAU;QACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,EAAE,CAAC,CAAC;QAEzD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAEjD,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;YAElD,MAAM,IAAI,0BAAiB,CAAC,+BAA+B,CAAC,CAAC;QAC9D,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;CACD,CAAA;
|
|
1
|
+
{"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../../../src/modules/users/controllers/users.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ __decorate([
|
|
|
32
32
|
], UpdateUserDto.prototype, "username", void 0);
|
|
33
33
|
__decorate([
|
|
34
34
|
(0, swagger_1.ApiPropertyOptional)({
|
|
35
|
-
description: "User's password.",
|
|
35
|
+
description: "User's new password.",
|
|
36
36
|
type: 'string',
|
|
37
37
|
format: 'password',
|
|
38
38
|
example: 'superstrongpassword',
|
|
@@ -45,6 +45,19 @@ __decorate([
|
|
|
45
45
|
(0, class_validator_1.ValidateIf)((_, value) => value !== null),
|
|
46
46
|
__metadata("design:type", String)
|
|
47
47
|
], UpdateUserDto.prototype, "password", void 0);
|
|
48
|
+
__decorate([
|
|
49
|
+
(0, swagger_1.ApiPropertyOptional)({
|
|
50
|
+
name: 'current_password',
|
|
51
|
+
description: 'Current password for verification when changing password.',
|
|
52
|
+
type: 'string',
|
|
53
|
+
format: 'password',
|
|
54
|
+
example: 'oldpassword',
|
|
55
|
+
}),
|
|
56
|
+
(0, class_transformer_1.Expose)({ name: 'current_password' }),
|
|
57
|
+
(0, class_validator_1.IsOptional)(),
|
|
58
|
+
(0, class_validator_1.IsString)({ message: '[{"field":"current_password","reason":"Current password must be a string."}]' }),
|
|
59
|
+
__metadata("design:type", String)
|
|
60
|
+
], UpdateUserDto.prototype, "currentPassword", void 0);
|
|
48
61
|
__decorate([
|
|
49
62
|
(0, swagger_1.ApiPropertyOptional)({
|
|
50
63
|
description: "User's email address.",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-user.dto.js","sourceRoot":"","sources":["../../../../src/modules/users/dto/update-user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA4D;AAC5D,qDAAgH;AAEhH,6CAA8E;AAE9E,wDAA4D;AAGrD,IAAM,aAAa,GAAnB,MAAM,aAAa;
|
|
1
|
+
{"version":3,"file":"update-user.dto.js","sourceRoot":"","sources":["../../../../src/modules/users/dto/update-user.dto.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export declare class UsersService {
|
|
|
16
16
|
findByEmail(email: string): Promise<UserEntity | null>;
|
|
17
17
|
findAllByRole(role: UserRole): Promise<UserEntity[]>;
|
|
18
18
|
create(createDto: CreateUserDto): Promise<UserEntity>;
|
|
19
|
+
verifyPassword(id: string, plainPassword: string): Promise<boolean>;
|
|
19
20
|
update(id: string, updateDto: UpdateUserDto): Promise<UserEntity>;
|
|
20
21
|
remove(id: string): Promise<void>;
|
|
21
22
|
getOneOrThrow(id: string): Promise<UserEntity>;
|
|
@@ -75,6 +75,16 @@ let UsersService = class UsersService {
|
|
|
75
75
|
this.eventEmitter.emit(users_constants_1.EventType.USER_CREATED, savedUser);
|
|
76
76
|
return savedUser;
|
|
77
77
|
}
|
|
78
|
+
async verifyPassword(id, plainPassword) {
|
|
79
|
+
const user = await this.repository.findOne({
|
|
80
|
+
where: { id },
|
|
81
|
+
select: ['id', 'password'],
|
|
82
|
+
});
|
|
83
|
+
if (!user || !user.password) {
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
return bcrypt_1.default.compare(plainPassword, user.password);
|
|
87
|
+
}
|
|
78
88
|
async update(id, updateDto) {
|
|
79
89
|
const user = await this.getOneOrThrow(id);
|
|
80
90
|
const dtoInstance = await this.validateDto(update_user_dto_1.UpdateUserDto, updateDto);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.service.js","sourceRoot":"","sources":["../../../../src/modules/users/services/users.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"users.service.js","sourceRoot":"","sources":["../../../../src/modules/users/services/users.service.ts"],"names":[],"mappings":"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"}
|