@modelprofile.com/browser-runtime 5.7.0 → 5.7.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/changelog.md +12 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/actions.js +36 -2
- package/dist_ts/confinement.js +24 -3
- package/package.json +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/actions.ts +35 -1
- package/ts/confinement.ts +27 -2
package/changelog.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-15 - 5.7.2
|
|
4
|
+
|
|
5
|
+
### Fixes
|
|
6
|
+
|
|
7
|
+
- validate native video source and dialog state (actions)
|
|
8
|
+
|
|
9
|
+
## 2026-09-14 - 5.7.1
|
|
10
|
+
|
|
11
|
+
### Fixes
|
|
12
|
+
|
|
13
|
+
- validate confinement across native presentation changes (video)
|
|
14
|
+
|
|
3
15
|
## 2026-09-14 - 5.7.0
|
|
4
16
|
|
|
5
17
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@modelprofile.com/browser-runtime',
|
|
6
|
-
version: '5.7.
|
|
6
|
+
version: '5.7.2',
|
|
7
7
|
description: 'Parent-owned, resource-centric Chromium runtime with revisioned attachment fencing, authenticated human and agent control, fail-closed egress, bounded artifacts, and Flex/MCP adapters.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxtQ0FBbUM7SUFDekMsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDBMQUEwTDtDQUN4TSxDQUFBIn0=
|
package/dist_ts/actions.js
CHANGED
|
@@ -121,7 +121,7 @@ export const validateAgentAction = (value) => {
|
|
|
121
121
|
}
|
|
122
122
|
};
|
|
123
123
|
const validateRuntimeState = (value) => {
|
|
124
|
-
const state = validateExactKeys(value, ['status', 'activeTabId', 'viewportRevision', 'viewport', 'tabs', 'lastError', 'videoAcceleration'], 'browser state');
|
|
124
|
+
const state = validateExactKeys(value, ['status', 'activeTabId', 'viewportRevision', 'viewport', 'tabs', 'lastError', 'videoAcceleration', 'videoSource'], 'browser state');
|
|
125
125
|
if (state.status !== 'stopped'
|
|
126
126
|
&& state.status !== 'starting'
|
|
127
127
|
&& state.status !== 'running'
|
|
@@ -151,6 +151,7 @@ const validateRuntimeState = (value) => {
|
|
|
151
151
|
'generation',
|
|
152
152
|
'appliedViewportRevision',
|
|
153
153
|
'streaming',
|
|
154
|
+
'dialog',
|
|
154
155
|
], 'tab');
|
|
155
156
|
validateBoundedString(tab.id, 'tab.id', 1, 128);
|
|
156
157
|
if (typeof tab.url !== 'string' || tab.url.length > 8192)
|
|
@@ -164,6 +165,39 @@ const validateRuntimeState = (value) => {
|
|
|
164
165
|
throw new BrowserRuntimeError('PROTOCOL_ERROR');
|
|
165
166
|
validateInteger(tab.generation, 'tab.generation', 0, Number.MAX_SAFE_INTEGER);
|
|
166
167
|
validateInteger(tab.appliedViewportRevision, 'tab.appliedViewportRevision', 0, Number.MAX_SAFE_INTEGER);
|
|
168
|
+
if (tab.dialog !== undefined) {
|
|
169
|
+
const dialog = validateExactKeys(tab.dialog, ['id', 'type', 'message', 'defaultPrompt', 'url'], 'dialog');
|
|
170
|
+
validateBoundedString(dialog.id, 'dialog.id', 1, 128);
|
|
171
|
+
if (!['alert', 'confirm', 'prompt', 'beforeunload'].includes(dialog.type)) {
|
|
172
|
+
throw new BrowserRuntimeError('PROTOCOL_ERROR');
|
|
173
|
+
}
|
|
174
|
+
for (const [key, maximum] of [['message', 16_384], ['defaultPrompt', 4096], ['url', 4096]]) {
|
|
175
|
+
if (typeof dialog[key] !== 'string' || dialog[key].length > maximum) {
|
|
176
|
+
throw new BrowserRuntimeError('PROTOCOL_ERROR');
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
if (state.videoSource !== undefined) {
|
|
182
|
+
const source = validateExactKeys(state.videoSource, ['tabId', 'generation', 'viewportRevision', 'viewport', 'frameAlignment', 'rtpTimestampFloor'], 'videoSource');
|
|
183
|
+
validateBoundedString(source.tabId, 'videoSource.tabId', 1, 128);
|
|
184
|
+
validateInteger(source.generation, 'videoSource.generation', 0, Number.MAX_SAFE_INTEGER);
|
|
185
|
+
validateInteger(source.viewportRevision, 'videoSource.viewportRevision', 0, Number.MAX_SAFE_INTEGER);
|
|
186
|
+
const sourceViewport = validateExactKeys(source.viewport, ['width', 'height', 'deviceScaleFactor'], 'videoSource.viewport');
|
|
187
|
+
const matchingTabs = state.tabs.filter(tab => tab.id === source.tabId);
|
|
188
|
+
const tab = matchingTabs[0];
|
|
189
|
+
if (matchingTabs.length !== 1 || !tab?.active || !tab.streaming || tab.status !== 'open'
|
|
190
|
+
|| source.tabId !== state.activeTabId || source.generation !== tab.generation
|
|
191
|
+
|| source.viewportRevision !== state.viewportRevision || source.viewportRevision !== tab.appliedViewportRevision
|
|
192
|
+
|| sourceViewport.width !== viewport.width || sourceViewport.height !== viewport.height
|
|
193
|
+
|| sourceViewport.deviceScaleFactor !== viewport.deviceScaleFactor) {
|
|
194
|
+
throw new BrowserRuntimeError('PROTOCOL_ERROR');
|
|
195
|
+
}
|
|
196
|
+
if (source.frameAlignment !== undefined || source.rtpTimestampFloor !== undefined) {
|
|
197
|
+
if (source.frameAlignment !== 2)
|
|
198
|
+
throw new BrowserRuntimeError('PROTOCOL_ERROR');
|
|
199
|
+
validateInteger(source.rtpTimestampFloor, 'videoSource.rtpTimestampFloor', 0, 0xffffffff);
|
|
200
|
+
}
|
|
167
201
|
}
|
|
168
202
|
if (state.videoAcceleration !== undefined) {
|
|
169
203
|
const acceleration = validateExactKeys(state.videoAcceleration, ['renderer', 'compositing', 'videoEncoding'], 'videoAcceleration');
|
|
@@ -230,4 +264,4 @@ export const validateAgentActionResult = (value) => {
|
|
|
230
264
|
}
|
|
231
265
|
throw new BrowserRuntimeError('PROTOCOL_ERROR');
|
|
232
266
|
};
|
|
233
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"actions.js","sourceRoot":"","sources":["../ts/actions.ts"],"names":[],"mappings":"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"}
|
|
267
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"actions.js","sourceRoot":"","sources":["../ts/actions.ts"],"names":[],"mappings":"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"}
|
package/dist_ts/confinement.js
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { BrowserRuntimeError } from './errors.js';
|
|
3
|
+
const restoredProbeState = (before, after) => {
|
|
4
|
+
const restored = structuredClone(after);
|
|
5
|
+
const previousTab = before.tabs.find(tab => tab.id === before.activeTabId);
|
|
6
|
+
const currentTab = restored.tabs.find(tab => tab.id === before.activeTabId);
|
|
7
|
+
const previousSource = before.videoSource;
|
|
8
|
+
const currentSource = restored.videoSource;
|
|
9
|
+
// Native capture must reselect the original surface after an inactive probe
|
|
10
|
+
// window closes. Only its presentation epoch may advance; all document,
|
|
11
|
+
// viewport, tab, acceleration and source-identity fields still compare exactly.
|
|
12
|
+
if (previousTab && currentTab && previousSource?.frameAlignment === 2 && currentSource?.frameAlignment === 2
|
|
13
|
+
&& previousSource.tabId === previousTab.id && currentSource.tabId === currentTab.id
|
|
14
|
+
&& previousSource.generation === previousTab.generation && currentSource.generation === currentTab.generation
|
|
15
|
+
&& Number.isSafeInteger(currentTab.generation) && currentTab.generation >= previousTab.generation
|
|
16
|
+
&& Number.isInteger(previousSource.rtpTimestampFloor) && Number.isInteger(currentSource.rtpTimestampFloor)
|
|
17
|
+
&& currentSource.rtpTimestampFloor >= 0 && currentSource.rtpTimestampFloor <= 0xffffffff
|
|
18
|
+
&& ((currentSource.rtpTimestampFloor - previousSource.rtpTimestampFloor) >>> 0) < 0x80000000) {
|
|
19
|
+
currentTab.generation = previousTab.generation;
|
|
20
|
+
currentSource.generation = previousSource.generation;
|
|
21
|
+
currentSource.rtpTimestampFloor = previousSource.rtpTimestampFloor;
|
|
22
|
+
}
|
|
23
|
+
return JSON.stringify(restored) === JSON.stringify(before);
|
|
24
|
+
};
|
|
3
25
|
const listenOnUnsupportedPort = async (allowedPorts, onRequest) => {
|
|
4
26
|
for (let attempt = 0; attempt < 8; attempt += 1) {
|
|
5
27
|
const server = plugins.http.createServer((_request, response) => {
|
|
@@ -21,7 +43,6 @@ const listenOnUnsupportedPort = async (allowedPorts, onRequest) => {
|
|
|
21
43
|
};
|
|
22
44
|
export const runProductionConfinementProbe = async (context) => {
|
|
23
45
|
const initialState = context.session.getState();
|
|
24
|
-
const initialStateJson = JSON.stringify(initialState);
|
|
25
46
|
let probeTabId;
|
|
26
47
|
let probeFailed = false;
|
|
27
48
|
let probeError;
|
|
@@ -82,7 +103,7 @@ export const runProductionConfinementProbe = async (context) => {
|
|
|
82
103
|
}
|
|
83
104
|
await closeFixture().catch((error) => cleanupErrors.push(error));
|
|
84
105
|
try {
|
|
85
|
-
if (
|
|
106
|
+
if (!restoredProbeState(initialState, context.session.getState())) {
|
|
86
107
|
cleanupErrors.push(new BrowserRuntimeError('CONFINEMENT_FAILED'));
|
|
87
108
|
}
|
|
88
109
|
}
|
|
@@ -101,4 +122,4 @@ export const runProductionConfinementProbe = async (context) => {
|
|
|
101
122
|
if (probeFailed)
|
|
102
123
|
throw probeError;
|
|
103
124
|
};
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmluZW1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jb25maW5lbWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFbEQsTUFBTSxrQkFBa0IsR0FBRyxDQUN6QixNQUFnRCxFQUNoRCxLQUErQyxFQUN0QyxFQUFFO0lBQ1gsTUFBTSxRQUFRLEdBQUcsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3hDLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsS0FBSyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDM0UsTUFBTSxVQUFVLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsRUFBRSxLQUFLLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUM1RSxNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDO0lBQzFDLE1BQU0sYUFBYSxHQUFHLFFBQVEsQ0FBQyxXQUFXLENBQUM7SUFDM0MsNEVBQTRFO0lBQzVFLHdFQUF3RTtJQUN4RSxnRkFBZ0Y7SUFDaEYsSUFBSSxXQUFXLElBQUksVUFBVSxJQUFJLGNBQWMsRUFBRSxjQUFjLEtBQUssQ0FBQyxJQUFJLGFBQWEsRUFBRSxjQUFjLEtBQUssQ0FBQztXQUN2RyxjQUFjLENBQUMsS0FBSyxLQUFLLFdBQVcsQ0FBQyxFQUFFLElBQUksYUFBYSxDQUFDLEtBQUssS0FBSyxVQUFVLENBQUMsRUFBRTtXQUNoRixjQUFjLENBQUMsVUFBVSxLQUFLLFdBQVcsQ0FBQyxVQUFVLElBQUksYUFBYSxDQUFDLFVBQVUsS0FBSyxVQUFVLENBQUMsVUFBVTtXQUMxRyxN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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@modelprofile.com/browser-runtime",
|
|
3
|
-
"version": "5.7.
|
|
3
|
+
"version": "5.7.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Parent-owned, resource-centric Chromium runtime with revisioned attachment fencing, authenticated human and agent control, fail-closed egress, bounded artifacts, and Flex/MCP adapters.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"@push.rocks/smartagent": "^6.0.0",
|
|
31
31
|
"@push.rocks/smartipc": "^2.6.0",
|
|
32
32
|
"@push.rocks/smartmcp": "^0.3.0",
|
|
33
|
-
"@push.rocks/smartpuppeteer": "^2.13.
|
|
33
|
+
"@push.rocks/smartpuppeteer": "^2.13.1",
|
|
34
34
|
"ipaddr.js": "^2.5.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@modelprofile.com/browser-runtime',
|
|
6
|
-
version: '5.7.
|
|
6
|
+
version: '5.7.2',
|
|
7
7
|
description: 'Parent-owned, resource-centric Chromium runtime with revisioned attachment fencing, authenticated human and agent control, fail-closed egress, bounded artifacts, and Flex/MCP adapters.'
|
|
8
8
|
}
|
package/ts/actions.ts
CHANGED
|
@@ -130,7 +130,7 @@ export const validateAgentAction = (value: unknown): TBrowserAgentAction => {
|
|
|
130
130
|
const validateRuntimeState = (value: unknown): IBrowserRuntimeState => {
|
|
131
131
|
const state = validateExactKeys(
|
|
132
132
|
value,
|
|
133
|
-
['status', 'activeTabId', 'viewportRevision', 'viewport', 'tabs', 'lastError', 'videoAcceleration'],
|
|
133
|
+
['status', 'activeTabId', 'viewportRevision', 'viewport', 'tabs', 'lastError', 'videoAcceleration', 'videoSource'],
|
|
134
134
|
'browser state',
|
|
135
135
|
);
|
|
136
136
|
if (
|
|
@@ -167,6 +167,7 @@ const validateRuntimeState = (value: unknown): IBrowserRuntimeState => {
|
|
|
167
167
|
'generation',
|
|
168
168
|
'appliedViewportRevision',
|
|
169
169
|
'streaming',
|
|
170
|
+
'dialog',
|
|
170
171
|
], 'tab');
|
|
171
172
|
validateBoundedString(tab.id, 'tab.id', 1, 128);
|
|
172
173
|
if (typeof tab.url !== 'string' || tab.url.length > 8192) throw new BrowserRuntimeError('PROTOCOL_ERROR');
|
|
@@ -182,6 +183,39 @@ const validateRuntimeState = (value: unknown): IBrowserRuntimeState => {
|
|
|
182
183
|
0,
|
|
183
184
|
Number.MAX_SAFE_INTEGER,
|
|
184
185
|
);
|
|
186
|
+
if (tab.dialog !== undefined) {
|
|
187
|
+
const dialog = validateExactKeys(tab.dialog, ['id', 'type', 'message', 'defaultPrompt', 'url'], 'dialog');
|
|
188
|
+
validateBoundedString(dialog.id, 'dialog.id', 1, 128);
|
|
189
|
+
if (!['alert', 'confirm', 'prompt', 'beforeunload'].includes(dialog.type as string)) {
|
|
190
|
+
throw new BrowserRuntimeError('PROTOCOL_ERROR');
|
|
191
|
+
}
|
|
192
|
+
for (const [key, maximum] of [['message', 16_384], ['defaultPrompt', 4096], ['url', 4096]] as const) {
|
|
193
|
+
if (typeof dialog[key] !== 'string' || dialog[key].length > maximum) {
|
|
194
|
+
throw new BrowserRuntimeError('PROTOCOL_ERROR');
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
if (state.videoSource !== undefined) {
|
|
200
|
+
const source = validateExactKeys(state.videoSource,
|
|
201
|
+
['tabId', 'generation', 'viewportRevision', 'viewport', 'frameAlignment', 'rtpTimestampFloor'], 'videoSource');
|
|
202
|
+
validateBoundedString(source.tabId, 'videoSource.tabId', 1, 128);
|
|
203
|
+
validateInteger(source.generation, 'videoSource.generation', 0, Number.MAX_SAFE_INTEGER);
|
|
204
|
+
validateInteger(source.viewportRevision, 'videoSource.viewportRevision', 0, Number.MAX_SAFE_INTEGER);
|
|
205
|
+
const sourceViewport = validateExactKeys(source.viewport, ['width', 'height', 'deviceScaleFactor'], 'videoSource.viewport');
|
|
206
|
+
const matchingTabs = (state.tabs as IBrowserRuntimeState['tabs']).filter(tab => tab.id === source.tabId);
|
|
207
|
+
const tab = matchingTabs[0];
|
|
208
|
+
if (matchingTabs.length !== 1 || !tab?.active || !tab.streaming || tab.status !== 'open'
|
|
209
|
+
|| source.tabId !== state.activeTabId || source.generation !== tab.generation
|
|
210
|
+
|| source.viewportRevision !== state.viewportRevision || source.viewportRevision !== tab.appliedViewportRevision
|
|
211
|
+
|| sourceViewport.width !== viewport.width || sourceViewport.height !== viewport.height
|
|
212
|
+
|| sourceViewport.deviceScaleFactor !== viewport.deviceScaleFactor) {
|
|
213
|
+
throw new BrowserRuntimeError('PROTOCOL_ERROR');
|
|
214
|
+
}
|
|
215
|
+
if (source.frameAlignment !== undefined || source.rtpTimestampFloor !== undefined) {
|
|
216
|
+
if (source.frameAlignment !== 2) throw new BrowserRuntimeError('PROTOCOL_ERROR');
|
|
217
|
+
validateInteger(source.rtpTimestampFloor, 'videoSource.rtpTimestampFloor', 0, 0xffffffff);
|
|
218
|
+
}
|
|
185
219
|
}
|
|
186
220
|
if (state.videoAcceleration !== undefined) {
|
|
187
221
|
const acceleration = validateExactKeys(state.videoAcceleration,
|
package/ts/confinement.ts
CHANGED
|
@@ -2,6 +2,32 @@ import * as plugins from './plugins.js';
|
|
|
2
2
|
import type { IBrowserConfinementProbeContext } from './interfaces.js';
|
|
3
3
|
import { BrowserRuntimeError } from './errors.js';
|
|
4
4
|
|
|
5
|
+
const restoredProbeState = (
|
|
6
|
+
before: plugins.smartpuppeteer.ILiveBrowserState,
|
|
7
|
+
after: plugins.smartpuppeteer.ILiveBrowserState,
|
|
8
|
+
): boolean => {
|
|
9
|
+
const restored = structuredClone(after);
|
|
10
|
+
const previousTab = before.tabs.find(tab => tab.id === before.activeTabId);
|
|
11
|
+
const currentTab = restored.tabs.find(tab => tab.id === before.activeTabId);
|
|
12
|
+
const previousSource = before.videoSource;
|
|
13
|
+
const currentSource = restored.videoSource;
|
|
14
|
+
// Native capture must reselect the original surface after an inactive probe
|
|
15
|
+
// window closes. Only its presentation epoch may advance; all document,
|
|
16
|
+
// viewport, tab, acceleration and source-identity fields still compare exactly.
|
|
17
|
+
if (previousTab && currentTab && previousSource?.frameAlignment === 2 && currentSource?.frameAlignment === 2
|
|
18
|
+
&& previousSource.tabId === previousTab.id && currentSource.tabId === currentTab.id
|
|
19
|
+
&& previousSource.generation === previousTab.generation && currentSource.generation === currentTab.generation
|
|
20
|
+
&& Number.isSafeInteger(currentTab.generation) && currentTab.generation >= previousTab.generation
|
|
21
|
+
&& Number.isInteger(previousSource.rtpTimestampFloor) && Number.isInteger(currentSource.rtpTimestampFloor)
|
|
22
|
+
&& currentSource.rtpTimestampFloor! >= 0 && currentSource.rtpTimestampFloor! <= 0xffffffff
|
|
23
|
+
&& ((currentSource.rtpTimestampFloor! - previousSource.rtpTimestampFloor!) >>> 0) < 0x80000000) {
|
|
24
|
+
currentTab.generation = previousTab.generation;
|
|
25
|
+
currentSource.generation = previousSource.generation;
|
|
26
|
+
currentSource.rtpTimestampFloor = previousSource.rtpTimestampFloor;
|
|
27
|
+
}
|
|
28
|
+
return JSON.stringify(restored) === JSON.stringify(before);
|
|
29
|
+
};
|
|
30
|
+
|
|
5
31
|
const listenOnUnsupportedPort = async (
|
|
6
32
|
allowedPorts: ReadonlySet<number>,
|
|
7
33
|
onRequest: () => void,
|
|
@@ -29,7 +55,6 @@ export const runProductionConfinementProbe = async (
|
|
|
29
55
|
context: IBrowserConfinementProbeContext,
|
|
30
56
|
): Promise<void> => {
|
|
31
57
|
const initialState = context.session.getState();
|
|
32
|
-
const initialStateJson = JSON.stringify(initialState);
|
|
33
58
|
let probeTabId: string | undefined;
|
|
34
59
|
let probeFailed = false;
|
|
35
60
|
let probeError: unknown;
|
|
@@ -112,7 +137,7 @@ export const runProductionConfinementProbe = async (
|
|
|
112
137
|
}
|
|
113
138
|
await closeFixture().catch((error) => cleanupErrors.push(error));
|
|
114
139
|
try {
|
|
115
|
-
if (
|
|
140
|
+
if (!restoredProbeState(initialState, context.session.getState())) {
|
|
116
141
|
cleanupErrors.push(new BrowserRuntimeError('CONFINEMENT_FAILED'));
|
|
117
142
|
}
|
|
118
143
|
} catch (error) {
|