Skip to content

Commit 8849d57

Browse files
Vu Van DucVu Van Duc
Vu Van Duc
authored and
Vu Van Duc
committed
feat(ui): using openAI type
1 parent a22640c commit 8849d57

File tree

5 files changed

+58
-79
lines changed

5 files changed

+58
-79
lines changed

‎src/keri/core/eventing.ts‎

Lines changed: 26 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -49,39 +49,19 @@ export interface EndRoleAddAttributes extends Record<string, unknown> {
4949
eid?: string;
5050
}
5151

52-
export interface RotateEventSAD extends BaseSAD, Record<string, unknown> {
53-
v: string;
54-
t: string;
55-
d: string;
56-
i: string;
57-
s: string;
58-
p?: string;
59-
kt: string | string[] | string[][];
60-
k: string[];
61-
nt: string | string[] | string[][];
62-
n: string[];
63-
bt: number | string;
64-
br?: string[];
65-
ba?: string[];
66-
a: Record<string, unknown>[];
67-
}
68-
69-
export interface InceptEventSAD extends BaseSAD, Record<string, unknown> {
70-
v: string;
71-
t: string;
72-
d: string;
73-
i: string;
74-
s: string;
75-
kt: number | string | string[] | string[][];
76-
k: string[];
77-
nt?: number | string | string[] | string[][];
78-
n?: string[];
79-
bt: number | string;
80-
b: string[];
81-
c: string[];
82-
a: Record<string, unknown>[];
83-
}
84-
52+
export type RotateEventSAD = (
53+
| components['schemas']['ROT_V_1']
54+
| components['schemas']['ROT_V_2']
55+
) &
56+
Record<string, unknown> &
57+
BaseSAD;
58+
59+
export type InceptEventSAD = (
60+
| components['schemas']['ICP_V_1']
61+
| components['schemas']['ICP_V_2']
62+
) &
63+
Record<string, unknown> &
64+
BaseSAD;
8565
export type InteractEventData = components['schemas']['Seal'];
8666

