asyar-sdk 4.18.0 → 4.18.1
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/ipc/hostChannel.d.ts +15 -0
- package/dist/ipc/hostChannel.d.ts.map +1 -0
- package/dist/ipc/hostChannel.js +30 -0
- package/dist/ipc/hostChannel.js.map +1 -0
- package/dist/services/AiServiceProxy.d.ts.map +1 -1
- package/dist/services/AiServiceProxy.js +8 -12
- package/dist/services/AiServiceProxy.js.map +1 -1
- package/dist/services/AiServiceProxy.worker.test.d.ts +2 -0
- package/dist/services/AiServiceProxy.worker.test.d.ts.map +1 -0
- package/dist/services/AiServiceProxy.worker.test.js +80 -0
- package/dist/services/AiServiceProxy.worker.test.js.map +1 -0
- package/dist/services/OAuthServiceProxy.d.ts.map +1 -1
- package/dist/services/OAuthServiceProxy.js +9 -4
- package/dist/services/OAuthServiceProxy.js.map +1 -1
- package/dist/services/OAuthServiceProxy.worker.test.d.ts +2 -0
- package/dist/services/OAuthServiceProxy.worker.test.d.ts.map +1 -0
- package/dist/services/OAuthServiceProxy.worker.test.js +81 -0
- package/dist/services/OAuthServiceProxy.worker.test.js.map +1 -0
- package/dist/services/SettingsServiceProxy.d.ts.map +1 -1
- package/dist/services/SettingsServiceProxy.js +2 -4
- package/dist/services/SettingsServiceProxy.js.map +1 -1
- package/dist/services/SettingsServiceProxy.worker.test.d.ts +2 -0
- package/dist/services/SettingsServiceProxy.worker.test.d.ts.map +1 -0
- package/dist/services/SettingsServiceProxy.worker.test.js +39 -0
- package/dist/services/SettingsServiceProxy.worker.test.js.map +1 -0
- package/dist/services/ShellServiceProxy.d.ts.map +1 -1
- package/dist/services/ShellServiceProxy.js +6 -4
- package/dist/services/ShellServiceProxy.js.map +1 -1
- package/dist/services/ShellServiceProxy.worker.test.d.ts +2 -0
- package/dist/services/ShellServiceProxy.worker.test.d.ts.map +1 -0
- package/dist/services/ShellServiceProxy.worker.test.js +96 -0
- package/dist/services/ShellServiceProxy.worker.test.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Realm-neutral access to the launcher host.
|
|
3
|
+
*
|
|
4
|
+
* An extension runs either in an iframe (has `window`, talks to
|
|
5
|
+
* `window.parent`) or in a Web Worker (no `window`, talks through `self`).
|
|
6
|
+
* Service proxies that listen for host messages or post to the host must use
|
|
7
|
+
* these helpers instead of touching `window` directly, so they work in both.
|
|
8
|
+
*/
|
|
9
|
+
type MessageListener = (event: MessageEvent) => void;
|
|
10
|
+
/** Listens for messages sent by the host. Returns a function that stops listening. */
|
|
11
|
+
export declare function listenToHost(listener: MessageListener): () => void;
|
|
12
|
+
/** Posts a message to the host (iframe parent, or the worker's owner). */
|
|
13
|
+
export declare function postToHost(message: unknown): void;
|
|
14
|
+
export {};
|
|
15
|
+
//# sourceMappingURL=hostChannel.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hostChannel.d.ts","sourceRoot":"","sources":["../../src/ipc/hostChannel.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,KAAK,eAAe,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;AAMrD,sFAAsF;AACtF,wBAAgB,YAAY,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,IAAI,CAWlE;AAED,0EAA0E;AAC1E,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAMjD"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Realm-neutral access to the launcher host.
|
|
3
|
+
*
|
|
4
|
+
* An extension runs either in an iframe (has `window`, talks to
|
|
5
|
+
* `window.parent`) or in a Web Worker (no `window`, talks through `self`).
|
|
6
|
+
* Service proxies that listen for host messages or post to the host must use
|
|
7
|
+
* these helpers instead of touching `window` directly, so they work in both.
|
|
8
|
+
*/
|
|
9
|
+
function hasWindow() {
|
|
10
|
+
return typeof window !== 'undefined' && typeof window.addEventListener === 'function';
|
|
11
|
+
}
|
|
12
|
+
/** Listens for messages sent by the host. Returns a function that stops listening. */
|
|
13
|
+
export function listenToHost(listener) {
|
|
14
|
+
if (hasWindow()) {
|
|
15
|
+
window.addEventListener('message', listener);
|
|
16
|
+
return () => window.removeEventListener('message', listener);
|
|
17
|
+
}
|
|
18
|
+
const scope = self;
|
|
19
|
+
scope.addEventListener('message', listener);
|
|
20
|
+
return () => scope.removeEventListener('message', listener);
|
|
21
|
+
}
|
|
22
|
+
/** Posts a message to the host (iframe parent, or the worker's owner). */
|
|
23
|
+
export function postToHost(message) {
|
|
24
|
+
if (hasWindow()) {
|
|
25
|
+
window.parent.postMessage(message, '*');
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
self.postMessage(message);
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=hostChannel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hostChannel.js","sourceRoot":"","sources":["../../src/ipc/hostChannel.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,SAAS,SAAS;IAChB,OAAO,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,MAAM,CAAC,gBAAgB,KAAK,UAAU,CAAC;AACxF,CAAC;AAED,sFAAsF;AACtF,MAAM,UAAU,YAAY,CAAC,QAAyB;IACpD,IAAI,SAAS,EAAE,EAAE,CAAC;QAChB,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC7C,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC/D,CAAC;IACD,MAAM,KAAK,GAAG,IAGb,CAAC;IACF,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC5C,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,UAAU,CAAC,OAAgB;IACzC,IAAI,SAAS,EAAE,EAAE,CAAC;QAChB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACxC,OAAO;IACT,CAAC;IACA,IAA2D,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;AACpF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AiServiceProxy.d.ts","sourceRoot":"","sources":["../../src/services/AiServiceProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"AiServiceProxy.d.ts","sourceRoot":"","sources":["../../src/services/AiServiceProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,KAAK,EACV,2BAA2B,EAE3B,cAAc,EACd,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EACV,2BAA2B,EAE3B,cAAc,EACd,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EACV,sBAAsB,EACtB,mBAAmB,EACnB,aAAa,EACb,WAAW,EACX,gBAAgB,EACjB,MAAM,yBAAyB,CAAC;AAEjC;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,gBAAiB,YAAW,UAAU;IAClE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC;IAiCxE,MAAM,CACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,EAChC,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,MAAM,CAAC;IAuFlB,OAAO,CAAC,gBAAgB,CAAuC;IAE/D,uBAAuB,CAAC,MAAM,EAAE,2BAA2B,GAAG,MAAM,IAAI;IAiBlE,sBAAsB,CAC1B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,eAAe,CAAC;IAc3B,OAAO,CAAC,UAAU,CAAmE;IAErF,iBAAiB,CAAC,MAAM,EAAE,2BAA2B,GAAG,MAAM,IAAI;IAqB5D,sBAAsB,CAC1B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,eAAe,CAAC;IAc3B,OAAO,CAAC,WAAW,CAA6C;IAEhE,kBAAkB,CAAC,QAAQ,EAAE,sBAAsB,GAAG,MAAM,IAAI;IAkB1D,sBAAsB,CAC1B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,EACvC,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,IAAI,CAAC;IAWV,0BAA0B,CAC9B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,WAAW,EAAE,CAAC;CAa1B"}
|
|
@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { BaseServiceProxy } from './BaseServiceProxy';
|
|
11
|
+
import { listenToHost, postToHost } from '../ipc/hostChannel';
|
|
11
12
|
/**
|
|
12
13
|
* SDK proxy for the AI prompting service.
|
|
13
14
|
* Allows Tier 2 extensions to prompt the host's configured AI model
|
|
@@ -65,10 +66,9 @@ export class AiServiceProxy extends BaseServiceProxy {
|
|
|
65
66
|
let settled = false;
|
|
66
67
|
let accumulated = '';
|
|
67
68
|
return new Promise((resolve, reject) => {
|
|
69
|
+
let stopListening = () => { };
|
|
68
70
|
const cleanup = () => {
|
|
69
|
-
|
|
70
|
-
window.removeEventListener('message', onMessage);
|
|
71
|
-
}
|
|
71
|
+
stopListening();
|
|
72
72
|
if (options === null || options === void 0 ? void 0 : options.signal) {
|
|
73
73
|
options.signal.removeEventListener('abort', onAbort);
|
|
74
74
|
}
|
|
@@ -87,12 +87,10 @@ export class AiServiceProxy extends BaseServiceProxy {
|
|
|
87
87
|
};
|
|
88
88
|
const onAbort = () => {
|
|
89
89
|
var _a, _b;
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
}, '*');
|
|
95
|
-
}
|
|
90
|
+
postToHost({
|
|
91
|
+
type: 'asyar:stream:abort',
|
|
92
|
+
streamId,
|
|
93
|
+
});
|
|
96
94
|
settle((_b = (_a = options === null || options === void 0 ? void 0 : options.signal) === null || _a === void 0 ? void 0 : _a.reason) !== null && _b !== void 0 ? _b : new Error('Operation was aborted'));
|
|
97
95
|
};
|
|
98
96
|
if (options === null || options === void 0 ? void 0 : options.signal) {
|
|
@@ -129,9 +127,7 @@ export class AiServiceProxy extends BaseServiceProxy {
|
|
|
129
127
|
}
|
|
130
128
|
}
|
|
131
129
|
};
|
|
132
|
-
|
|
133
|
-
window.addEventListener('message', onMessage);
|
|
134
|
-
}
|
|
130
|
+
stopListening = listenToHost(onMessage);
|
|
135
131
|
this.broker
|
|
136
132
|
.invoke('ai:streamChat', {
|
|
137
133
|
prompt,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AiServiceProxy.js","sourceRoot":"","sources":["../../src/services/AiServiceProxy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"AiServiceProxy.js","sourceRoot":"","sources":["../../src/services/AiServiceProxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AiServiceProxy.worker.test.d.ts","sourceRoot":"","sources":["../../src/services/AiServiceProxy.worker.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
/** @vitest-environment node */
|
|
11
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
12
|
+
import { AiServiceProxy } from './AiServiceProxy';
|
|
13
|
+
import { messageBroker } from '../ipc/MessageBroker';
|
|
14
|
+
vi.mock('../ipc/MessageBroker', () => ({
|
|
15
|
+
messageBroker: { invoke: vi.fn(), on: vi.fn(), off: vi.fn() },
|
|
16
|
+
}));
|
|
17
|
+
/** A Web Worker has no `window` (node environment); its global is `self`. */
|
|
18
|
+
function stubWorkerGlobals() {
|
|
19
|
+
const listeners = new Set();
|
|
20
|
+
const postMessage = vi.fn();
|
|
21
|
+
vi.stubGlobal('self', {
|
|
22
|
+
postMessage,
|
|
23
|
+
addEventListener: (_type, cb) => listeners.add(cb),
|
|
24
|
+
removeEventListener: (_type, cb) => listeners.delete(cb),
|
|
25
|
+
});
|
|
26
|
+
const fire = (data) => listeners.forEach((cb) => cb({ data }));
|
|
27
|
+
return { listeners, postMessage, fire };
|
|
28
|
+
}
|
|
29
|
+
describe('AiServiceProxy.stream inside a Web Worker', () => {
|
|
30
|
+
let proxy;
|
|
31
|
+
let mockInvoke;
|
|
32
|
+
beforeEach(() => {
|
|
33
|
+
vi.clearAllMocks();
|
|
34
|
+
mockInvoke = vi.fn().mockImplementation(() => new Promise(() => { }));
|
|
35
|
+
Object.assign(messageBroker, { invoke: mockInvoke, on: vi.fn(), off: vi.fn() });
|
|
36
|
+
proxy = new AiServiceProxy();
|
|
37
|
+
proxy.setExtensionId('ext.test');
|
|
38
|
+
});
|
|
39
|
+
afterEach(() => vi.unstubAllGlobals());
|
|
40
|
+
it('receives chunks and resolves on done', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
41
|
+
const { fire } = stubWorkerGlobals();
|
|
42
|
+
const chunks = [];
|
|
43
|
+
const promise = proxy.stream('hi', (d) => chunks.push(d));
|
|
44
|
+
yield vi.waitFor(() => expect(mockInvoke).toHaveBeenCalled());
|
|
45
|
+
const streamId = mockInvoke.mock.calls[0][1].streamId;
|
|
46
|
+
fire({ type: 'asyar:stream', streamId, phase: 'chunk', data: { delta: 'Hel' } });
|
|
47
|
+
fire({ type: 'asyar:stream', streamId, phase: 'chunk', data: 'lo' });
|
|
48
|
+
fire({ type: 'asyar:stream', streamId, phase: 'done', data: {} });
|
|
49
|
+
yield expect(promise).resolves.toBe('Hello');
|
|
50
|
+
expect(chunks).toEqual(['Hel', 'lo']);
|
|
51
|
+
}));
|
|
52
|
+
it('removes its listener when the stream ends', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
53
|
+
const { fire, listeners } = stubWorkerGlobals();
|
|
54
|
+
const promise = proxy.stream('hi', () => { });
|
|
55
|
+
yield vi.waitFor(() => expect(mockInvoke).toHaveBeenCalled());
|
|
56
|
+
expect(listeners.size).toBe(1);
|
|
57
|
+
fire({
|
|
58
|
+
type: 'asyar:stream',
|
|
59
|
+
streamId: mockInvoke.mock.calls[0][1].streamId,
|
|
60
|
+
phase: 'done',
|
|
61
|
+
data: {},
|
|
62
|
+
});
|
|
63
|
+
yield promise;
|
|
64
|
+
expect(listeners.size).toBe(0);
|
|
65
|
+
}));
|
|
66
|
+
it('abort posts asyar:stream:abort through self.postMessage', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
67
|
+
const { postMessage } = stubWorkerGlobals();
|
|
68
|
+
const controller = new AbortController();
|
|
69
|
+
const promise = proxy.stream('hi', () => { }, { signal: controller.signal });
|
|
70
|
+
promise.catch(() => { });
|
|
71
|
+
yield vi.waitFor(() => expect(mockInvoke).toHaveBeenCalled());
|
|
72
|
+
controller.abort();
|
|
73
|
+
expect(postMessage).toHaveBeenCalledWith({
|
|
74
|
+
type: 'asyar:stream:abort',
|
|
75
|
+
streamId: mockInvoke.mock.calls[0][1].streamId,
|
|
76
|
+
});
|
|
77
|
+
yield expect(promise).rejects.toBeDefined();
|
|
78
|
+
}));
|
|
79
|
+
});
|
|
80
|
+
//# sourceMappingURL=AiServiceProxy.worker.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AiServiceProxy.worker.test.js","sourceRoot":"","sources":["../../src/services/AiServiceProxy.worker.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OAuthServiceProxy.d.ts","sourceRoot":"","sources":["../../src/services/OAuthServiceProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAc,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"OAuthServiceProxy.d.ts","sourceRoot":"","sources":["../../src/services/OAuthServiceProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAc,MAAM,iBAAiB,CAAC;AAG1F;;;;;;;;;;GAUG;AACH,qBAAa,iBAAkB,SAAQ,gBAAiB,YAAW,aAAa;IAC9E,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAuDnD,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAG/C"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { BaseServiceProxy } from './BaseServiceProxy';
|
|
2
|
+
import { listenToHost } from '../ipc/hostChannel';
|
|
2
3
|
/**
|
|
3
4
|
* SDK proxy for the OAuthService.
|
|
4
5
|
*
|
|
@@ -15,13 +16,17 @@ export class OAuthServiceProxy extends BaseServiceProxy {
|
|
|
15
16
|
return new Promise((resolve, reject) => {
|
|
16
17
|
// crypto.randomUUID is available in modern browsers and in Tauri WebViews.
|
|
17
18
|
const flowId = crypto.randomUUID();
|
|
19
|
+
let stopListening = () => { };
|
|
20
|
+
const cleanup = () => {
|
|
21
|
+
stopListening();
|
|
22
|
+
};
|
|
18
23
|
const handler = (event) => {
|
|
19
24
|
const msg = event.data;
|
|
20
25
|
if ((msg === null || msg === void 0 ? void 0 : msg.type) !== 'asyar:oauth:result')
|
|
21
26
|
return;
|
|
22
27
|
if ((msg === null || msg === void 0 ? void 0 : msg.flowId) !== flowId)
|
|
23
28
|
return;
|
|
24
|
-
|
|
29
|
+
cleanup();
|
|
25
30
|
if (msg.error) {
|
|
26
31
|
const err = msg.error;
|
|
27
32
|
reject(new Error(`OAuth error [${err.code}]: ${err.message}`));
|
|
@@ -32,7 +37,7 @@ export class OAuthServiceProxy extends BaseServiceProxy {
|
|
|
32
37
|
};
|
|
33
38
|
// Register BEFORE invoke — prevents race condition where deep-link
|
|
34
39
|
// callback resolves synchronously before the listener is attached.
|
|
35
|
-
|
|
40
|
+
stopListening = listenToHost(handler);
|
|
36
41
|
this.broker
|
|
37
42
|
.invoke('oauth:authorize', {
|
|
38
43
|
// Key insertion order must match Object.values() dispatch in IpcRouter,
|
|
@@ -48,13 +53,13 @@ export class OAuthServiceProxy extends BaseServiceProxy {
|
|
|
48
53
|
.then((result) => {
|
|
49
54
|
if ('accessToken' in result) {
|
|
50
55
|
// Host returned a cached token directly — no postMessage needed
|
|
51
|
-
|
|
56
|
+
cleanup();
|
|
52
57
|
resolve(result);
|
|
53
58
|
}
|
|
54
59
|
// If { pending: true }, keep the listener active and wait
|
|
55
60
|
})
|
|
56
61
|
.catch((err) => {
|
|
57
|
-
|
|
62
|
+
cleanup();
|
|
58
63
|
reject(err);
|
|
59
64
|
});
|
|
60
65
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OAuthServiceProxy.js","sourceRoot":"","sources":["../../src/services/OAuthServiceProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"OAuthServiceProxy.js","sourceRoot":"","sources":["../../src/services/OAuthServiceProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;;;;;GAUG;AACH,MAAM,OAAO,iBAAkB,SAAQ,gBAAgB;IACrD,SAAS,CAAC,MAAmB;QAC3B,OAAO,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACjD,2EAA2E;YAC3E,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;YACnC,IAAI,aAAa,GAAe,GAAG,EAAE,GAAE,CAAC,CAAC;YACzC,MAAM,OAAO,GAAG,GAAG,EAAE;gBACnB,aAAa,EAAE,CAAC;YAClB,CAAC,CAAC;YAEF,MAAM,OAAO,GAAG,CAAC,KAAmB,EAAE,EAAE;gBACtC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC;gBACvB,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,oBAAoB;oBAAE,OAAO;gBAC/C,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,MAAK,MAAM;oBAAE,OAAO;gBAEnC,OAAO,EAAE,CAAC;gBAEV,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;oBACd,MAAM,GAAG,GAAG,GAAG,CAAC,KAAmB,CAAC;oBACpC,MAAM,CAAC,IAAI,KAAK,CAAC,gBAAgB,GAAG,CAAC,IAAI,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBACjE,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,GAAG,CAAC,KAAmB,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC,CAAC;YAEF,mEAAmE;YACnE,mEAAmE;YACnE,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;YAEtC,IAAI,CAAC,MAAM;iBACR,MAAM,CAAiC,iBAAiB,EAAE;gBACzD,wEAAwE;gBACxE,0EAA0E;gBAC1E,2FAA2F;gBAC3F,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;gBACzC,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM;aACP,CAAC;iBACD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBACf,IAAI,aAAa,IAAI,MAAM,EAAE,CAAC;oBAC5B,gEAAgE;oBAChE,OAAO,EAAE,CAAC;oBACV,OAAO,CAAC,MAAoB,CAAC,CAAC;gBAChC,CAAC;gBACD,0DAA0D;YAC5D,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACb,OAAO,EAAE,CAAC;gBACV,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;IAED,WAAW,CAAC,UAAkB;QAC5B,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IACjE,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OAuthServiceProxy.worker.test.d.ts","sourceRoot":"","sources":["../../src/services/OAuthServiceProxy.worker.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
/** @vitest-environment node */
|
|
11
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
12
|
+
import { OAuthServiceProxy } from './OAuthServiceProxy';
|
|
13
|
+
import { messageBroker } from '../ipc/MessageBroker';
|
|
14
|
+
vi.mock('../ipc/MessageBroker', () => ({
|
|
15
|
+
messageBroker: { invoke: vi.fn(), on: vi.fn(), off: vi.fn() },
|
|
16
|
+
}));
|
|
17
|
+
/** A Web Worker has no `window` (node environment); its global is `self`. */
|
|
18
|
+
function stubWorkerGlobals() {
|
|
19
|
+
const listeners = new Set();
|
|
20
|
+
const postMessage = vi.fn();
|
|
21
|
+
vi.stubGlobal('self', {
|
|
22
|
+
postMessage,
|
|
23
|
+
addEventListener: (_type, cb) => listeners.add(cb),
|
|
24
|
+
removeEventListener: (_type, cb) => listeners.delete(cb),
|
|
25
|
+
});
|
|
26
|
+
const fire = (data) => listeners.forEach((cb) => cb({ data }));
|
|
27
|
+
return { listeners, postMessage, fire };
|
|
28
|
+
}
|
|
29
|
+
function makeProxy() {
|
|
30
|
+
const mockInvoke = vi.fn().mockResolvedValue({ pending: true });
|
|
31
|
+
Object.assign(messageBroker, { invoke: mockInvoke, on: vi.fn(), off: vi.fn() });
|
|
32
|
+
const proxy = new OAuthServiceProxy();
|
|
33
|
+
proxy.setExtensionId('ext.test');
|
|
34
|
+
return { proxy, mockInvoke };
|
|
35
|
+
}
|
|
36
|
+
const config = {
|
|
37
|
+
providerId: 'github',
|
|
38
|
+
clientId: 'cid',
|
|
39
|
+
authorizationUrl: 'https://example.com/auth',
|
|
40
|
+
tokenUrl: 'https://example.com/token',
|
|
41
|
+
scopes: ['repo'],
|
|
42
|
+
};
|
|
43
|
+
describe('OAuthServiceProxy inside a Web Worker', () => {
|
|
44
|
+
beforeEach(() => vi.clearAllMocks());
|
|
45
|
+
afterEach(() => vi.unstubAllGlobals());
|
|
46
|
+
it('resolves when asyar:oauth:result arrives on self', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
47
|
+
const { fire, listeners } = stubWorkerGlobals();
|
|
48
|
+
const { proxy, mockInvoke } = makeProxy();
|
|
49
|
+
const promise = proxy.authorize(config);
|
|
50
|
+
yield vi.waitFor(() => expect(mockInvoke).toHaveBeenCalled());
|
|
51
|
+
const flowId = mockInvoke.mock.calls[0][1].flowId;
|
|
52
|
+
expect(listeners.size).toBe(1);
|
|
53
|
+
const token = { accessToken: 'tok-123', tokenType: 'Bearer', scopes: ['repo'] };
|
|
54
|
+
fire({ type: 'asyar:oauth:result', flowId, token });
|
|
55
|
+
yield expect(promise).resolves.toEqual(token);
|
|
56
|
+
expect(listeners.size).toBe(0);
|
|
57
|
+
}));
|
|
58
|
+
it('rejects and removes listener when asyar:oauth:result carries an error', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
59
|
+
const { fire, listeners } = stubWorkerGlobals();
|
|
60
|
+
const { proxy, mockInvoke } = makeProxy();
|
|
61
|
+
const promise = proxy.authorize(config);
|
|
62
|
+
yield vi.waitFor(() => expect(mockInvoke).toHaveBeenCalled());
|
|
63
|
+
const flowId = mockInvoke.mock.calls[0][1].flowId;
|
|
64
|
+
fire({
|
|
65
|
+
type: 'asyar:oauth:result',
|
|
66
|
+
flowId,
|
|
67
|
+
error: { code: 'access_denied', message: 'Denied' },
|
|
68
|
+
});
|
|
69
|
+
yield expect(promise).rejects.toThrow('OAuth error [access_denied]: Denied');
|
|
70
|
+
expect(listeners.size).toBe(0);
|
|
71
|
+
}));
|
|
72
|
+
it('cleans up listener when invoke returns a cached token', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
73
|
+
const { listeners } = stubWorkerGlobals();
|
|
74
|
+
const { proxy, mockInvoke } = makeProxy();
|
|
75
|
+
const cached = { accessToken: 'cached', tokenType: 'Bearer', scopes: [] };
|
|
76
|
+
mockInvoke.mockResolvedValueOnce(cached);
|
|
77
|
+
yield expect(proxy.authorize(config)).resolves.toEqual(cached);
|
|
78
|
+
expect(listeners.size).toBe(0);
|
|
79
|
+
}));
|
|
80
|
+
});
|
|
81
|
+
//# sourceMappingURL=OAuthServiceProxy.worker.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OAuthServiceProxy.worker.test.js","sourceRoot":"","sources":["../../src/services/OAuthServiceProxy.worker.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingsServiceProxy.d.ts","sourceRoot":"","sources":["../../src/services/SettingsServiceProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"SettingsServiceProxy.d.ts","sourceRoot":"","sources":["../../src/services/SettingsServiceProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAG3D,qBAAa,oBAAqB,SAAQ,gBAAiB,YAAW,gBAAgB;IAC9E,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAIhD,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI;CAS3E"}
|
|
@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { BaseServiceProxy } from './BaseServiceProxy';
|
|
11
|
+
import { listenToHost } from '../ipc/hostChannel';
|
|
11
12
|
export class SettingsServiceProxy extends BaseServiceProxy {
|
|
12
13
|
get(section, key) {
|
|
13
14
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -26,10 +27,7 @@ export class SettingsServiceProxy extends BaseServiceProxy {
|
|
|
26
27
|
callback(e.data.payload);
|
|
27
28
|
}
|
|
28
29
|
};
|
|
29
|
-
|
|
30
|
-
return () => {
|
|
31
|
-
window.removeEventListener('message', handler);
|
|
32
|
-
};
|
|
30
|
+
return listenToHost(handler);
|
|
33
31
|
}
|
|
34
32
|
}
|
|
35
33
|
//# sourceMappingURL=SettingsServiceProxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingsServiceProxy.js","sourceRoot":"","sources":["../../src/services/SettingsServiceProxy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"SettingsServiceProxy.js","sourceRoot":"","sources":["../../src/services/SettingsServiceProxy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,OAAO,oBAAqB,SAAQ,gBAAgB;IAClD,GAAG,CAAI,OAAe,EAAE,GAAW;;YACvC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAI,cAAc,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QACjE,CAAC;KAAA;IAEK,GAAG,CAAI,OAAe,EAAE,GAAW,EAAE,KAAQ;;YACjD,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAO,cAAc,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3E,CAAC;KAAA;IAED,SAAS,CAAI,OAAe,EAAE,QAA+B;QAC3D,MAAM,OAAO,GAAG,CAAC,CAAe,EAAE,EAAE;;YAClC,IAAI,CAAA,MAAA,CAAC,CAAC,IAAI,0CAAE,IAAI,MAAK,6BAA6B,IAAI,CAAA,MAAA,CAAC,CAAC,IAAI,0CAAE,OAAO,MAAK,OAAO,EAAE,CAAC;gBAClF,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC,CAAC;QAEF,OAAO,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SettingsServiceProxy.worker.test.d.ts","sourceRoot":"","sources":["../../src/services/SettingsServiceProxy.worker.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/** @vitest-environment node */
|
|
2
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
3
|
+
import { SettingsServiceProxy } from './SettingsServiceProxy';
|
|
4
|
+
vi.mock('../ipc/MessageBroker', () => ({
|
|
5
|
+
messageBroker: { invoke: vi.fn(), on: vi.fn(), off: vi.fn() },
|
|
6
|
+
}));
|
|
7
|
+
/** A Web Worker has no `window` (node environment); its global is `self`. */
|
|
8
|
+
function stubWorkerGlobals() {
|
|
9
|
+
const listeners = new Set();
|
|
10
|
+
vi.stubGlobal('self', {
|
|
11
|
+
postMessage: vi.fn(),
|
|
12
|
+
addEventListener: (_type, cb) => listeners.add(cb),
|
|
13
|
+
removeEventListener: (_type, cb) => listeners.delete(cb),
|
|
14
|
+
});
|
|
15
|
+
const fire = (data) => listeners.forEach((cb) => cb({ data }));
|
|
16
|
+
return { listeners, fire };
|
|
17
|
+
}
|
|
18
|
+
describe('SettingsServiceProxy.onChanged inside a Web Worker', () => {
|
|
19
|
+
beforeEach(() => vi.clearAllMocks());
|
|
20
|
+
afterEach(() => vi.unstubAllGlobals());
|
|
21
|
+
it('delivers settingsChanged events from self and unsubscribes cleanly', () => {
|
|
22
|
+
const { fire, listeners } = stubWorkerGlobals();
|
|
23
|
+
const proxy = new SettingsServiceProxy();
|
|
24
|
+
const cb = vi.fn();
|
|
25
|
+
const unsub = proxy.onChanged('appearance', cb);
|
|
26
|
+
expect(listeners.size).toBe(1);
|
|
27
|
+
fire({
|
|
28
|
+
type: 'asyar:event:settingsChanged',
|
|
29
|
+
section: 'appearance',
|
|
30
|
+
payload: { theme: 'dark' },
|
|
31
|
+
});
|
|
32
|
+
fire({ type: 'asyar:event:settingsChanged', section: 'other', payload: { x: 1 } });
|
|
33
|
+
expect(cb).toHaveBeenCalledTimes(1);
|
|
34
|
+
expect(cb).toHaveBeenCalledWith({ theme: 'dark' });
|
|
35
|
+
unsub();
|
|
36
|
+
expect(listeners.size).toBe(0);
|
|
37
|
+
});
|
|
38
|
+
});
|
|
39
|
+
//# sourceMappingURL=SettingsServiceProxy.worker.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SettingsServiceProxy.worker.test.js","sourceRoot":"","sources":["../../src/services/SettingsServiceProxy.worker.test.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAG9D,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;CAC9D,CAAC,CAAC,CAAC;AAEJ,6EAA6E;AAC7E,SAAS,iBAAiB;IACxB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAiC,CAAC;IAC3D,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE;QACpB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;QACpB,gBAAgB,EAAE,CAAC,KAAa,EAAE,EAAiC,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QACzF,mBAAmB,EAAE,CAAC,KAAa,EAAE,EAAiC,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAChG,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAkB,CAAC,CAAC,CAAC;IACvF,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;AAC7B,CAAC;AAED,QAAQ,CAAC,oDAAoD,EAAE,GAAG,EAAE;IAClE,UAAU,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC;IACrC,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEvC,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,iBAAiB,EAAE,CAAC;QAChD,MAAM,KAAK,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACzC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAEnB,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QAChD,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE/B,IAAI,CAAC;YACH,IAAI,EAAE,6BAA6B;YACnC,OAAO,EAAE,YAAY;YACrB,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;SAC3B,CAAC,CAAC;QACH,IAAI,CAAC,EAAE,IAAI,EAAE,6BAA6B,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAEnF,MAAM,CAAC,EAAE,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,CAAC,EAAE,CAAC,CAAC,oBAAoB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAEnD,KAAK,EAAE,CAAC;QACR,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellServiceProxy.d.ts","sourceRoot":"","sources":["../../src/services/ShellServiceProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ShellServiceProxy.d.ts","sourceRoot":"","sources":["../../src/services/ShellServiceProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EACL,aAAa,EAEb,eAAe,EACf,WAAW,EACX,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAEzB,qBAAa,iBAAkB,SAAQ,gBAAiB,YAAW,aAAa;IAC9E,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW;IAajC,IAAI,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAKxC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW;IAMpC;;;;OAIG;IACH,OAAO,CAAC,WAAW;CA0FpB"}
|
|
@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { BaseServiceProxy } from './BaseServiceProxy';
|
|
11
|
+
import { listenToHost, postToHost } from '../ipc/hostChannel';
|
|
11
12
|
export class ShellServiceProxy extends BaseServiceProxy {
|
|
12
13
|
spawn(params) {
|
|
13
14
|
const spawnId = crypto.randomUUID();
|
|
@@ -38,8 +39,9 @@ export class ShellServiceProxy extends BaseServiceProxy {
|
|
|
38
39
|
let chunkCb = () => { };
|
|
39
40
|
let doneCb = () => { };
|
|
40
41
|
let errorCb = () => { };
|
|
42
|
+
let stopListening = () => { };
|
|
41
43
|
const cleanup = () => {
|
|
42
|
-
|
|
44
|
+
stopListening();
|
|
43
45
|
};
|
|
44
46
|
const settle = (err, exitCode) => {
|
|
45
47
|
if (settled)
|
|
@@ -73,7 +75,7 @@ export class ShellServiceProxy extends BaseServiceProxy {
|
|
|
73
75
|
break;
|
|
74
76
|
}
|
|
75
77
|
};
|
|
76
|
-
|
|
78
|
+
stopListening = listenToHost(onMessage);
|
|
77
79
|
invokeCall().catch((err) => {
|
|
78
80
|
const errorStr = String(err.message || err);
|
|
79
81
|
settle({ code: invokeErrorCode, message: errorStr });
|
|
@@ -92,10 +94,10 @@ export class ShellServiceProxy extends BaseServiceProxy {
|
|
|
92
94
|
abort: () => {
|
|
93
95
|
if (settled)
|
|
94
96
|
return;
|
|
95
|
-
|
|
97
|
+
postToHost({
|
|
96
98
|
type: 'asyar:stream:abort',
|
|
97
99
|
streamId: spawnId,
|
|
98
|
-
}
|
|
100
|
+
});
|
|
99
101
|
settle({ code: 'ABORTED', message: 'Process was aborted by the extension' });
|
|
100
102
|
},
|
|
101
103
|
write: (data) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellServiceProxy.js","sourceRoot":"","sources":["../../src/services/ShellServiceProxy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ShellServiceProxy.js","sourceRoot":"","sources":["../../src/services/ShellServiceProxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ShellServiceProxy.worker.test.d.ts","sourceRoot":"","sources":["../../src/services/ShellServiceProxy.worker.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
/** @vitest-environment node */
|
|
11
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
12
|
+
import { ShellServiceProxy } from './ShellServiceProxy';
|
|
13
|
+
import { messageBroker } from '../ipc/MessageBroker';
|
|
14
|
+
vi.mock('../ipc/MessageBroker', () => ({
|
|
15
|
+
messageBroker: { invoke: vi.fn(), on: vi.fn(), off: vi.fn() },
|
|
16
|
+
}));
|
|
17
|
+
/**
|
|
18
|
+
* A Web Worker has no `window`; its global is `self`. These tests remove
|
|
19
|
+
* `window` (node environment) and provide a fake worker `self` (issue #1028).
|
|
20
|
+
*/
|
|
21
|
+
function stubWorkerGlobals() {
|
|
22
|
+
const listeners = new Set();
|
|
23
|
+
const postMessage = vi.fn();
|
|
24
|
+
vi.stubGlobal('self', {
|
|
25
|
+
postMessage,
|
|
26
|
+
addEventListener: (_type, cb) => listeners.add(cb),
|
|
27
|
+
removeEventListener: (_type, cb) => listeners.delete(cb),
|
|
28
|
+
});
|
|
29
|
+
const fire = (data) => listeners.forEach((cb) => cb({ data }));
|
|
30
|
+
return { listeners, postMessage, fire };
|
|
31
|
+
}
|
|
32
|
+
function makeProxy() {
|
|
33
|
+
const mockInvoke = vi.fn().mockResolvedValue({ streaming: true });
|
|
34
|
+
Object.assign(messageBroker, { invoke: mockInvoke, on: vi.fn(), off: vi.fn() });
|
|
35
|
+
const proxy = new ShellServiceProxy();
|
|
36
|
+
proxy.setExtensionId('ext.test');
|
|
37
|
+
return { proxy, mockInvoke };
|
|
38
|
+
}
|
|
39
|
+
describe('ShellServiceProxy inside a Web Worker', () => {
|
|
40
|
+
beforeEach(() => vi.clearAllMocks());
|
|
41
|
+
afterEach(() => vi.unstubAllGlobals());
|
|
42
|
+
it('spawn does not throw when `window` is missing', () => {
|
|
43
|
+
stubWorkerGlobals();
|
|
44
|
+
const { proxy } = makeProxy();
|
|
45
|
+
expect(() => proxy.spawn({ program: 'echo' })).not.toThrow();
|
|
46
|
+
});
|
|
47
|
+
it('delivers chunk and done events from self', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
48
|
+
const { fire } = stubWorkerGlobals();
|
|
49
|
+
const { proxy, mockInvoke } = makeProxy();
|
|
50
|
+
const handle = proxy.spawn({ program: 'echo', args: ['hi'] });
|
|
51
|
+
yield vi.waitFor(() => expect(mockInvoke).toHaveBeenCalled());
|
|
52
|
+
const spawnId = mockInvoke.mock.calls[0][1].spawnId;
|
|
53
|
+
const chunks = [];
|
|
54
|
+
const onDone = vi.fn();
|
|
55
|
+
handle.onChunk((c) => chunks.push(c));
|
|
56
|
+
handle.onDone(onDone);
|
|
57
|
+
fire({
|
|
58
|
+
type: 'asyar:stream',
|
|
59
|
+
streamId: spawnId,
|
|
60
|
+
phase: 'chunk',
|
|
61
|
+
data: { stream: 'stdout', data: 'hi' },
|
|
62
|
+
});
|
|
63
|
+
fire({ type: 'asyar:stream', streamId: spawnId, phase: 'done', data: { exitCode: 0 } });
|
|
64
|
+
expect(chunks).toEqual([{ stream: 'stdout', data: 'hi' }]);
|
|
65
|
+
expect(onDone).toHaveBeenCalledWith(0);
|
|
66
|
+
}));
|
|
67
|
+
it('removes its listener after done', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
68
|
+
const { fire, listeners } = stubWorkerGlobals();
|
|
69
|
+
const { proxy, mockInvoke } = makeProxy();
|
|
70
|
+
proxy.spawn({ program: 'echo' });
|
|
71
|
+
yield vi.waitFor(() => expect(mockInvoke).toHaveBeenCalled());
|
|
72
|
+
expect(listeners.size).toBe(1);
|
|
73
|
+
fire({
|
|
74
|
+
type: 'asyar:stream',
|
|
75
|
+
streamId: mockInvoke.mock.calls[0][1].spawnId,
|
|
76
|
+
phase: 'done',
|
|
77
|
+
data: {},
|
|
78
|
+
});
|
|
79
|
+
expect(listeners.size).toBe(0);
|
|
80
|
+
}));
|
|
81
|
+
it('abort posts asyar:stream:abort through self.postMessage', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
82
|
+
const { postMessage } = stubWorkerGlobals();
|
|
83
|
+
const { proxy, mockInvoke } = makeProxy();
|
|
84
|
+
const handle = proxy.spawn({ program: 'sleep', args: ['9'] });
|
|
85
|
+
yield vi.waitFor(() => expect(mockInvoke).toHaveBeenCalled());
|
|
86
|
+
const onError = vi.fn();
|
|
87
|
+
handle.onError(onError);
|
|
88
|
+
handle.abort();
|
|
89
|
+
expect(postMessage).toHaveBeenCalledWith({
|
|
90
|
+
type: 'asyar:stream:abort',
|
|
91
|
+
streamId: mockInvoke.mock.calls[0][1].spawnId,
|
|
92
|
+
});
|
|
93
|
+
expect(onError).toHaveBeenCalledWith(expect.objectContaining({ code: 'ABORTED' }));
|
|
94
|
+
}));
|
|
95
|
+
});
|
|
96
|
+
//# sourceMappingURL=ShellServiceProxy.worker.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ShellServiceProxy.worker.test.js","sourceRoot":"","sources":["../../src/services/ShellServiceProxy.worker.test.ts"],"names":[],"mappings":"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"}
|