@schuttdev/kon 0.3.3 → 0.3.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.
- package/dist/index.js +17 -6
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -341,7 +341,7 @@ function createHttpClient(serverUrl, sessionToken) {
|
|
|
341
341
|
}
|
|
342
342
|
|
|
343
343
|
// ../cli/src/version.ts
|
|
344
|
-
var VERSION = "0.3.
|
|
344
|
+
var VERSION = "0.3.4";
|
|
345
345
|
|
|
346
346
|
// ../cli/src/connect.ts
|
|
347
347
|
async function connect(serverName) {
|
|
@@ -363,8 +363,8 @@ async function connect(serverName) {
|
|
|
363
363
|
const { name, entry } = active;
|
|
364
364
|
if (entry.sessionToken && entry.sessionExpiresAt) {
|
|
365
365
|
if (Date.now() < entry.sessionExpiresAt - 5 * 60 * 1e3) {
|
|
366
|
-
await checkAndUpdateServer(entry.server, entry.sessionToken);
|
|
367
|
-
return { serverUrl: entry.server, sessionToken:
|
|
366
|
+
const token = await checkAndUpdateServer(entry.server, entry.sessionToken, name, entry.token);
|
|
367
|
+
return { serverUrl: entry.server, sessionToken: token };
|
|
368
368
|
}
|
|
369
369
|
}
|
|
370
370
|
return refreshSession(name, entry.server, entry.token);
|
|
@@ -377,10 +377,10 @@ async function refreshSession(serverName, serverUrl, encryptedToken) {
|
|
|
377
377
|
orgUuid
|
|
378
378
|
});
|
|
379
379
|
await updateServerSession(serverName, res.sessionToken, res.expiresAt);
|
|
380
|
-
await checkAndUpdateServer(serverUrl, res.sessionToken);
|
|
381
|
-
return { serverUrl, sessionToken:
|
|
380
|
+
const token = await checkAndUpdateServer(serverUrl, res.sessionToken, serverName, encryptedToken);
|
|
381
|
+
return { serverUrl, sessionToken: token };
|
|
382
382
|
}
|
|
383
|
-
async function checkAndUpdateServer(serverUrl, sessionToken) {
|
|
383
|
+
async function checkAndUpdateServer(serverUrl, sessionToken, serverName, encryptedToken) {
|
|
384
384
|
try {
|
|
385
385
|
const http = createHttpClient(serverUrl);
|
|
386
386
|
const health = await http.get("/health");
|
|
@@ -403,12 +403,23 @@ async function checkAndUpdateServer(serverUrl, sessionToken) {
|
|
|
403
403
|
console.log("Server updated and restarting.");
|
|
404
404
|
await waitForServer(serverUrl, 15e3);
|
|
405
405
|
console.log("Server is back online.");
|
|
406
|
+
if (serverName && encryptedToken) {
|
|
407
|
+
const orgUuid = getOrgUUID();
|
|
408
|
+
const unauthHttp = createHttpClient(serverUrl);
|
|
409
|
+
const connectRes = await unauthHttp.post("/auth/connect", {
|
|
410
|
+
encryptedToken,
|
|
411
|
+
orgUuid
|
|
412
|
+
});
|
|
413
|
+
await updateServerSession(serverName, connectRes.sessionToken, connectRes.expiresAt);
|
|
414
|
+
return connectRes.sessionToken;
|
|
415
|
+
}
|
|
406
416
|
} else {
|
|
407
417
|
console.log(`Server update failed: ${res.error ?? "unknown error"}`);
|
|
408
418
|
}
|
|
409
419
|
}
|
|
410
420
|
} catch {
|
|
411
421
|
}
|
|
422
|
+
return sessionToken;
|
|
412
423
|
}
|
|
413
424
|
async function waitForServer(serverUrl, timeoutMs) {
|
|
414
425
|
const start = Date.now();
|