@overlordai/worker 1.0.53 → 1.0.54
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/clean-output-buffer.d.ts +21 -0
- package/dist/clean-output-buffer.d.ts.map +1 -0
- package/dist/clean-output-buffer.js +70 -0
- package/dist/clean-output-buffer.js.map +1 -0
- package/dist/config.d.ts +4 -4
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +54 -39
- package/dist/config.js.map +1 -1
- package/dist/executor/base.executor.d.ts +30 -11
- package/dist/executor/base.executor.d.ts.map +1 -1
- package/dist/executor/base.executor.js +25 -2
- package/dist/executor/base.executor.js.map +1 -1
- package/dist/executor/claude.executor.d.ts +7 -8
- package/dist/executor/claude.executor.d.ts.map +1 -1
- package/dist/executor/claude.executor.js +36 -26
- package/dist/executor/claude.executor.js.map +1 -1
- package/dist/executor/codex.executor.d.ts +7 -8
- package/dist/executor/codex.executor.d.ts.map +1 -1
- package/dist/executor/codex.executor.js +64 -26
- package/dist/executor/codex.executor.js.map +1 -1
- package/dist/executor/cursor.executor.d.ts +6 -7
- package/dist/executor/cursor.executor.d.ts.map +1 -1
- package/dist/executor/cursor.executor.js +12 -22
- package/dist/executor/cursor.executor.js.map +1 -1
- package/dist/executor/custom.executor.d.ts +15 -7
- package/dist/executor/custom.executor.d.ts.map +1 -1
- package/dist/executor/custom.executor.js +25 -28
- package/dist/executor/custom.executor.js.map +1 -1
- package/dist/git-operations.d.ts +14 -12
- package/dist/git-operations.d.ts.map +1 -1
- package/dist/git-operations.js +50 -98
- package/dist/git-operations.js.map +1 -1
- package/dist/git-token-helper.d.ts +27 -0
- package/dist/git-token-helper.d.ts.map +1 -0
- package/dist/git-token-helper.js +114 -0
- package/dist/git-token-helper.js.map +1 -0
- package/dist/healthz.d.ts.map +1 -1
- package/dist/healthz.js +3 -7
- package/dist/healthz.js.map +1 -1
- package/dist/http-post.d.ts +2 -0
- package/dist/http-post.d.ts.map +1 -0
- package/dist/http-post.js +74 -0
- package/dist/http-post.js.map +1 -0
- package/dist/jwt-manager.d.ts +2 -3
- package/dist/jwt-manager.d.ts.map +1 -1
- package/dist/jwt-manager.js +5 -43
- package/dist/jwt-manager.js.map +1 -1
- package/dist/lease-manager.d.ts +4 -1
- package/dist/lease-manager.d.ts.map +1 -1
- package/dist/lease-manager.js +2 -6
- package/dist/lease-manager.js.map +1 -1
- package/dist/main.js +147 -277
- package/dist/main.js.map +1 -1
- package/dist/orphan-reaper.d.ts +1 -1
- package/dist/orphan-reaper.d.ts.map +1 -1
- package/dist/orphan-reaper.js +46 -30
- package/dist/orphan-reaper.js.map +1 -1
- package/dist/pipeline-compiler.d.ts +10 -0
- package/dist/pipeline-compiler.d.ts.map +1 -0
- package/dist/pipeline-compiler.js +179 -0
- package/dist/pipeline-compiler.js.map +1 -0
- package/dist/pipeline-parser.d.ts.map +1 -1
- package/dist/pipeline-parser.js +4 -3
- package/dist/pipeline-parser.js.map +1 -1
- package/dist/pipeline-runner.d.ts +1 -0
- package/dist/pipeline-runner.d.ts.map +1 -1
- package/dist/pipeline-runner.js +37 -27
- package/dist/pipeline-runner.js.map +1 -1
- package/dist/project-mutex.d.ts +1 -0
- package/dist/project-mutex.d.ts.map +1 -1
- package/dist/project-mutex.js +9 -1
- package/dist/project-mutex.js.map +1 -1
- package/dist/pty-manager.d.ts +2 -0
- package/dist/pty-manager.d.ts.map +1 -1
- package/dist/pty-manager.js +68 -42
- package/dist/pty-manager.js.map +1 -1
- package/dist/pty-relay-client.d.ts +38 -0
- package/dist/pty-relay-client.d.ts.map +1 -0
- package/dist/pty-relay-client.js +146 -0
- package/dist/pty-relay-client.js.map +1 -0
- package/dist/pty-stdin-writer.d.ts +11 -0
- package/dist/pty-stdin-writer.d.ts.map +1 -0
- package/dist/pty-stdin-writer.js +22 -0
- package/dist/pty-stdin-writer.js.map +1 -0
- package/dist/ringbuffer.d.ts +2 -0
- package/dist/ringbuffer.d.ts.map +1 -1
- package/dist/ringbuffer.js +10 -1
- package/dist/ringbuffer.js.map +1 -1
- package/dist/stage-monitor.d.ts +72 -0
- package/dist/stage-monitor.d.ts.map +1 -0
- package/dist/stage-monitor.js +234 -0
- package/dist/stage-monitor.js.map +1 -0
- package/dist/task-handler.d.ts +18 -12
- package/dist/task-handler.d.ts.map +1 -1
- package/dist/task-handler.js +298 -78
- package/dist/task-handler.js.map +1 -1
- package/dist/tunnel-manager.d.ts +16 -6
- package/dist/tunnel-manager.d.ts.map +1 -1
- package/dist/tunnel-manager.js +117 -16
- package/dist/tunnel-manager.js.map +1 -1
- package/dist/worker-client.d.ts +16 -7
- package/dist/worker-client.d.ts.map +1 -1
- package/dist/worker-client.js +40 -52
- package/dist/worker-client.js.map +1 -1
- package/dist/workspace-manager.d.ts +1 -0
- package/dist/workspace-manager.d.ts.map +1 -1
- package/dist/workspace-manager.js +102 -82
- package/dist/workspace-manager.js.map +1 -1
- package/package.json +4 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-operations.js","sourceRoot":"","sources":["../src/git-operations.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"git-operations.js","sourceRoot":"","sources":["../src/git-operations.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { maskToken } from '@overlordai/protocol';
|
|
2
|
+
/**
|
|
3
|
+
* Convert a repo URL (SSH or HTTPS) to an authenticated HTTPS URL.
|
|
4
|
+
* SSH URLs like `git@github.com:org/repo.git` are converted to HTTPS.
|
|
5
|
+
* The token is injected as `oauth2:<token>@host`.
|
|
6
|
+
*/
|
|
7
|
+
export declare function buildAuthedUrl(repoUrl: string, token: string, _platform: string): string;
|
|
8
|
+
/**
|
|
9
|
+
* Mask an authenticated URL for safe logging.
|
|
10
|
+
* Replaces the oauth2:<token>@ portion with oauth2:***@.
|
|
11
|
+
*/
|
|
12
|
+
export declare function maskUrl(url: string): string;
|
|
13
|
+
export { maskToken };
|
|
14
|
+
/**
|
|
15
|
+
* Write a GIT_ASKPASS helper script and token file into the worktree.
|
|
16
|
+
* The askpass script simply cats the token file, providing the token
|
|
17
|
+
* to git when it requests credentials.
|
|
18
|
+
*/
|
|
19
|
+
export declare function writeAskpassFiles(worktreePath: string, token: string): {
|
|
20
|
+
askpassPath: string;
|
|
21
|
+
tokenFilePath: string;
|
|
22
|
+
};
|
|
23
|
+
/**
|
|
24
|
+
* Remove the askpass script and token file created by writeAskpassFiles.
|
|
25
|
+
*/
|
|
26
|
+
export declare function cleanupAskpassFiles(worktreePath: string): void;
|
|
27
|
+
//# sourceMappingURL=git-token-helper.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"git-token-helper.d.ts","sourceRoot":"","sources":["../src/git-token-helper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAkBxF;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,OAAO,EAAE,SAAS,EAAE,CAAC;AAErB;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,GACZ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAqBhD;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAO9D"}
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.maskToken = void 0;
|
|
37
|
+
exports.buildAuthedUrl = buildAuthedUrl;
|
|
38
|
+
exports.maskUrl = maskUrl;
|
|
39
|
+
exports.writeAskpassFiles = writeAskpassFiles;
|
|
40
|
+
exports.cleanupAskpassFiles = cleanupAskpassFiles;
|
|
41
|
+
const fs = __importStar(require("node:fs"));
|
|
42
|
+
const path = __importStar(require("node:path"));
|
|
43
|
+
const protocol_1 = require("@overlordai/protocol");
|
|
44
|
+
Object.defineProperty(exports, "maskToken", { enumerable: true, get: function () { return protocol_1.maskToken; } });
|
|
45
|
+
/**
|
|
46
|
+
* Convert a repo URL (SSH or HTTPS) to an authenticated HTTPS URL.
|
|
47
|
+
* SSH URLs like `git@github.com:org/repo.git` are converted to HTTPS.
|
|
48
|
+
* The token is injected as `oauth2:<token>@host`.
|
|
49
|
+
*/
|
|
50
|
+
function buildAuthedUrl(repoUrl, token, _platform) {
|
|
51
|
+
let host;
|
|
52
|
+
let repoPath;
|
|
53
|
+
// SSH URL format: git@host:org/repo.git
|
|
54
|
+
const sshMatch = repoUrl.match(/^git@([^:]+):(.+)$/);
|
|
55
|
+
if (sshMatch) {
|
|
56
|
+
host = sshMatch[1];
|
|
57
|
+
repoPath = sshMatch[2];
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
// HTTPS URL format: https://host/org/repo.git
|
|
61
|
+
const url = new URL(repoUrl);
|
|
62
|
+
host = url.host;
|
|
63
|
+
repoPath = url.pathname.replace(/^\//, '');
|
|
64
|
+
}
|
|
65
|
+
const encodedToken = encodeURIComponent(token);
|
|
66
|
+
return `https://oauth2:${encodedToken}@${host}/${repoPath}`;
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Mask an authenticated URL for safe logging.
|
|
70
|
+
* Replaces the oauth2:<token>@ portion with oauth2:***@.
|
|
71
|
+
*/
|
|
72
|
+
function maskUrl(url) {
|
|
73
|
+
return url.replace(/(oauth2:)[^@]+(@)/, '$1***$2');
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* Write a GIT_ASKPASS helper script and token file into the worktree.
|
|
77
|
+
* The askpass script simply cats the token file, providing the token
|
|
78
|
+
* to git when it requests credentials.
|
|
79
|
+
*/
|
|
80
|
+
function writeAskpassFiles(worktreePath, token) {
|
|
81
|
+
// Validate worktreePath: must be absolute and contain no control characters
|
|
82
|
+
if (!path.isAbsolute(worktreePath)) {
|
|
83
|
+
throw new Error(`writeAskpassFiles: worktreePath must be absolute, got: ${worktreePath}`);
|
|
84
|
+
}
|
|
85
|
+
if (/[\n\r\0]/.test(worktreePath)) {
|
|
86
|
+
throw new Error('writeAskpassFiles: worktreePath contains control characters');
|
|
87
|
+
}
|
|
88
|
+
const overlordDir = path.join(worktreePath, '.overlord');
|
|
89
|
+
fs.mkdirSync(overlordDir, { recursive: true });
|
|
90
|
+
const tokenFilePath = path.join(overlordDir, '.git-token');
|
|
91
|
+
fs.writeFileSync(tokenFilePath, token, { mode: 0o600 });
|
|
92
|
+
// Shell-safe: single-quote the path and escape any embedded single quotes
|
|
93
|
+
const escapedTokenPath = tokenFilePath.replace(/'/g, "'\\''");
|
|
94
|
+
const askpassPath = path.join(overlordDir, 'git-askpass.sh');
|
|
95
|
+
fs.writeFileSync(askpassPath, `#!/bin/sh\ncat '${escapedTokenPath}'\n`, { mode: 0o700 });
|
|
96
|
+
return { askpassPath, tokenFilePath };
|
|
97
|
+
}
|
|
98
|
+
/**
|
|
99
|
+
* Remove the askpass script and token file created by writeAskpassFiles.
|
|
100
|
+
*/
|
|
101
|
+
function cleanupAskpassFiles(worktreePath) {
|
|
102
|
+
const overlordDir = path.join(worktreePath, '.overlord');
|
|
103
|
+
const tokenFilePath = path.join(overlordDir, '.git-token');
|
|
104
|
+
const askpassPath = path.join(overlordDir, 'git-askpass.sh');
|
|
105
|
+
try {
|
|
106
|
+
fs.unlinkSync(tokenFilePath);
|
|
107
|
+
}
|
|
108
|
+
catch { /* ignore */ }
|
|
109
|
+
try {
|
|
110
|
+
fs.unlinkSync(askpassPath);
|
|
111
|
+
}
|
|
112
|
+
catch { /* ignore */ }
|
|
113
|
+
}
|
|
114
|
+
//# sourceMappingURL=git-token-helper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"git-token-helper.js","sourceRoot":"","sources":["../src/git-token-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,wCAkBC;AAMD,0BAEC;AASD,8CAwBC;AAKD,kDAOC;AAhFD,4CAA8B;AAC9B,gDAAkC;AAClC,mDAAiD;AAmCxC,0FAnCA,oBAAS,OAmCA;AAjClB;;;;GAIG;AACH,SAAgB,cAAc,CAAC,OAAe,EAAE,KAAa,EAAE,SAAiB;IAC9E,IAAI,IAAY,CAAC;IACjB,IAAI,QAAgB,CAAC;IAErB,wCAAwC;IACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACrD,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACnB,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;SAAM,CAAC;QACN,8CAA8C;QAC9C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QAChB,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC/C,OAAO,kBAAkB,YAAY,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;AAC9D,CAAC;AAED;;;GAGG;AACH,SAAgB,OAAO,CAAC,GAAW;IACjC,OAAO,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;AACrD,CAAC;AAID;;;;GAIG;AACH,SAAgB,iBAAiB,CAC/B,YAAoB,EACpB,KAAa;IAEb,4EAA4E;IAC5E,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,0DAA0D,YAAY,EAAE,CAAC,CAAC;IAC5F,CAAC;IACD,IAAI,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IACzD,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/C,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC3D,EAAE,CAAC,aAAa,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAExD,0EAA0E;IAC1E,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAC7D,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,mBAAmB,gBAAgB,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAEzF,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;AACxC,CAAC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CAAC,YAAoB;IACtD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAE7D,IAAI,CAAC;QAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;IAC5D,IAAI,CAAC;QAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;AAC5D,CAAC"}
|
package/dist/healthz.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"healthz.d.ts","sourceRoot":"","sources":["../src/healthz.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,qBAAqB,GAAG,MAAM,aAAa,CAAC;AAExD,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,cAAc,CAAwB;gBAElC,cAAc,EAAE,qBAAqB;IAIjD,KAAK,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"healthz.d.ts","sourceRoot":"","sources":["../src/healthz.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,qBAAqB,GAAG,MAAM,aAAa,CAAC;AAExD,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,cAAc,CAAwB;gBAElC,cAAc,EAAE,qBAAqB;IAIjD,KAAK,IAAI,IAAI;IA0Cb,IAAI,IAAI,IAAI;CAOb"}
|
package/dist/healthz.js
CHANGED
|
@@ -52,18 +52,14 @@ class HealthzServer {
|
|
|
52
52
|
this.server = http.createServer((req, res) => {
|
|
53
53
|
if (req.method === 'GET' && req.url === '/healthz') {
|
|
54
54
|
const status = this.statusProvider();
|
|
55
|
-
// Determine health status based on JWT validity and WS connection
|
|
56
55
|
const jwtValid = status.jwtRemainingMs > 0;
|
|
57
56
|
let healthStatus;
|
|
58
|
-
if (!jwtValid)
|
|
57
|
+
if (!jwtValid)
|
|
59
58
|
healthStatus = 'unhealthy';
|
|
60
|
-
|
|
61
|
-
else if (!status.wsConnected) {
|
|
59
|
+
else if (!status.wsConnected)
|
|
62
60
|
healthStatus = 'degraded';
|
|
63
|
-
|
|
64
|
-
else {
|
|
61
|
+
else
|
|
65
62
|
healthStatus = 'healthy';
|
|
66
|
-
}
|
|
67
63
|
const httpStatus = healthStatus === 'unhealthy' ? 503 : 200;
|
|
68
64
|
const body = JSON.stringify({
|
|
69
65
|
status: healthStatus,
|
package/dist/healthz.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"healthz.js","sourceRoot":"","sources":["../src/healthz.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,gDAAwB;AAExB,MAAM,GAAG,GAAG,IAAA,cAAI,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;AAEtC,MAAM,YAAY,GAAG,IAAI,CAAC;AAC1B,MAAM,YAAY,GAAG,WAAW,CAAC;AAUjC,MAAa,aAAa;IAChB,MAAM,GAAuB,IAAI,CAAC;IAClC,cAAc,CAAwB;IAE9C,YAAY,cAAqC;QAC/C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC3C,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,GAAG,CAAC,GAAG,KAAK,UAAU,EAAE,CAAC;gBACnD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;gBAErC,
|
|
1
|
+
{"version":3,"file":"healthz.js","sourceRoot":"","sources":["../src/healthz.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,gDAAwB;AAExB,MAAM,GAAG,GAAG,IAAA,cAAI,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;AAEtC,MAAM,YAAY,GAAG,IAAI,CAAC;AAC1B,MAAM,YAAY,GAAG,WAAW,CAAC;AAUjC,MAAa,aAAa;IAChB,MAAM,GAAuB,IAAI,CAAC;IAClC,cAAc,CAAwB;IAE9C,YAAY,cAAqC;QAC/C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC3C,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,GAAG,CAAC,GAAG,KAAK,UAAU,EAAE,CAAC;gBACnD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;gBAErC,MAAM,QAAQ,GAAG,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC;gBAC3C,IAAI,YAAkD,CAAC;gBACvD,IAAI,CAAC,QAAQ;oBAAE,YAAY,GAAG,WAAW,CAAC;qBACrC,IAAI,CAAC,MAAM,CAAC,WAAW;oBAAE,YAAY,GAAG,UAAU,CAAC;;oBACnD,YAAY,GAAG,SAAS,CAAC;gBAE9B,MAAM,UAAU,GAAG,YAAY,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;gBAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;oBAC1B,MAAM,EAAE,YAAY;oBACpB,WAAW,EAAE,MAAM,CAAC,WAAW;oBAC/B,QAAQ;oBACR,WAAW,EAAE,MAAM,CAAC,WAAW;oBAC/B,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;oBACxB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACpC,CAAC,CAAC;gBAEH,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE;oBACxB,cAAc,EAAE,kBAAkB;oBAClC,eAAe,EAAE,UAAU;iBAC5B,CAAC,CAAC;gBACH,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnB,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACvB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE;YAClD,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,wBAAwB,CAAC,CAAC;QACjF,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9B,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,sBAAsB,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;CACF;AAzDD,sCAyDC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-post.d.ts","sourceRoot":"","sources":["../src/http-post.ts"],"names":[],"mappings":"AAGA,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GACnC,OAAO,CAAC,MAAM,CAAC,CAoCjB"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.httpPostJson = httpPostJson;
|
|
37
|
+
const http = __importStar(require("node:http"));
|
|
38
|
+
const https = __importStar(require("node:https"));
|
|
39
|
+
function httpPostJson(url, body, headers = {}) {
|
|
40
|
+
return new Promise((resolve, reject) => {
|
|
41
|
+
const mod = url.protocol === 'https:' ? https : http;
|
|
42
|
+
const req = mod.request({
|
|
43
|
+
hostname: url.hostname,
|
|
44
|
+
port: url.port,
|
|
45
|
+
path: url.pathname,
|
|
46
|
+
method: 'POST',
|
|
47
|
+
headers: {
|
|
48
|
+
'Content-Type': 'application/json',
|
|
49
|
+
'Content-Length': Buffer.byteLength(body).toString(),
|
|
50
|
+
...headers,
|
|
51
|
+
},
|
|
52
|
+
}, (res) => {
|
|
53
|
+
const chunks = [];
|
|
54
|
+
res.on('data', (chunk) => chunks.push(chunk));
|
|
55
|
+
res.on('end', () => {
|
|
56
|
+
const responseBody = Buffer.concat(chunks).toString('utf-8');
|
|
57
|
+
if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
|
|
58
|
+
resolve(responseBody);
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
reject(new Error(`HTTP ${res.statusCode}: ${responseBody}`));
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
});
|
|
65
|
+
req.setTimeout(30_000, () => {
|
|
66
|
+
req.destroy();
|
|
67
|
+
reject(new Error('Request timed out'));
|
|
68
|
+
});
|
|
69
|
+
req.on('error', reject);
|
|
70
|
+
req.write(body);
|
|
71
|
+
req.end();
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
//# sourceMappingURL=http-post.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-post.js","sourceRoot":"","sources":["../src/http-post.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,oCAwCC;AA3CD,gDAAkC;AAClC,kDAAoC;AAEpC,SAAgB,YAAY,CAC1B,GAAQ,EACR,IAAY,EACZ,UAAkC,EAAE;IAEpC,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QACrD,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CACrB;YACE,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,QAAQ;YAClB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;gBACpD,GAAG,OAAO;aACX;SACF,EACD,CAAC,GAAG,EAAE,EAAE;YACN,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACtD,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC7D,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;oBACpE,OAAO,CAAC,YAAY,CAAC,CAAC;gBACxB,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,UAAU,KAAK,YAAY,EAAE,CAAC,CAAC,CAAC;gBAC/D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QACF,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE;YAC1B,GAAG,CAAC,OAAO,EAAE,CAAC;YACd,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACxB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChB,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/jwt-manager.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export interface JwtPayload {
|
|
2
2
|
sub: string;
|
|
3
|
-
|
|
3
|
+
workerId: string;
|
|
4
4
|
iat: number;
|
|
5
5
|
exp: number;
|
|
6
6
|
[key: string]: unknown;
|
|
@@ -17,8 +17,7 @@ export declare class JwtManager {
|
|
|
17
17
|
getPayload(): JwtPayload | null;
|
|
18
18
|
needsRenewal(): boolean;
|
|
19
19
|
isExpired(): boolean;
|
|
20
|
-
refresh(overlordHost: string,
|
|
20
|
+
refresh(overlordHost: string, workerId: string): Promise<string>;
|
|
21
21
|
private decodePayload;
|
|
22
|
-
private httpPost;
|
|
23
22
|
}
|
|
24
23
|
//# sourceMappingURL=jwt-manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt-manager.d.ts","sourceRoot":"","sources":["../src/jwt-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jwt-manager.d.ts","sourceRoot":"","sources":["../src/jwt-manager.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,OAAO,CAAS;gBAEZ,OAAO,EAAE,MAAM;IAI3B,IAAI,IAAI,OAAO;IA4Bf,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAOvB,KAAK,IAAI,IAAI;IAab,QAAQ,IAAI,MAAM;IAIlB,UAAU,IAAI,UAAU,GAAG,IAAI;IAI/B,YAAY,IAAI,OAAO;IAMvB,SAAS,IAAI,OAAO;IAKd,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IActE,OAAO,CAAC,aAAa;CAYtB"}
|
package/dist/jwt-manager.js
CHANGED
|
@@ -39,10 +39,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
39
39
|
exports.JwtManager = void 0;
|
|
40
40
|
const fs = __importStar(require("node:fs"));
|
|
41
41
|
const path = __importStar(require("node:path"));
|
|
42
|
-
const http = __importStar(require("node:http"));
|
|
43
|
-
const https = __importStar(require("node:https"));
|
|
44
42
|
const protocol_1 = require("@overlordai/protocol");
|
|
45
43
|
const pino_1 = __importDefault(require("pino"));
|
|
44
|
+
const http_post_js_1 = require("./http-post.js");
|
|
46
45
|
const log = (0, pino_1.default)({ name: 'jwt-manager' });
|
|
47
46
|
class JwtManager {
|
|
48
47
|
jwt = '';
|
|
@@ -71,7 +70,7 @@ class JwtManager {
|
|
|
71
70
|
log.warn('Loaded JWT is expired');
|
|
72
71
|
return false;
|
|
73
72
|
}
|
|
74
|
-
log.info({
|
|
73
|
+
log.info({ workerId: this.payload.workerId, exp: new Date(this.payload.exp * 1000).toISOString() }, 'JWT loaded');
|
|
75
74
|
return true;
|
|
76
75
|
}
|
|
77
76
|
catch (err) {
|
|
@@ -115,12 +114,10 @@ class JwtManager {
|
|
|
115
114
|
return true;
|
|
116
115
|
return Date.now() >= this.payload.exp * 1000;
|
|
117
116
|
}
|
|
118
|
-
async refresh(overlordHost,
|
|
119
|
-
log.info({
|
|
120
|
-
const body = JSON.stringify({ machineId });
|
|
117
|
+
async refresh(overlordHost, workerId) {
|
|
118
|
+
log.info({ workerId }, 'Refreshing JWT');
|
|
121
119
|
const url = new URL('/api/workers/refresh-token', overlordHost);
|
|
122
|
-
const response = await
|
|
123
|
-
'Content-Type': 'application/json',
|
|
120
|
+
const response = await (0, http_post_js_1.httpPostJson)(url, JSON.stringify({ workerId }), {
|
|
124
121
|
'Authorization': `Bearer ${this.jwt}`,
|
|
125
122
|
});
|
|
126
123
|
const data = JSON.parse(response);
|
|
@@ -134,7 +131,6 @@ class JwtManager {
|
|
|
134
131
|
if (parts.length !== 3)
|
|
135
132
|
return null;
|
|
136
133
|
const payloadB64 = parts[1];
|
|
137
|
-
// Handle base64url encoding
|
|
138
134
|
const padded = payloadB64.replace(/-/g, '+').replace(/_/g, '/');
|
|
139
135
|
const json = Buffer.from(padded, 'base64').toString('utf-8');
|
|
140
136
|
return JSON.parse(json);
|
|
@@ -143,40 +139,6 @@ class JwtManager {
|
|
|
143
139
|
return null;
|
|
144
140
|
}
|
|
145
141
|
}
|
|
146
|
-
httpPost(url, body, headers) {
|
|
147
|
-
return new Promise((resolve, reject) => {
|
|
148
|
-
const mod = url.protocol === 'https:' ? https : http;
|
|
149
|
-
const req = mod.request({
|
|
150
|
-
hostname: url.hostname,
|
|
151
|
-
port: url.port,
|
|
152
|
-
path: url.pathname,
|
|
153
|
-
method: 'POST',
|
|
154
|
-
headers: {
|
|
155
|
-
...headers,
|
|
156
|
-
'Content-Length': Buffer.byteLength(body).toString(),
|
|
157
|
-
},
|
|
158
|
-
}, (res) => {
|
|
159
|
-
const chunks = [];
|
|
160
|
-
res.on('data', (chunk) => chunks.push(chunk));
|
|
161
|
-
res.on('end', () => {
|
|
162
|
-
const responseBody = Buffer.concat(chunks).toString('utf-8');
|
|
163
|
-
if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
|
|
164
|
-
resolve(responseBody);
|
|
165
|
-
}
|
|
166
|
-
else {
|
|
167
|
-
reject(new Error(`HTTP ${res.statusCode}: ${responseBody}`));
|
|
168
|
-
}
|
|
169
|
-
});
|
|
170
|
-
});
|
|
171
|
-
req.setTimeout(30_000, () => {
|
|
172
|
-
req.destroy();
|
|
173
|
-
reject(new Error('Request timed out'));
|
|
174
|
-
});
|
|
175
|
-
req.on('error', reject);
|
|
176
|
-
req.write(body);
|
|
177
|
-
req.end();
|
|
178
|
-
});
|
|
179
|
-
}
|
|
180
142
|
}
|
|
181
143
|
exports.JwtManager = JwtManager;
|
|
182
144
|
//# sourceMappingURL=jwt-manager.js.map
|
package/dist/jwt-manager.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt-manager.js","sourceRoot":"","sources":["../src/jwt-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA8B;AAC9B,gDAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"jwt-manager.js","sourceRoot":"","sources":["../src/jwt-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/lease-manager.d.ts
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { EventEmitter } from 'node:events';
|
|
2
|
+
/** Minimal interface for lease checking */
|
|
3
|
+
export interface LeaseChecker {
|
|
4
|
+
isLeaseValid(): boolean;
|
|
5
|
+
}
|
|
2
6
|
export interface LeaseManagerEvents {
|
|
3
7
|
leaseExpired: [];
|
|
4
8
|
leaseRestored: [];
|
|
@@ -7,7 +11,6 @@ export declare class LeaseManager extends EventEmitter {
|
|
|
7
11
|
private lastAck;
|
|
8
12
|
private checkTimer;
|
|
9
13
|
private wasExpired;
|
|
10
|
-
constructor();
|
|
11
14
|
start(): void;
|
|
12
15
|
stop(): void;
|
|
13
16
|
refreshLease(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lease-manager.d.ts","sourceRoot":"","sources":["../src/lease-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"lease-manager.d.ts","sourceRoot":"","sources":["../src/lease-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAM3C,2CAA2C;AAC3C,MAAM,WAAW,YAAY;IAC3B,YAAY,IAAI,OAAO,CAAC;CACzB;AAID,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,EAAE,CAAC;IACjB,aAAa,EAAE,EAAE,CAAC;CACnB;AAED,qBAAa,YAAa,SAAQ,YAAY;IAC5C,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,UAAU,CAAS;IAE3B,KAAK,IAAI,IAAI;IAgBb,IAAI,IAAI,IAAI;IAQZ,YAAY,IAAI,IAAI;IASpB,YAAY,IAAI,OAAO;IAKvB,OAAO,CAAC,UAAU;CAQnB"}
|
package/dist/lease-manager.js
CHANGED
|
@@ -13,9 +13,6 @@ class LeaseManager extends node_events_1.EventEmitter {
|
|
|
13
13
|
lastAck = 0;
|
|
14
14
|
checkTimer = null;
|
|
15
15
|
wasExpired = false;
|
|
16
|
-
constructor() {
|
|
17
|
-
super();
|
|
18
|
-
}
|
|
19
16
|
start() {
|
|
20
17
|
this.lastAck = Date.now();
|
|
21
18
|
this.wasExpired = false;
|
|
@@ -49,10 +46,9 @@ class LeaseManager extends node_events_1.EventEmitter {
|
|
|
49
46
|
return Date.now() - this.lastAck < protocol_1.EXECUTION_LEASE_TIMEOUT_MS;
|
|
50
47
|
}
|
|
51
48
|
checkLease() {
|
|
52
|
-
|
|
53
|
-
const valid = elapsed < protocol_1.EXECUTION_LEASE_TIMEOUT_MS;
|
|
54
|
-
if (!valid && !this.wasExpired) {
|
|
49
|
+
if (!this.isLeaseValid() && !this.wasExpired) {
|
|
55
50
|
this.wasExpired = true;
|
|
51
|
+
const elapsed = Date.now() - this.lastAck;
|
|
56
52
|
log.warn({ elapsedMs: elapsed, timeoutMs: protocol_1.EXECUTION_LEASE_TIMEOUT_MS }, 'Lease expired');
|
|
57
53
|
this.emit('leaseExpired');
|
|
58
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lease-manager.js","sourceRoot":"","sources":["../src/lease-manager.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA2C;AAC3C,mDAAkE;AAClE,gDAAwB;AAExB,MAAM,GAAG,GAAG,IAAA,cAAI,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"lease-manager.js","sourceRoot":"","sources":["../src/lease-manager.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA2C;AAC3C,mDAAkE;AAClE,gDAAwB;AAExB,MAAM,GAAG,GAAG,IAAA,cAAI,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;AAO5C,MAAM,uBAAuB,GAAG,MAAM,CAAC;AAOvC,MAAa,YAAa,SAAQ,0BAAY;IACpC,OAAO,GAAW,CAAC,CAAC;IACpB,UAAU,GAA0C,IAAI,CAAC;IACzD,UAAU,GAAG,KAAK,CAAC;IAE3B,KAAK;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAExB,IAAI,CAAC,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC,EAAE,uBAAuB,CAAC,CAAC;QAE5B,6BAA6B;QAC7B,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YAC1B,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAC1B,CAAC;QAED,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACpC,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACpC,CAAC;IAED,YAAY;QACV,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YACxB,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,YAAY;QACV,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACrC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,GAAG,qCAA0B,CAAC;IAChE,CAAC;IAEO,UAAU;QAChB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC7C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACvB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;YAC1C,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,qCAA0B,EAAE,EAAE,eAAe,CAAC,CAAC;YACzF,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;CACF;AAnDD,oCAmDC"}
|