@enbox/browser 0.3.54 → 0.3.55
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/browser.mjs +5 -5
- package/dist/browser.mjs.map +3 -3
- package/dist/esm/relay-connect-runner.js +10 -1
- package/dist/esm/relay-connect-runner.js.map +1 -1
- package/dist/types/relay-connect-runner.d.ts +1 -0
- package/dist/types/relay-connect-runner.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/relay-connect-runner.ts +10 -1
|
@@ -79,12 +79,14 @@ export function runRelayConnect(options) {
|
|
|
79
79
|
throw new Error('Connect: refresh requests require an existing `delegatePortableDid`.');
|
|
80
80
|
}
|
|
81
81
|
const createTransport = (_a = options.createTransport) !== null && _a !== void 0 ? _a : ((transportOptions) => new RelayClientTransport(Object.assign(Object.assign({}, transportOptions), { sleep: visibilityAwareSleep })));
|
|
82
|
+
const cancellationController = options.cancelled === undefined ? undefined : new AbortController();
|
|
82
83
|
const transport = createTransport({
|
|
83
84
|
connectServerUrl: options.connectServerUrl,
|
|
84
85
|
walletUri: options.walletUri,
|
|
85
86
|
timeoutMs: options.timeoutMs,
|
|
86
87
|
pollIntervalMs: options.pollIntervalMs,
|
|
87
88
|
onClaimed: options.onClaimed,
|
|
89
|
+
signal: cancellationController === null || cancellationController === void 0 ? void 0 : cancellationController.signal,
|
|
88
90
|
});
|
|
89
91
|
// Ephemeral client DID for request signing and response addressing, and a
|
|
90
92
|
// fresh X25519 pair the wallet seals the response to — same shape as the
|
|
@@ -117,7 +119,14 @@ export function runRelayConnect(options) {
|
|
|
117
119
|
const race = options.cancelled === undefined
|
|
118
120
|
? transport.awaitResponse()
|
|
119
121
|
: Promise.race([transport.awaitResponse(), options.cancelled]);
|
|
120
|
-
|
|
122
|
+
let responseCiphertext;
|
|
123
|
+
try {
|
|
124
|
+
responseCiphertext = yield race;
|
|
125
|
+
}
|
|
126
|
+
catch (error) {
|
|
127
|
+
cancellationController === null || cancellationController === void 0 ? void 0 : cancellationController.abort();
|
|
128
|
+
throw error;
|
|
129
|
+
}
|
|
121
130
|
if (responseCiphertext === CONNECT_DENIED_TOKEN) {
|
|
122
131
|
return undefined;
|
|
123
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-connect-runner.js","sourceRoot":"","sources":["../../src/relay-connect-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;AAaH,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,WAAW,EACX,oBAAoB,EACpB,0BAA0B,EAC1B,WAAW,GACZ,MAAM,gBAAgB,CAAC;AAExB,mEAAmE;AACnE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAElC,uEAAuE;AACvE,MAAM,OAAO,0BAA2B,SAAQ,KAAK;IACnD;QACE,KAAK,CAAC,2CAA2C,CAAC,CAAC;QACnD,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAC;IAC3C,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"relay-connect-runner.js","sourceRoot":"","sources":["../../src/relay-connect-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,6 +77,7 @@ export interface RelayConnectOptions {
|
|
|
77
77
|
timeoutMs?: number;
|
|
78
78
|
pollIntervalMs?: number;
|
|
79
79
|
onClaimed?: () => void;
|
|
80
|
+
signal?: AbortSignal;
|
|
80
81
|
}) => Pick<RelayClientTransport, 'requestProfile' | 'deliverRequest' | 'awaitResponse' | 'requiresPin'> & Partial<Pick<RelayClientTransport, 'confirmComplete'>>;
|
|
81
82
|
}
|
|
82
83
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-connect-runner.d.ts","sourceRoot":"","sources":["../../src/relay-connect-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EACV,qBAAqB,EACrB,wBAAwB,EAExB,kBAAkB,EAClB,aAAa,EACb,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAIL,oBAAoB,EAGrB,MAAM,gBAAgB,CAAC;AAExB,mEAAmE;AACnE,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAElC,uEAAuE;AACvE,qBAAa,0BAA2B,SAAQ,KAAK;;CAKpD;AAED,2CAA2C;AAC3C,MAAM,WAAW,mBAAmB;IAClC,wDAAwD;IACxD,gBAAgB,EAAE,MAAM,CAAC;IAEzB,6EAA6E;IAC7E,SAAS,EAAE,MAAM,CAAC;IAElB,yEAAyE;IACzE,OAAO,EAAE,MAAM,CAAC;IAEhB,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,uEAAuE;IACvE,cAAc,CAAC,EAAE,qBAAqB,CAAC;IAEvC,2DAA2D;IAC3D,kBAAkB,EAAE,wBAAwB,EAAE,CAAC;IAE/C,iEAAiE;IACjE,mBAAmB,CAAC,EAAE,WAAW,CAAC;IAElC,kEAAkE;IAClE,WAAW,CAAC,EAAE,kBAAkB,CAAC;IAEjC,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,mDAAmD;IACnD,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,gBAAgB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAEtD;;;;OAIG;IACH,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAExE;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IAEvC;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IAEvB,0CAA0C;IAC1C,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE;QAC1B,gBAAgB,EAAE,MAAM,CAAC;QACzB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"relay-connect-runner.d.ts","sourceRoot":"","sources":["../../src/relay-connect-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EACV,qBAAqB,EACrB,wBAAwB,EAExB,kBAAkB,EAClB,aAAa,EACb,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAIL,oBAAoB,EAGrB,MAAM,gBAAgB,CAAC;AAExB,mEAAmE;AACnE,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAElC,uEAAuE;AACvE,qBAAa,0BAA2B,SAAQ,KAAK;;CAKpD;AAED,2CAA2C;AAC3C,MAAM,WAAW,mBAAmB;IAClC,wDAAwD;IACxD,gBAAgB,EAAE,MAAM,CAAC;IAEzB,6EAA6E;IAC7E,SAAS,EAAE,MAAM,CAAC;IAElB,yEAAyE;IACzE,OAAO,EAAE,MAAM,CAAC;IAEhB,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,uEAAuE;IACvE,cAAc,CAAC,EAAE,qBAAqB,CAAC;IAEvC,2DAA2D;IAC3D,kBAAkB,EAAE,wBAAwB,EAAE,CAAC;IAE/C,iEAAiE;IACjE,mBAAmB,CAAC,EAAE,WAAW,CAAC;IAElC,kEAAkE;IAClE,WAAW,CAAC,EAAE,kBAAkB,CAAC;IAEjC,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,mDAAmD;IACnD,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,gBAAgB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAEtD;;;;OAIG;IACH,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAExE;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IAEvC;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IAEvB,0CAA0C;IAC1C,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE;QAC1B,gBAAgB,EAAE,MAAM,CAAC;QACzB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;QACvB,MAAM,CAAC,EAAE,WAAW,CAAC;KACtB,KAAK,IAAI,CAAC,oBAAoB,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,eAAe,GAAG,aAAa,CAAC,GACnG,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC,CAAC;CAC5D;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB9D;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAmHtG"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@enbox/browser",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.55",
|
|
4
4
|
"description": "Enbox tools and features to use in the browser",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/esm/index.js",
|
|
@@ -66,11 +66,11 @@
|
|
|
66
66
|
"access": "public"
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"@enbox/agent": "0.8.
|
|
70
|
-
"@enbox/api": "0.6.
|
|
71
|
-
"@enbox/auth": "0.6.
|
|
69
|
+
"@enbox/agent": "0.8.25",
|
|
70
|
+
"@enbox/api": "0.6.63",
|
|
71
|
+
"@enbox/auth": "0.6.71",
|
|
72
72
|
"@enbox/common": "0.1.3",
|
|
73
|
-
"@enbox/connect": "0.1.
|
|
73
|
+
"@enbox/connect": "0.1.7",
|
|
74
74
|
"@enbox/crypto": "0.1.6",
|
|
75
75
|
"@enbox/dids": "0.1.6",
|
|
76
76
|
"@enbox/dwn-sdk-js": "0.4.12"
|
|
@@ -116,6 +116,7 @@ export interface RelayConnectOptions {
|
|
|
116
116
|
timeoutMs?: number;
|
|
117
117
|
pollIntervalMs?: number;
|
|
118
118
|
onClaimed?: () => void;
|
|
119
|
+
signal?: AbortSignal;
|
|
119
120
|
}) => Pick<RelayClientTransport, 'requestProfile' | 'deliverRequest' | 'awaitResponse' | 'requiresPin'>
|
|
120
121
|
& Partial<Pick<RelayClientTransport, 'confirmComplete'>>;
|
|
121
122
|
}
|
|
@@ -166,12 +167,14 @@ export async function runRelayConnect(options: RelayConnectOptions): Promise<Con
|
|
|
166
167
|
sleep: visibilityAwareSleep,
|
|
167
168
|
}));
|
|
168
169
|
|
|
170
|
+
const cancellationController = options.cancelled === undefined ? undefined : new AbortController();
|
|
169
171
|
const transport = createTransport({
|
|
170
172
|
connectServerUrl : options.connectServerUrl,
|
|
171
173
|
walletUri : options.walletUri,
|
|
172
174
|
timeoutMs : options.timeoutMs,
|
|
173
175
|
pollIntervalMs : options.pollIntervalMs,
|
|
174
176
|
onClaimed : options.onClaimed,
|
|
177
|
+
signal : cancellationController?.signal,
|
|
175
178
|
});
|
|
176
179
|
|
|
177
180
|
// Ephemeral client DID for request signing and response addressing, and a
|
|
@@ -212,7 +215,13 @@ export async function runRelayConnect(options: RelayConnectOptions): Promise<Con
|
|
|
212
215
|
? transport.awaitResponse()
|
|
213
216
|
: Promise.race([transport.awaitResponse(), options.cancelled]);
|
|
214
217
|
|
|
215
|
-
|
|
218
|
+
let responseCiphertext: string;
|
|
219
|
+
try {
|
|
220
|
+
responseCiphertext = await race;
|
|
221
|
+
} catch (error) {
|
|
222
|
+
cancellationController?.abort();
|
|
223
|
+
throw error;
|
|
224
|
+
}
|
|
216
225
|
if (responseCiphertext === CONNECT_DENIED_TOKEN) {
|
|
217
226
|
return undefined;
|
|
218
227
|
}
|