8767
export interface InteractEventSAD extends BaseSAD {
@@ -263,7 +243,7 @@ export function rotate({
263243
d: '',
264244
i: String(pre),
265245
s: sner.numh,
266-
p: dig,
246+
p: dig!,
267247
kt:
268248
tholder.num &&
269249
intive &&
@@ -282,10 +262,10 @@ export function rotate({
282262
n: _ndigs,
283263
bt:
284264
_toad && intive && _toad !== undefined && _toad <= MaxIntThold
285-
? _toad
265+
? String(_toad)
286266
: _toad.toString(16),
287-
br: cuts,
288-
ba: adds,
267+
br: cuts!,
268+
ba: adds!,
289269
a: data != undefined ? (data as Record<string, unknown>[]) : [],
290270
};
291271
const [, sad] = Saider.saidify(_sad);
@@ -423,11 +403,17 @@ export function incept({
423403
d: '',
424404
i: '',
425405
s: sner.numh,
426-
kt: intive && tholder.num != undefined ? tholder.num : tholder.sith,
406+
kt:
407+
intive && tholder.num != undefined
408+
? String(tholder.num)
409+
: tholder.sith,
427410
k: keys,
428-
nt: intive && tholder.num != undefined ? ntholder.num : ntholder.sith,
411+
nt:
412+
intive && tholder.num != undefined
413+
? String(ntholder.num!)
414+
: ntholder.sith,
429415
n: ndigs,
430-
bt: intive ? toader.num : toader.numh,
416+
bt: intive ? String(toader.num) : toader.numh,
431417
b: wits,
432418
c: cnfg,
433419
a: data as Record<string, unknown>[],

‎src/keri/core/keeping.ts‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ export class IdentifierManagerFactory {
208208
*/
209209
get(aid: HabState): IdentifierManager {
210210
let algo: Algos | undefined;
211-
let kargs: any;
211+
let kargs: unknown;
212212

213213
if (Algos.salty in aid) {
214214
algo = Algos.salty;
@@ -234,20 +234,20 @@ export class IdentifierManagerFactory {
234234
kargs = kargs as SaltyKeyState;
235235
return new SaltyIdentifierManager(
236236
this.salter,
237-
kargs.pidx,
238-
kargs.kidx,
239-
kargs.tier,
240-
kargs.transferable,
241-
kargs.stem,
237+
(kargs as SaltyKeyState).pidx,
238+
(kargs as SaltyKeyState).kidx,
239+
(kargs as SaltyKeyState).tier,
240+
(kargs as SaltyKeyState).transferable,
241+
(kargs as SaltyKeyState).stem,
242242
undefined,
243243
undefined,
244-
kargs.icodes,
244+
(kargs as SaltyKeyState).icodes,
245245
undefined,
246246
undefined,
247-
kargs.ncodes,
248-
kargs.dcode,
247+
(kargs as SaltyKeyState).ncodes,
248+
(kargs as SaltyKeyState).dcode,
249249
undefined,
250-
kargs.sxlt
250+
(kargs as SaltyKeyState).sxlt
251251
);
252252
case Algos.randy:
253253
kargs = kargs as RandyKeyState;
@@ -261,24 +261,27 @@ export class IdentifierManagerFactory {
261261
undefined,
262262
[],
263263
undefined,
264-
kargs.prxs,
265-
kargs.nxts
264+
(kargs as RandyKeyState).prxs,
265+
(kargs as RandyKeyState).nxts
266266
);
267267
case Algos.group:
268268
kargs = kargs as GroupKeyState;
269269
return new GroupIdentifierManager(
270270
this,
271-
kargs.mhab,
271+
(kargs as Record<string, unknown>).mhab as HabState,
272272
undefined,
273273
undefined,
274-
kargs.keys,
275-
kargs.ndigs
274+
(kargs as GroupKeyState).keys,
275+
(kargs as GroupKeyState).ndigs
276276
);
277277
case Algos.extern: {
278278
kargs = kargs as ExternState;
279-
const typ = kargs.extern_type;
279+
const typ = (kargs as ExternState).extern_type;
280280
if (typ in this.modules) {
281-
const mod = new this.modules[typ](kargs.pidx, kargs);
281+
const mod = new this.modules[typ](
282+
(kargs as ExternState).pidx,
283+
kargs as ExternState
284+
);
282285
return mod;
283286
} else {
284287
throw new Error(`unsupported external module type ${typ}`);

‎src/keri/core/prefixer.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export interface PrefixerSAD extends Omit<BaseSAD, "d"> {
1515
k?: string[];
1616
n?: string | string[];
1717
b?: string[];
18-
a?: Record<string, unknown>[];
18+
a?: unknown;
1919
i?: string;
2020
}
2121

@@ -185,7 +185,7 @@ export class Prefixer<T extends PrefixerSAD = PrefixerSAD> extends Matter {
185185
// must be empty
186186
return false;
187187
}
188-
} catch (e) {
188+
} catch {
189189
return false;
190190
}
191191

@@ -206,7 +206,7 @@ export class Prefixer<T extends PrefixerSAD = PrefixerSAD> extends Matter {
206206
if (prefixed && sad['i'] != pre) {
207207
return false;
208208
}
209-
} catch (e) {
209+
} catch {
210210
return false;
211211
}
212212

‎src/keri/core/saider.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export class Saider<T extends BaseSAD = BaseSAD> extends Matter {
117117
if (prefixed && sad[label] != this.qb64) {
118118
return false;
119119
}
120-
} catch (e) {
120+
} catch {
121121
return false;
122122
}
123123

‎test/core/eventing.test.ts‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -142,35 +142,29 @@ describe('key event function', () => {
142142
assert.equal(serder0.sad['t'], Ilks.icp);
143143
assert.equal(
144144
serder0.sad['d'],
145-
'EIflL4H4134zYoRM6ls6Q086RLC_BhfNFh5uk-WxvhsL'
145+
'EAKCxMOuoRzREVHsHCkLilBrUXTvyenBiuM2QtV8BB0C'
146146
);
147147
assert.equal(serder0.sad['d'], serder0.sad['i']);
148148
assert.equal(serder0.sad['s'], '0');
149-
assert.equal(serder0.sad['kt'], 1);
150-
assert.equal(serder0.sad['nt'], 1);
149+
assert.equal(serder0.sad['kt'], '1');
150+
assert.equal(serder0.sad['nt'], '1');
151151
assert.deepStrictEqual(serder0.sad['n'], nxt1);
152-
assert.equal(serder0.sad['bt'], 0);
152+
assert.equal(serder0.sad['bt'], '0');
153153
assert.equal(
154154
serder0.raw,
155-
'{"v":"KERI10JSON000125_","t":"icp","d":"EIflL4H4134zYoRM6ls6Q086RLC_BhfNFh5u' +
156-
'k-WxvhsL","i":"EIflL4H4134zYoRM6ls6Q086RLC_BhfNFh5uk-WxvhsL","s":"0","kt":1,' +
157-
'"k":["DFs8BBx86uytIM0D2BhsE5rrqVIT8ef8mflpNceHo4XH"],"nt":1,"n":["EIf-ENw7Pr' +
158-
'M52w4H-S7NGU2qVIfraXVIlV9hEAaMHg7W"],"bt":0,"b":[],"c":[],"a":[]}'
155+
'{"v":"KERI10JSON00012b_","t":"icp","d":"EAKCxMOuoRzREVHsHCkLilBrUXTvyenBiuM2QtV8BB0C","i":"EAKCxMOuoRzREVHsHCkLilBrUXTvyenBiuM2QtV8BB0C","s":"0","kt":"1","k":["DFs8BBx86uytIM0D2BhsE5rrqVIT8ef8mflpNceHo4XH"],"nt":"1","n":["EIf-ENw7PrM52w4H-S7NGU2qVIfraXVIlV9hEAaMHg7W"],"bt":"0","b":[],"c":[],"a":[]}'
159156
);
160157

161158
const siger = signer0.sign(b(serder0.raw), 0) as Siger;
162159
assert.equal(
163160
siger.qb64,
164-
'AABB3MJGmBXxSEryNHw3YwZZLRl_6Ws4Me2WFq8PrQ6WlluSOpPqbwXuiG9RvNWZkqeW8A_0VRjokGMVRZ3m-c0I'
161+
'AAAPitVKfl6dG9dY4-7Ppg5tAANHsqEUptTfR05wLb0fbmKFt4DbZdBNjJaCDrEc7kAIqbLsCMCKf26-Onxz-DoP'
165162
);
166163

167164
const msg = messagize(serder0, [siger]);
168165
assert.equal(
169166
d(msg),
170-
'{"v":"KERI10JSON000125_","t":"icp","d":"EIflL4H4134zYoRM6ls6Q086RLC_BhfNFh5uk-WxvhsL","i"' +
171-
':"EIflL4H4134zYoRM6ls6Q086RLC_BhfNFh5uk-WxvhsL","s":"0","kt":1,"k":["DFs8BBx86uytIM0D2BhsE5rrqVIT8ef8mflpNceHo4XH"],' +
172-
'"nt":1,"n":["EIf-ENw7PrM52w4H-S7NGU2qVIfraXVIlV9hEAaMHg7W"],"bt":0,"b":[],"c":[],"a":[]}' +
173-
'-AABAABB3MJGmBXxSEryNHw3YwZZLRl_6Ws4Me2WFq8PrQ6WlluSOpPqbwXuiG9RvNWZkqeW8A_0VRjokGMVRZ3m-c0I'
167+
'{"v":"KERI10JSON00012b_","t":"icp","d":"EAKCxMOuoRzREVHsHCkLilBrUXTvyenBiuM2QtV8BB0C","i":"EAKCxMOuoRzREVHsHCkLilBrUXTvyenBiuM2QtV8BB0C","s":"0","kt":"1","k":["DFs8BBx86uytIM0D2BhsE5rrqVIT8ef8mflpNceHo4XH"],"nt":"1","n":["EIf-ENw7PrM52w4H-S7NGU2qVIfraXVIlV9hEAaMHg7W"],"bt":"0","b":[],"c":[],"a":[]}-AABAAAPitVKfl6dG9dY4-7Ppg5tAANHsqEUptTfR05wLb0fbmKFt4DbZdBNjJaCDrEc7kAIqbLsCMCKf26-Onxz-DoP'
174168
);
175169
const seal:Seal = [
176170
'SealEvent',
@@ -183,11 +177,7 @@ describe('key event function', () => {
183177
const msgseal = messagize(serder0, [siger], seal);
184178
assert.equal(
185179
d(msgseal),
186-
'{"v":"KERI10JSON000125_","t":"icp","d":"EIflL4H4134zYoRM6ls6Q086RLC_BhfNFh5uk-WxvhsL","i"' +
187-
':"EIflL4H4134zYoRM6ls6Q086RLC_BhfNFh5uk-WxvhsL","s":"0","kt":1,"k":["DFs8BBx86uytIM0D2BhsE5rrqVIT8ef8mflpNceHo4XH"]' +
188-
',"nt":1,"n":["EIf-ENw7PrM52w4H-S7NGU2qVIfraXVIlV9hEAaMHg7W"],"bt":0,"b":[],"c":[],"a"' +
189-
':[]}-FABEIflL4H4134zYoRM6ls6Q086RLC_BhfNFh5uk-WxvhsL0AAAAAAAAAAAAAAAAAAAAAAAEIflL4H4134zYoRM6ls6Q086RLC_' +
190-
'BhfNFh5uk-WxvhsL-AABAABB3MJGmBXxSEryNHw3YwZZLRl_6Ws4Me2WFq8PrQ6WlluSOpPqbwXuiG9RvNWZkqeW8A_0VRjokGMVRZ3m-c0I'
180+
'{"v":"KERI10JSON00012b_","t":"icp","d":"EAKCxMOuoRzREVHsHCkLilBrUXTvyenBiuM2QtV8BB0C","i":"EAKCxMOuoRzREVHsHCkLilBrUXTvyenBiuM2QtV8BB0C","s":"0","kt":"1","k":["DFs8BBx86uytIM0D2BhsE5rrqVIT8ef8mflpNceHo4XH"],"nt":"1","n":["EIf-ENw7PrM52w4H-S7NGU2qVIfraXVIlV9hEAaMHg7W"],"bt":"0","b":[],"c":[],"a":[]}-FABEIflL4H4134zYoRM6ls6Q086RLC_BhfNFh5uk-WxvhsL0AAAAAAAAAAAAAAAAAAAAAAAEIflL4H4134zYoRM6ls6Q086RLC_BhfNFh5uk-WxvhsL-AABAAAPitVKfl6dG9dY4-7Ppg5tAANHsqEUptTfR05wLb0fbmKFt4DbZdBNjJaCDrEc7kAIqbLsCMCKf26-Onxz-DoP'
191181
);
192182
});
193183

0 commit comments

Comments
 (0)