zephyr-agent 0.0.58 → 0.0.59
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/lib/auth/login.js +50 -9
- package/dist/lib/auth/login.js.map +1 -1
- package/dist/lib/auth/websocket.d.ts +18 -0
- package/dist/lib/auth/websocket.js +19 -0
- package/dist/lib/auth/websocket.js.map +1 -0
- package/dist/lib/logging/debug.d.ts +0 -4
- package/dist/lib/logging/debug.js +1 -5
- package/dist/lib/logging/debug.js.map +1 -1
- package/dist/lib/logging/index.d.ts +1 -1
- package/dist/lib/logging/index.js +1 -3
- package/dist/lib/logging/index.js.map +1 -1
- package/dist/lib/node-persist/session-lock.js +1 -2
- package/dist/lib/node-persist/session-lock.js.map +1 -1
- package/dist/package.json +3 -5
- package/package.json +4 -6
- package/dist/lib/auth/sse.d.ts +0 -8
- package/dist/lib/auth/sse.js +0 -61
- package/dist/lib/auth/sse.js.map +0 -1
package/dist/lib/auth/login.js
CHANGED
|
@@ -15,8 +15,8 @@ const secret_token_1 = require("../node-persist/secret-token");
|
|
|
15
15
|
const session_lock_1 = require("../node-persist/session-lock");
|
|
16
16
|
const storage_keys_1 = require("../node-persist/storage-keys");
|
|
17
17
|
const token_1 = require("../node-persist/token");
|
|
18
|
-
const sse_1 = require("./sse");
|
|
19
18
|
const auth_flags_1 = require("./auth-flags");
|
|
19
|
+
const websocket_1 = require("./websocket");
|
|
20
20
|
/**
|
|
21
21
|
* Check if the user is already authenticated. If not, ask if they want to open a browser
|
|
22
22
|
* to authenticate. Display a message to the console.
|
|
@@ -142,9 +142,8 @@ async function openUrl(url) {
|
|
|
142
142
|
}
|
|
143
143
|
/** Generates the URL to authenticate the user. */
|
|
144
144
|
async function getAuthenticationURL(state) {
|
|
145
|
-
logging_1.ze_log.auth('getAuthenticationURL', `${(0, zephyr_edge_contract_1.ZE_API_ENDPOINT)()}${zephyr_edge_contract_1.ze_api_gateway.authorize_link}?state=${state}`);
|
|
146
145
|
const [ok, cause, data] = await (0, http_request_1.makeRequest)({
|
|
147
|
-
path: zephyr_edge_contract_1.ze_api_gateway.
|
|
146
|
+
path: zephyr_edge_contract_1.ze_api_gateway.auth_link,
|
|
148
147
|
base: (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)(),
|
|
149
148
|
query: { state },
|
|
150
149
|
});
|
|
@@ -156,12 +155,54 @@ async function getAuthenticationURL(state) {
|
|
|
156
155
|
}
|
|
157
156
|
return data;
|
|
158
157
|
}
|
|
158
|
+
/** Waits for the access token to be received from the websocket. */
|
|
159
159
|
async function waitForAccessToken(sessionKey) {
|
|
160
|
-
const
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
160
|
+
const { promise, resolve, reject } = (0, zephyr_edge_contract_1.PromiseWithResolvers)();
|
|
161
|
+
const socket = (0, websocket_1.createSocket)((0, zephyr_edge_contract_1.ZEPHYR_API_ENDPOINT)());
|
|
162
|
+
let timeoutHandle = null;
|
|
163
|
+
// Helper to properly cleanup socket
|
|
164
|
+
const cleanupSocket = () => {
|
|
165
|
+
if (timeoutHandle) {
|
|
166
|
+
clearTimeout(timeoutHandle);
|
|
167
|
+
timeoutHandle = null;
|
|
168
|
+
}
|
|
169
|
+
socket.removeAllListeners();
|
|
170
|
+
socket.disconnect();
|
|
171
|
+
socket.close();
|
|
172
|
+
};
|
|
173
|
+
try {
|
|
174
|
+
socket.once('access-token', (token) => {
|
|
175
|
+
cleanupSocket();
|
|
176
|
+
resolve(token);
|
|
177
|
+
});
|
|
178
|
+
// Creating errors outside of the listener closure makes the stack trace point
|
|
179
|
+
// to waitForAccessToken fn instead of socket.io internals event emitter code.
|
|
180
|
+
socket.once('access-token-error', (cause) => {
|
|
181
|
+
cleanupSocket();
|
|
182
|
+
reject(new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_ERROR, {
|
|
183
|
+
cause,
|
|
184
|
+
message: 'Error getting access token',
|
|
185
|
+
}));
|
|
186
|
+
});
|
|
187
|
+
socket.once('connect_error', (cause) => {
|
|
188
|
+
cleanupSocket();
|
|
189
|
+
reject(new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_ERROR, {
|
|
190
|
+
message: 'Could not connect to socket.',
|
|
191
|
+
cause,
|
|
192
|
+
}));
|
|
193
|
+
});
|
|
194
|
+
socket.emit('joinAccessTokenRoom', { state: sessionKey });
|
|
195
|
+
// The user has a specified amount of time to log in through the browser.
|
|
196
|
+
timeoutHandle = setTimeout(() => {
|
|
197
|
+
cleanupSocket();
|
|
198
|
+
reject(new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_ERROR, {
|
|
199
|
+
message: `Authentication timed out. Couldn't receive access token in ${auth_flags_1.DEFAULT_AUTH_COMPLETION_TIMEOUT_MS / 1000} seconds. Please try again.`,
|
|
200
|
+
}));
|
|
201
|
+
}, auth_flags_1.DEFAULT_AUTH_COMPLETION_TIMEOUT_MS);
|
|
202
|
+
return await promise;
|
|
203
|
+
}
|
|
204
|
+
finally {
|
|
205
|
+
cleanupSocket();
|
|
206
|
+
}
|
|
166
207
|
}
|
|
167
208
|
//# sourceMappingURL=login.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/lib/auth/login.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/lib/auth/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { type Socket } from 'socket.io-client';
|
|
2
|
+
interface ClientToServerEvents {
|
|
3
|
+
joinAccessTokenRoom: (props: {
|
|
4
|
+
state: string;
|
|
5
|
+
}) => void;
|
|
6
|
+
}
|
|
7
|
+
interface ServerToClientEvents {
|
|
8
|
+
'access-token': (token: string) => void;
|
|
9
|
+
'access-token-error': (msg: string) => void;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Creates a new socket.io connection to the specified endpoint
|
|
13
|
+
*
|
|
14
|
+
* @param endpoint The endpoint to connect to
|
|
15
|
+
* @returns A socket.io Socket instance
|
|
16
|
+
*/
|
|
17
|
+
export declare function createSocket(endpoint: string): Socket<ServerToClientEvents, ClientToServerEvents>;
|
|
18
|
+
export {};
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createSocket = createSocket;
|
|
4
|
+
const socket_io_client_1 = require("socket.io-client");
|
|
5
|
+
/**
|
|
6
|
+
* Creates a new socket.io connection to the specified endpoint
|
|
7
|
+
*
|
|
8
|
+
* @param endpoint The endpoint to connect to
|
|
9
|
+
* @returns A socket.io Socket instance
|
|
10
|
+
*/
|
|
11
|
+
function createSocket(endpoint) {
|
|
12
|
+
// Set forceNew to ensure a clean connection
|
|
13
|
+
return (0, socket_io_client_1.io)(endpoint, {
|
|
14
|
+
forceNew: true,
|
|
15
|
+
reconnection: false,
|
|
16
|
+
withCredentials: true,
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=websocket.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../src/lib/auth/websocket.ts"],"names":[],"mappings":";;AAiBA,oCASC;AA1BD,uDAA+D;AAW/D;;;;;GAKG;AACH,SAAgB,YAAY,CAC1B,QAAgB;IAEhB,4CAA4C;IAC5C,OAAO,IAAA,qBAAQ,EAAC,QAAQ,EAAE;QACxB,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,KAAK;QACnB,eAAe,EAAE,IAAI;KACtB,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -3,8 +3,6 @@ export declare const brightBlueBgName: string;
|
|
|
3
3
|
export declare const brightYellowBgName: string;
|
|
4
4
|
export declare const brightGreenBgName: string;
|
|
5
5
|
export declare const brightRedBgName: string;
|
|
6
|
-
export declare const ze_error: import("debug").Debugger;
|
|
7
|
-
export declare const ze_debug: import("debug").Debugger;
|
|
8
6
|
/**
|
|
9
7
|
* Debug contexts:
|
|
10
8
|
*
|
|
@@ -34,6 +32,4 @@ export declare const ze_log: {
|
|
|
34
32
|
remotes: import("debug").Debugger;
|
|
35
33
|
snapshot: import("debug").Debugger;
|
|
36
34
|
upload: import("debug").Debugger;
|
|
37
|
-
debug: import("debug").Debugger;
|
|
38
|
-
error: import("debug").Debugger;
|
|
39
35
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ze_log = exports.
|
|
3
|
+
exports.ze_log = exports.brightRedBgName = exports.brightGreenBgName = exports.brightYellowBgName = exports.brightBlueBgName = exports.dimmedName = void 0;
|
|
4
4
|
// light weight functions for decorated console.error + able to toggle different parts of whole module's logging result
|
|
5
5
|
const debug_1 = require("debug");
|
|
6
6
|
const picocolor_1 = require("./picocolor");
|
|
@@ -11,8 +11,6 @@ exports.brightBlueBgName = (0, picocolor_1.bold)((0, picocolor_1.bgCyanBright)((
|
|
|
11
11
|
exports.brightYellowBgName = (0, picocolor_1.bold)((0, picocolor_1.bgYellowBright)((0, picocolor_1.black)(name)));
|
|
12
12
|
exports.brightGreenBgName = (0, picocolor_1.bold)((0, picocolor_1.bgGreenBright)((0, picocolor_1.black)(name)));
|
|
13
13
|
exports.brightRedBgName = (0, picocolor_1.bold)((0, picocolor_1.bgRedBright)((0, picocolor_1.black)(name)));
|
|
14
|
-
exports.ze_error = (0, debug_1.debug)('zephyr:error');
|
|
15
|
-
exports.ze_debug = (0, debug_1.debug)('zephyr:debug');
|
|
16
14
|
const createLogger = () => {
|
|
17
15
|
return {
|
|
18
16
|
app: (0, debug_1.debug)('zephyr:app'),
|
|
@@ -27,8 +25,6 @@ const createLogger = () => {
|
|
|
27
25
|
remotes: (0, debug_1.debug)('zephyr:remotes'),
|
|
28
26
|
snapshot: (0, debug_1.debug)('zephyr:snapshot'),
|
|
29
27
|
upload: (0, debug_1.debug)('zephyr:upload'),
|
|
30
|
-
debug: (0, debug_1.debug)('zephyr:debug'),
|
|
31
|
-
error: (0, debug_1.debug)('zephyr:error'),
|
|
32
28
|
};
|
|
33
29
|
};
|
|
34
30
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../src/lib/logging/debug.ts"],"names":[],"mappings":";;;AAAA,uHAAuH;AACvH,iCAA8B;AAC9B,2CAQqB;AAErB,uDAAuD;AACvD,MAAM,IAAI,GAAG,UAAU,CAAC;AAEX,QAAA,UAAU,GAAG,IAAA,eAAG,EAAC,IAAI,CAAC,CAAC;AAEvB,QAAA,gBAAgB,GAAG,IAAA,gBAAI,EAAC,IAAA,wBAAY,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEnD,QAAA,kBAAkB,GAAG,IAAA,gBAAI,EAAC,IAAA,0BAAc,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEvD,QAAA,iBAAiB,GAAG,IAAA,gBAAI,EAAC,IAAA,yBAAa,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAErD,QAAA,eAAe,GAAG,IAAA,gBAAI,EAAC,IAAA,uBAAW,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../src/lib/logging/debug.ts"],"names":[],"mappings":";;;AAAA,uHAAuH;AACvH,iCAA8B;AAC9B,2CAQqB;AAErB,uDAAuD;AACvD,MAAM,IAAI,GAAG,UAAU,CAAC;AAEX,QAAA,UAAU,GAAG,IAAA,eAAG,EAAC,IAAI,CAAC,CAAC;AAEvB,QAAA,gBAAgB,GAAG,IAAA,gBAAI,EAAC,IAAA,wBAAY,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEnD,QAAA,kBAAkB,GAAG,IAAA,gBAAI,EAAC,IAAA,0BAAc,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEvD,QAAA,iBAAiB,GAAG,IAAA,gBAAI,EAAC,IAAA,yBAAa,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAErD,QAAA,eAAe,GAAG,IAAA,gBAAI,EAAC,IAAA,uBAAW,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAE9D,MAAM,YAAY,GAAG,GAAG,EAAE;IACxB,OAAO;QACL,GAAG,EAAE,IAAA,aAAK,EAAC,YAAY,CAAC;QACxB,IAAI,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;QAC1B,MAAM,EAAE,IAAA,aAAK,EAAC,eAAe,CAAC;QAC9B,GAAG,EAAE,IAAA,aAAK,EAAC,YAAY,CAAC;QACxB,IAAI,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;QAC1B,IAAI,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;QAC1B,EAAE,EAAE,IAAA,aAAK,EAAC,WAAW,CAAC;QACtB,IAAI,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;QAC1B,OAAO,EAAE,IAAA,aAAK,EAAC,gBAAgB,CAAC;QAChC,OAAO,EAAE,IAAA,aAAK,EAAC,gBAAgB,CAAC;QAChC,QAAQ,EAAE,IAAA,aAAK,EAAC,iBAAiB,CAAC;QAClC,MAAM,EAAE,IAAA,aAAK,EAAC,eAAe,CAAC;KAC/B,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACU,QAAA,MAAM,GAAG,YAAY,EAAE,CAAC;AACrC,qEAAqE;AACrE,wDAAwD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export { ze_log
|
|
1
|
+
export { ze_log } from './debug';
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.ze_log = void 0;
|
|
4
4
|
var debug_1 = require("./debug");
|
|
5
5
|
Object.defineProperty(exports, "ze_log", { enumerable: true, get: function () { return debug_1.ze_log; } });
|
|
6
|
-
Object.defineProperty(exports, "ze_error", { enumerable: true, get: function () { return debug_1.ze_error; } });
|
|
7
|
-
Object.defineProperty(exports, "ze_debug", { enumerable: true, get: function () { return debug_1.ze_debug; } });
|
|
8
6
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/logging/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/logging/index.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAAxB,+FAAA,MAAM,OAAA"}
|
|
@@ -68,8 +68,7 @@ function safeLockSync(createIfNotExists = true) {
|
|
|
68
68
|
// The timeout to the whole login process makes sense to keep the lock for the same amount of time
|
|
69
69
|
return (0, proper_lockfile_1.lockSync)(storage_keys_1.ZE_SESSION_LOCK, { stale: auth_flags_1.DEFAULT_AUTH_COMPLETION_TIMEOUT_MS });
|
|
70
70
|
}
|
|
71
|
-
catch (
|
|
72
|
-
const error = ex;
|
|
71
|
+
catch (error) {
|
|
73
72
|
if (error.code === 'ELOCKED') {
|
|
74
73
|
return null;
|
|
75
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-lock.js","sourceRoot":"","sources":["../../../src/lib/node-persist/session-lock.ts"],"names":[],"mappings":";;AAqBA,sCA6CC;
|
|
1
|
+
{"version":3,"file":"session-lock.js","sourceRoot":"","sources":["../../../src/lib/node-persist/session-lock.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-agent",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.59",
|
|
4
4
|
"description": "Zephyr plugin agent",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -33,26 +33,24 @@
|
|
|
33
33
|
"test": "nx test zephyr-agent"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"axios": "^1.
|
|
36
|
+
"axios": "^1.12.0",
|
|
37
37
|
"axios-retry": "^4.5.0",
|
|
38
38
|
"cloudflare": "^3.4.0",
|
|
39
39
|
"debug": "^4.3.4",
|
|
40
|
-
"eventsource": "^4.0.0",
|
|
41
40
|
"git-url-parse": "^15.0.0",
|
|
42
41
|
"is-ci": "catalog:plugin-shared",
|
|
43
42
|
"jose": "^5.10.0",
|
|
44
43
|
"node-persist": "^4.0.1",
|
|
45
44
|
"open": "^10.1.0",
|
|
46
45
|
"proper-lockfile": "^4.1.2",
|
|
46
|
+
"socket.io-client": "^4.7.5",
|
|
47
47
|
"tslib": "catalog:typescript",
|
|
48
48
|
"uuid": "^8.3.2",
|
|
49
|
-
"ws": "^8.18.3",
|
|
50
49
|
"zephyr-edge-contract": "workspace:*"
|
|
51
50
|
},
|
|
52
51
|
"devDependencies": {
|
|
53
52
|
"@jest/globals": "catalog:react",
|
|
54
53
|
"@types/debug": "^4.1.12",
|
|
55
|
-
"@types/eventsource": "^3.0.0",
|
|
56
54
|
"@types/git-url-parse": "^9.0.3",
|
|
57
55
|
"@types/is-ci": "catalog:typescript",
|
|
58
56
|
"@types/jest": "catalog:typescript",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-agent",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.59",
|
|
4
4
|
"description": "Zephyr plugin agent",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -28,26 +28,24 @@
|
|
|
28
28
|
"main": "dist/index.js",
|
|
29
29
|
"types": "dist/index.d.ts",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"axios": "^1.
|
|
31
|
+
"axios": "^1.12.0",
|
|
32
32
|
"axios-retry": "^4.5.0",
|
|
33
33
|
"cloudflare": "^3.4.0",
|
|
34
34
|
"debug": "^4.3.4",
|
|
35
|
-
"eventsource": "^4.0.0",
|
|
36
35
|
"git-url-parse": "^15.0.0",
|
|
37
36
|
"is-ci": "^4.1.0",
|
|
38
37
|
"jose": "^5.10.0",
|
|
39
38
|
"node-persist": "^4.0.1",
|
|
40
39
|
"open": "^10.1.0",
|
|
41
40
|
"proper-lockfile": "^4.1.2",
|
|
41
|
+
"socket.io-client": "^4.7.5",
|
|
42
42
|
"tslib": "^2.8.1",
|
|
43
43
|
"uuid": "^8.3.2",
|
|
44
|
-
"
|
|
45
|
-
"zephyr-edge-contract": "0.0.58"
|
|
44
|
+
"zephyr-edge-contract": "0.0.59"
|
|
46
45
|
},
|
|
47
46
|
"devDependencies": {
|
|
48
47
|
"@jest/globals": "^29.7.0",
|
|
49
48
|
"@types/debug": "^4.1.12",
|
|
50
|
-
"@types/eventsource": "^3.0.0",
|
|
51
49
|
"@types/git-url-parse": "^9.0.3",
|
|
52
50
|
"@types/is-ci": "3.0.4",
|
|
53
51
|
"@types/jest": "29.5.14",
|
package/dist/lib/auth/sse.d.ts
DELETED
package/dist/lib/auth/sse.js
DELETED
|
@@ -1,61 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AuthListener = void 0;
|
|
4
|
-
const eventsource_1 = require("eventsource");
|
|
5
|
-
const logging_1 = require("../logging");
|
|
6
|
-
const errors_1 = require("../errors");
|
|
7
|
-
class AuthListener {
|
|
8
|
-
constructor(workerUrl) {
|
|
9
|
-
workerUrl.pathname = '/sse';
|
|
10
|
-
this.workerUrl = workerUrl;
|
|
11
|
-
}
|
|
12
|
-
async waitForToken(timeoutMs = 5 * 60 * 1000) {
|
|
13
|
-
const sessionId = this.workerUrl.searchParams.get('sessionId');
|
|
14
|
-
if (!sessionId) {
|
|
15
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
|
|
16
|
-
message: 'Session ID is required',
|
|
17
|
-
});
|
|
18
|
-
}
|
|
19
|
-
return new Promise((resolve, reject) => {
|
|
20
|
-
const eventSource = new eventsource_1.EventSource(this.workerUrl);
|
|
21
|
-
const timeout = setTimeout(() => {
|
|
22
|
-
eventSource.close();
|
|
23
|
-
reject(new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
|
|
24
|
-
message: 'Auth timeout',
|
|
25
|
-
}));
|
|
26
|
-
}, timeoutMs);
|
|
27
|
-
eventSource.onmessage = (event) => {
|
|
28
|
-
var _a, _b;
|
|
29
|
-
try {
|
|
30
|
-
const data = JSON.parse(event.data);
|
|
31
|
-
if (data.type === 'token') {
|
|
32
|
-
clearTimeout(timeout);
|
|
33
|
-
eventSource.close();
|
|
34
|
-
const token = (_a = data.token) !== null && _a !== void 0 ? _a : (_b = data.tokens) === null || _b === void 0 ? void 0 : _b.access_token;
|
|
35
|
-
resolve({ sessionId, token });
|
|
36
|
-
}
|
|
37
|
-
else if (data.type === 'error') {
|
|
38
|
-
clearTimeout(timeout);
|
|
39
|
-
eventSource.close();
|
|
40
|
-
reject(new Error(data.message));
|
|
41
|
-
}
|
|
42
|
-
else {
|
|
43
|
-
(0, logging_1.ze_debug)('AuthListener', `Unknown message type: ${data.type}`);
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
catch (err) {
|
|
47
|
-
clearTimeout(timeout);
|
|
48
|
-
eventSource.close();
|
|
49
|
-
reject(err);
|
|
50
|
-
}
|
|
51
|
-
};
|
|
52
|
-
eventSource.onerror = (error) => {
|
|
53
|
-
clearTimeout(timeout);
|
|
54
|
-
eventSource.close();
|
|
55
|
-
reject(error);
|
|
56
|
-
};
|
|
57
|
-
});
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
exports.AuthListener = AuthListener;
|
|
61
|
-
//# sourceMappingURL=sse.js.map
|
package/dist/lib/auth/sse.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"sse.js","sourceRoot":"","sources":["../../../src/lib/auth/sse.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,wCAAsC;AACtC,sCAAkD;AAElD,MAAa,YAAY;IAEvB,YAAY,SAAc;QACxB,SAAS,CAAC,QAAQ,GAAG,MAAM,CAAC;QAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,SAAS,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI;QAEzB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,WAAW,EAAE;gBAC1C,OAAO,EAAE,wBAAwB;aAClC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,WAAW,GAAG,IAAI,yBAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEpD,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC9B,WAAW,CAAC,KAAK,EAAE,CAAC;gBACpB,MAAM,CACJ,IAAI,oBAAW,CAAC,iBAAQ,CAAC,WAAW,EAAE;oBACpC,OAAO,EAAE,cAAc;iBACxB,CAAC,CACH,CAAC;YACJ,CAAC,EAAE,SAAS,CAAC,CAAC;YAEd,WAAW,CAAC,SAAS,GAAG,CAAC,KAAmB,EAAE,EAAE;;gBAC9C,IAAI,CAAC;oBACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACpC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;wBAC1B,YAAY,CAAC,OAAO,CAAC,CAAC;wBACtB,WAAW,CAAC,KAAK,EAAE,CAAC;wBACpB,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,mCAAI,MAAA,IAAI,CAAC,MAAM,0CAAE,YAAY,CAAC;wBACtD,OAAO,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;oBAChC,CAAC;yBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;wBACjC,YAAY,CAAC,OAAO,CAAC,CAAC;wBACtB,WAAW,CAAC,KAAK,EAAE,CAAC;wBACpB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;oBAClC,CAAC;yBAAM,CAAC;wBACN,IAAA,kBAAQ,EAAC,cAAc,EAAE,yBAAyB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBACjE,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,YAAY,CAAC,OAAO,CAAC,CAAC;oBACtB,WAAW,CAAC,KAAK,EAAE,CAAC;oBACpB,MAAM,CAAC,GAAG,CAAC,CAAC;gBACd,CAAC;YACH,CAAC,CAAC;YAEF,WAAW,CAAC,OAAO,GAAG,CAAC,KAAY,EAAE,EAAE;gBACrC,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,WAAW,CAAC,KAAK,EAAE,CAAC;gBACpB,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA1DD,oCA0DC"}
|