@tumbaland/backend-core 1.56.0 → 1.58.0
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/apiKeys/types.d.ts +1 -1
- package/dist/apiKeys/types.d.ts.map +1 -1
- package/dist/apiKeys/types.js +5 -5
- package/dist/apiKeys/types.js.map +1 -1
- package/dist/audit/AuditEvent.d.ts +23 -1
- package/dist/audit/AuditEvent.d.ts.map +1 -1
- package/dist/audit/AuditEvent.js +11 -2
- package/dist/audit/AuditEvent.js.map +1 -1
- package/dist/audit/actor.d.ts +10 -0
- package/dist/audit/actor.d.ts.map +1 -1
- package/dist/audit/actor.js +12 -1
- package/dist/audit/actor.js.map +1 -1
- package/dist/audit/index.d.ts +3 -3
- package/dist/audit/index.d.ts.map +1 -1
- package/dist/audit/index.js +3 -1
- package/dist/audit/index.js.map +1 -1
- package/dist/audit/service.d.ts +25 -8
- package/dist/audit/service.d.ts.map +1 -1
- package/dist/audit/service.js +34 -4
- package/dist/audit/service.js.map +1 -1
- package/package.json +1 -1
package/dist/apiKeys/types.d.ts
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* it writes to rather than choosing one per request the way the UI does.
|
|
9
9
|
*/
|
|
10
10
|
/** Everything a key may be granted. Read and write are separate on purpose. */
|
|
11
|
-
export declare const API_KEY_SCOPES: readonly ["relationship:read", "relationship:write", "album:read", "album:write", "finance:read", "finance:write"];
|
|
11
|
+
export declare const API_KEY_SCOPES: readonly ["relationship:read", "relationship:write", "album:read", "album:write", "finance:read", "finance:write", "chat:read", "chat:write"];
|
|
12
12
|
export type ApiKeyScope = (typeof API_KEY_SCOPES)[number];
|
|
13
13
|
export declare const isApiKeyScope: (value: unknown) => value is ApiKeyScope;
|
|
14
14
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/apiKeys/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,+EAA+E;AAC/E,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/apiKeys/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,+EAA+E;AAC/E,eAAO,MAAM,cAAc,+IASjB,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1D,eAAO,MAAM,aAAa,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,WAC4B,CAAC;AAErF;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,aAAa,CAAC;AAE1C,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC;AAE5B,8EAA8E;AAC9E,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,KAAG,MAAM,GAAG,IAAoD,CAAC;AAEzG;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,6EAA6E;AAC7E,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,EAAE,KAAG,MAAM,EAA4D,CAAC;AAElH;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,GAAI,QAAQ;IAClC,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,KAAG,YAUH,CAAC;AAEF,mEAAmE;AACnE,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,8EAA8E;IAC9E,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,2FAA2F;AAC3F,MAAM,MAAM,eAAe,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,YAAY,CAAC;AAE7F,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB"}
|
package/dist/apiKeys/types.js
CHANGED
|
@@ -17,7 +17,9 @@ exports.API_KEY_SCOPES = [
|
|
|
17
17
|
'album:read',
|
|
18
18
|
'album:write',
|
|
19
19
|
'finance:read',
|
|
20
|
-
'finance:write'
|
|
20
|
+
'finance:write',
|
|
21
|
+
'chat:read',
|
|
22
|
+
'chat:write'
|
|
21
23
|
];
|
|
22
24
|
const isApiKeyScope = (value) => typeof value === 'string' && exports.API_KEY_SCOPES.includes(value);
|
|
23
25
|
exports.isApiKeyScope = isApiKeyScope;
|
|
@@ -31,7 +33,7 @@ exports.isApiKeyScope = isApiKeyScope;
|
|
|
31
33
|
*/
|
|
32
34
|
exports.PERSONAL_TENANT = 'personal';
|
|
33
35
|
/** The `groupId` a tenant corresponds to, as handlers have always read it. */
|
|
34
|
-
const groupIdOf = (tenant) => tenant === exports.PERSONAL_TENANT ? null : tenant;
|
|
36
|
+
const groupIdOf = (tenant) => (tenant === exports.PERSONAL_TENANT ? null : tenant);
|
|
35
37
|
exports.groupIdOf = groupIdOf;
|
|
36
38
|
/** Just the groups, for the `req.userGroups` every handler already reads. */
|
|
37
39
|
const groupIdsOf = (tenants) => tenants.filter((tenant) => tenant !== exports.PERSONAL_TENANT);
|
|
@@ -44,9 +46,7 @@ exports.groupIdsOf = groupIdsOf;
|
|
|
44
46
|
* rather than every connected assistant breaking at once.
|
|
45
47
|
*/
|
|
46
48
|
const readTenants = (stored) => {
|
|
47
|
-
const allowed = stored.tenants && stored.tenants.length > 0
|
|
48
|
-
? stored.tenants
|
|
49
|
-
: [stored.groupId ?? exports.PERSONAL_TENANT];
|
|
49
|
+
const allowed = stored.tenants && stored.tenants.length > 0 ? stored.tenants : [stored.groupId ?? exports.PERSONAL_TENANT];
|
|
50
50
|
const fallbackDefault = allowed[0];
|
|
51
51
|
const preferred = stored.defaultTenant ?? fallbackDefault;
|
|
52
52
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/apiKeys/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAEH,+EAA+E;AAClE,QAAA,cAAc,GAAG;IAC5B,mBAAmB;IACnB,oBAAoB;IACpB,YAAY;IACZ,aAAa;IACb,cAAc;IACd,eAAe;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/apiKeys/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAEH,+EAA+E;AAClE,QAAA,cAAc,GAAG;IAC5B,mBAAmB;IACnB,oBAAoB;IACpB,YAAY;IACZ,aAAa;IACb,cAAc;IACd,eAAe;IACf,WAAW;IACX,YAAY;CACJ,CAAC;AAIJ,MAAM,aAAa,GAAG,CAAC,KAAc,EAAwB,EAAE,CACpE,OAAO,KAAK,KAAK,QAAQ,IAAK,sBAAoC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AADxE,QAAA,aAAa,iBAC2D;AAErF;;;;;;;GAOG;AACU,QAAA,eAAe,GAAG,UAAU,CAAC;AAI1C,8EAA8E;AACvE,MAAM,SAAS,GAAG,CAAC,MAAc,EAAiB,EAAE,CAAC,CAAC,MAAM,KAAK,uBAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAA5F,QAAA,SAAS,aAAmF;AAoBzG,6EAA6E;AACtE,MAAM,UAAU,GAAG,CAAC,OAAiB,EAAY,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,uBAAe,CAAC,CAAC;AAArG,QAAA,UAAU,cAA2F;AAElH;;;;;;GAMG;AACI,MAAM,WAAW,GAAG,CAAC,MAI3B,EAAgB,EAAE;IACjB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,IAAI,uBAAe,CAAC,CAAC;IAEnH,MAAM,eAAe,GAAG,OAAO,CAAC,CAAC,CAAW,CAAC;IAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,IAAI,eAAe,CAAC;IAE1D,OAAO;QACL,OAAO;QACP,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe;KACnE,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,WAAW,eActB"}
|
|
@@ -37,11 +37,31 @@ export interface ToolCall {
|
|
|
37
37
|
/** the call came back as an error, so the size is a message rather than data */
|
|
38
38
|
failed?: boolean;
|
|
39
39
|
}
|
|
40
|
+
/**
|
|
41
|
+
* What one chat assistant reply cost, in dollars.
|
|
42
|
+
*
|
|
43
|
+
* Written by chat-service once the reply is done, because only it knows what
|
|
44
|
+
* Anthropic reported using. The tool calls inside the reply are separate rows:
|
|
45
|
+
* those say what was fetched, this says what the whole answer cost.
|
|
46
|
+
*/
|
|
47
|
+
export interface ReplyCost {
|
|
48
|
+
/** the model that answered, as people know it — 'Haiku', 'Sonnet', 'Opus' */
|
|
49
|
+
model: string;
|
|
50
|
+
/** list price of the tokens used, so a close estimate rather than the bill */
|
|
51
|
+
dollars: number;
|
|
52
|
+
ms: number;
|
|
53
|
+
/** how it ended — 'ok', 'refused', 'error', 'key_rejected' */
|
|
54
|
+
outcome: string;
|
|
55
|
+
/** it spoke up unprompted, on its owner's allowance */
|
|
56
|
+
unasked?: boolean;
|
|
57
|
+
/** it joined in, read the chat and chose to say nothing: paid for, nothing posted */
|
|
58
|
+
silent?: boolean;
|
|
59
|
+
}
|
|
40
60
|
export interface IAuditEvent extends Document {
|
|
41
61
|
at: Date;
|
|
42
62
|
/** which service handled it — 'relationship-service', 'album-service' */
|
|
43
63
|
service: string;
|
|
44
|
-
action: 'create' | 'update' | 'delete' | 'read' | 'call';
|
|
64
|
+
action: 'create' | 'update' | 'delete' | 'read' | 'call' | 'reply';
|
|
45
65
|
/** what kind of thing — 'activity', 'activity_type', 'photo' */
|
|
46
66
|
resource: string;
|
|
47
67
|
resourceId?: string;
|
|
@@ -70,6 +90,8 @@ export interface IAuditEvent extends Document {
|
|
|
70
90
|
count?: number;
|
|
71
91
|
/** present on 'call': the tool, and what it cost */
|
|
72
92
|
tool?: ToolCall;
|
|
93
|
+
/** present on 'reply': which model answered and what it cost */
|
|
94
|
+
reply?: ReplyCost;
|
|
73
95
|
createdAt: Date;
|
|
74
96
|
}
|
|
75
97
|
export declare const AuditEvent: mongoose.Model<IAuditEvent, {}, {}, {}, mongoose.Document<unknown, {}, IAuditEvent, {}, mongoose.DefaultSchemaOptions> & IAuditEvent & Required<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuditEvent.d.ts","sourceRoot":"","sources":["../../src/audit/AuditEvent.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,EAAE,EAAE,QAAQ,EAAU,MAAM,UAAU,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEzC;;;;;;;GAOG;AACH;;;;;;;;;;GAUG;AACH,MAAM,WAAW,QAAQ;IACvB,mEAAmE;IACnE,IAAI,EAAE,MAAM,CAAC;IACb,yEAAyE;IACzE,EAAE,EAAE,MAAM,CAAC;IACX,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,WAAY,SAAQ,QAAQ;IAC3C,EAAE,EAAE,IAAI,CAAC;IACT,yEAAyE;IACzE,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"AuditEvent.d.ts","sourceRoot":"","sources":["../../src/audit/AuditEvent.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,EAAE,EAAE,QAAQ,EAAU,MAAM,UAAU,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEzC;;;;;;;GAOG;AACH;;;;;;;;;;GAUG;AACH,MAAM,WAAW,QAAQ;IACvB,mEAAmE;IACnE,IAAI,EAAE,MAAM,CAAC;IACb,yEAAyE;IACzE,EAAE,EAAE,MAAM,CAAC;IACX,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,SAAS;IACxB,6EAA6E;IAC7E,KAAK,EAAE,MAAM,CAAC;IACd,8EAA8E;IAC9E,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,qFAAqF;IACrF,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,WAAY,SAAQ,QAAQ;IAC3C,EAAE,EAAE,IAAI,CAAC;IACT,yEAAyE;IACzE,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACnE,gEAAgE;IAChE,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,6DAA6D;IAC7D,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,4EAA4E;IAC5E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iCAAiC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,EAAE,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACzD,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,0EAA0E;IAC1E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oDAAoD;IACpD,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,gEAAgE;IAChE,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,IAAI,CAAC;CACjB;AAiED,eAAO,MAAM,UAAU;;;;;;;;;;EAEwC,CAAC"}
|
package/dist/audit/AuditEvent.js
CHANGED
|
@@ -42,10 +42,18 @@ const ToolCallSchema = new mongoose_1.Schema({
|
|
|
42
42
|
tokens: { type: Number, required: true },
|
|
43
43
|
failed: { type: Boolean }
|
|
44
44
|
}, { _id: false });
|
|
45
|
+
const ReplyCostSchema = new mongoose_1.Schema({
|
|
46
|
+
model: { type: String, required: true },
|
|
47
|
+
dollars: { type: Number, required: true },
|
|
48
|
+
ms: { type: Number, required: true },
|
|
49
|
+
outcome: { type: String, required: true },
|
|
50
|
+
unasked: { type: Boolean },
|
|
51
|
+
silent: { type: Boolean }
|
|
52
|
+
}, { _id: false });
|
|
45
53
|
const AuditEventSchema = new mongoose_1.Schema({
|
|
46
54
|
at: { type: Date, required: true, default: Date.now },
|
|
47
55
|
service: { type: String, required: true },
|
|
48
|
-
action: { type: String, required: true, enum: ['create', 'update', 'delete', 'read', 'call'] },
|
|
56
|
+
action: { type: String, required: true, enum: ['create', 'update', 'delete', 'read', 'call', 'reply'] },
|
|
49
57
|
resource: { type: String, required: true },
|
|
50
58
|
resourceId: { type: String },
|
|
51
59
|
actorKind: { type: String, required: true, enum: ['person', 'key', 'assistant'] },
|
|
@@ -56,7 +64,8 @@ const AuditEventSchema = new mongoose_1.Schema({
|
|
|
56
64
|
changes: { type: mongoose_1.Schema.Types.Mixed },
|
|
57
65
|
snapshot: { type: mongoose_1.Schema.Types.Mixed },
|
|
58
66
|
count: { type: Number },
|
|
59
|
-
tool: { type: ToolCallSchema }
|
|
67
|
+
tool: { type: ToolCallSchema },
|
|
68
|
+
reply: { type: ReplyCostSchema }
|
|
60
69
|
}, { timestamps: { createdAt: true, updatedAt: false }, collection: 'audit_events' });
|
|
61
70
|
// Every listing is one account's trail, newest first.
|
|
62
71
|
AuditEventSchema.index({ userId: 1, at: -1 });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuditEvent.js","sourceRoot":"","sources":["../../src/audit/AuditEvent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAsD;
|
|
1
|
+
{"version":3,"file":"AuditEvent.js","sourceRoot":"","sources":["../../src/audit/AuditEvent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAsD;AAiGtD,MAAM,cAAc,GAAG,IAAI,iBAAM,CAC/B;IACE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACtC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACpC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACvC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACxC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;CAC1B,EACD,EAAE,GAAG,EAAE,KAAK,EAAE,CACf,CAAC;AAEF,MAAM,eAAe,GAAG,IAAI,iBAAM,CAChC;IACE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACvC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACzC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACpC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACzC,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;IAC1B,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;CAC1B,EACD,EAAE,GAAG,EAAE,KAAK,EAAE,CACf,CAAC;AAEF,MAAM,gBAAgB,GAAG,IAAI,iBAAM,CACjC;IACE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE;IACrD,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACzC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IACvG,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IAC1C,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC5B,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE;IACjF,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;IACrD,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IAC5C,iBAAiB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACnC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACxC,OAAO,EAAE,EAAE,IAAI,EAAE,iBAAM,CAAC,KAAK,CAAC,KAAK,EAAE;IACrC,QAAQ,EAAE,EAAE,IAAI,EAAE,iBAAM,CAAC,KAAK,CAAC,KAAK,EAAE;IACtC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACvB,IAAI,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE;IAC9B,KAAK,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE;CACjC,EACD,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,cAAc,EAAE,CAClF,CAAC;AAEF,sDAAsD;AACtD,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;AAE9C,kFAAkF;AAClF,+CAA+C;AAC/C,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;AAE9C;;;;;;;;GAQG;AACH,MAAM,cAAc,GAAG,GAAG,CAAC;AAC3B,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,kBAAkB,EAAE,cAAc,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;AAE5E,QAAA,UAAU,GAAG,kBAAQ,CAAC,MAAM,CAAC,UAAU;IAClD,CAAC,CAAE,kBAAQ,CAAC,MAAM,CAAC,UAA0C;IAC7D,CAAC,CAAC,kBAAQ,CAAC,KAAK,CAAc,YAAY,EAAE,gBAAgB,CAAC,CAAC"}
|
package/dist/audit/actor.d.ts
CHANGED
|
@@ -38,4 +38,14 @@ export interface Actor {
|
|
|
38
38
|
export declare function actorOf(req: Request): Actor | null;
|
|
39
39
|
/** One line naming an actor, for a log message or an error. */
|
|
40
40
|
export declare const describeActor: (actor: Actor) => string;
|
|
41
|
+
/**
|
|
42
|
+
* How the key an assistant uses in a chat is named: "Tumbi in chat".
|
|
43
|
+
*
|
|
44
|
+
* chat-service mints one per reply and deletes it after, so the key itself is
|
|
45
|
+
* gone by the time anyone reads the trail and its name is all that is left on
|
|
46
|
+
* the rows it made. Shared so the writer and the "Tumbi" filter cannot drift
|
|
47
|
+
* apart.
|
|
48
|
+
*/
|
|
49
|
+
export declare const CHAT_KEY_SUFFIX = " in chat";
|
|
50
|
+
export declare const chatKeyName: (botName: string) => string;
|
|
41
51
|
//# sourceMappingURL=actor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actor.d.ts","sourceRoot":"","sources":["../../src/audit/actor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAmB,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEhE;;;;;;;;;GASG;AACH,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,KAAK,GAAG,WAAW,CAAC;AAEvD,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,2EAA2E;IAC3E,MAAM,EAAE,MAAM,CAAC;IACf,iFAAiF;IACjF,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,KAAK,GAAG,IAAI,CAuBlD;AAED,+DAA+D;AAC/D,eAAO,MAAM,aAAa,GAAI,OAAO,KAAK,KAAG,MAC6B,CAAC"}
|
|
1
|
+
{"version":3,"file":"actor.d.ts","sourceRoot":"","sources":["../../src/audit/actor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAmB,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEhE;;;;;;;;;GASG;AACH,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,KAAK,GAAG,WAAW,CAAC;AAEvD,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,2EAA2E;IAC3E,MAAM,EAAE,MAAM,CAAC;IACf,iFAAiF;IACjF,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,KAAK,GAAG,IAAI,CAuBlD;AAED,+DAA+D;AAC/D,eAAO,MAAM,aAAa,GAAI,OAAO,KAAK,KAAG,MAC6B,CAAC;AAE3E;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,aAAa,CAAC;AAE1C,eAAO,MAAM,WAAW,GAAI,SAAS,MAAM,KAAG,MAAwC,CAAC"}
|
package/dist/audit/actor.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.describeActor = void 0;
|
|
3
|
+
exports.chatKeyName = exports.CHAT_KEY_SUFFIX = exports.describeActor = void 0;
|
|
4
4
|
exports.actorOf = actorOf;
|
|
5
5
|
const types_1 = require("../apiKeys/types");
|
|
6
6
|
/**
|
|
@@ -36,4 +36,15 @@ function actorOf(req) {
|
|
|
36
36
|
/** One line naming an actor, for a log message or an error. */
|
|
37
37
|
const describeActor = (actor) => actor.kind === 'person' ? actor.label : `${actor.label} (${actor.kind})`;
|
|
38
38
|
exports.describeActor = describeActor;
|
|
39
|
+
/**
|
|
40
|
+
* How the key an assistant uses in a chat is named: "Tumbi in chat".
|
|
41
|
+
*
|
|
42
|
+
* chat-service mints one per reply and deletes it after, so the key itself is
|
|
43
|
+
* gone by the time anyone reads the trail and its name is all that is left on
|
|
44
|
+
* the rows it made. Shared so the writer and the "Tumbi" filter cannot drift
|
|
45
|
+
* apart.
|
|
46
|
+
*/
|
|
47
|
+
exports.CHAT_KEY_SUFFIX = ' in chat';
|
|
48
|
+
const chatKeyName = (botName) => `${botName}${exports.CHAT_KEY_SUFFIX}`;
|
|
49
|
+
exports.chatKeyName = chatKeyName;
|
|
39
50
|
//# sourceMappingURL=actor.js.map
|
package/dist/audit/actor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actor.js","sourceRoot":"","sources":["../../src/audit/actor.ts"],"names":[],"mappings":";;;AAwCA,0BAuBC;AA9DD,4CAAgE;AAgChE;;;;;;GAMG;AACH,SAAgB,OAAO,CAAC,GAAY;IAClC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,IAAI,CAAC,IAAI,EAAE,EAAE;QAAE,OAAO,IAAI,CAAC;IAE3B,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC;IAC9B,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,2EAA2E;YAC3E,+CAA+C;YAC/C,KAAK,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,EAAE;YACzC,MAAM,EAAG,GAAG,CAAC,KAAK,EAAE,OAAkB,IAAI,uBAAe;SAC1D,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,UAAU,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK;QACvD,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,YAAY,EAAE,UAAU,CAAC,YAAY;QACrC,MAAM,EAAE,UAAU,CAAC,QAAQ;KAC5B,CAAC;AACJ,CAAC;AAED,+DAA+D;AACxD,MAAM,aAAa,GAAG,CAAC,KAAY,EAAU,EAAE,CACpD,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,IAAI,GAAG,CAAC;AAD9D,QAAA,aAAa,iBACiD"}
|
|
1
|
+
{"version":3,"file":"actor.js","sourceRoot":"","sources":["../../src/audit/actor.ts"],"names":[],"mappings":";;;AAwCA,0BAuBC;AA9DD,4CAAgE;AAgChE;;;;;;GAMG;AACH,SAAgB,OAAO,CAAC,GAAY;IAClC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,IAAI,CAAC,IAAI,EAAE,EAAE;QAAE,OAAO,IAAI,CAAC;IAE3B,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC;IAC9B,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,2EAA2E;YAC3E,+CAA+C;YAC/C,KAAK,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,EAAE;YACzC,MAAM,EAAG,GAAG,CAAC,KAAK,EAAE,OAAkB,IAAI,uBAAe;SAC1D,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,UAAU,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK;QACvD,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,YAAY,EAAE,UAAU,CAAC,YAAY;QACrC,MAAM,EAAE,UAAU,CAAC,QAAQ;KAC5B,CAAC;AACJ,CAAC;AAED,+DAA+D;AACxD,MAAM,aAAa,GAAG,CAAC,KAAY,EAAU,EAAE,CACpD,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,IAAI,GAAG,CAAC;AAD9D,QAAA,aAAa,iBACiD;AAE3E;;;;;;;GAOG;AACU,QAAA,eAAe,GAAG,UAAU,CAAC;AAEnC,MAAM,WAAW,GAAG,CAAC,OAAe,EAAU,EAAE,CAAC,GAAG,OAAO,GAAG,uBAAe,EAAE,CAAC;AAA1E,QAAA,WAAW,eAA+D"}
|
package/dist/audit/index.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
export { actorOf, describeActor } from './actor';
|
|
1
|
+
export { CHAT_KEY_SUFFIX, actorOf, chatKeyName, describeActor } from './actor';
|
|
2
2
|
export type { Actor, ActorKind } from './actor';
|
|
3
3
|
export { AuditEvent } from './AuditEvent';
|
|
4
|
-
export type { IAuditEvent, ToolCall } from './AuditEvent';
|
|
4
|
+
export type { IAuditEvent, ReplyCost, ToolCall } from './AuditEvent';
|
|
5
5
|
export { auditContext, beginAudit, currentAuditContext, withAuditContext } from './context';
|
|
6
6
|
export type { AuditContext } from './context';
|
|
7
7
|
export { auditPlugin } from './plugin';
|
|
8
8
|
export type { AuditPluginOptions } from './plugin';
|
|
9
9
|
export { auditReads, countRead, resourceOf } from './reads';
|
|
10
10
|
export { listAuditEvents } from './service';
|
|
11
|
-
export type { AuditQuery, AuditEntry } from './service';
|
|
11
|
+
export type { AuditQuery, AuditEntry, AuditPage } from './service';
|
|
12
12
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/audit/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/audit/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC/E,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC5F,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC"}
|
package/dist/audit/index.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.listAuditEvents = exports.resourceOf = exports.countRead = exports.auditReads = exports.auditPlugin = exports.withAuditContext = exports.currentAuditContext = exports.beginAudit = exports.auditContext = exports.AuditEvent = exports.describeActor = exports.actorOf = void 0;
|
|
3
|
+
exports.listAuditEvents = exports.resourceOf = exports.countRead = exports.auditReads = exports.auditPlugin = exports.withAuditContext = exports.currentAuditContext = exports.beginAudit = exports.auditContext = exports.AuditEvent = exports.describeActor = exports.chatKeyName = exports.actorOf = exports.CHAT_KEY_SUFFIX = void 0;
|
|
4
4
|
var actor_1 = require("./actor");
|
|
5
|
+
Object.defineProperty(exports, "CHAT_KEY_SUFFIX", { enumerable: true, get: function () { return actor_1.CHAT_KEY_SUFFIX; } });
|
|
5
6
|
Object.defineProperty(exports, "actorOf", { enumerable: true, get: function () { return actor_1.actorOf; } });
|
|
7
|
+
Object.defineProperty(exports, "chatKeyName", { enumerable: true, get: function () { return actor_1.chatKeyName; } });
|
|
6
8
|
Object.defineProperty(exports, "describeActor", { enumerable: true, get: function () { return actor_1.describeActor; } });
|
|
7
9
|
var AuditEvent_1 = require("./AuditEvent");
|
|
8
10
|
Object.defineProperty(exports, "AuditEvent", { enumerable: true, get: function () { return AuditEvent_1.AuditEvent; } });
|
package/dist/audit/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/audit/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/audit/index.ts"],"names":[],"mappings":";;;AAAA,iCAA+E;AAAtE,wGAAA,eAAe,OAAA;AAAE,gGAAA,OAAO,OAAA;AAAE,oGAAA,WAAW,OAAA;AAAE,sGAAA,aAAa,OAAA;AAE7D,2CAA0C;AAAjC,wGAAA,UAAU,OAAA;AAEnB,qCAA4F;AAAnF,uGAAA,YAAY,OAAA;AAAE,qGAAA,UAAU,OAAA;AAAE,8GAAA,mBAAmB,OAAA;AAAE,2GAAA,gBAAgB,OAAA;AAExE,mCAAuC;AAA9B,qGAAA,WAAW,OAAA;AAEpB,iCAA4D;AAAnD,mGAAA,UAAU,OAAA;AAAE,kGAAA,SAAS,OAAA;AAAE,mGAAA,UAAU,OAAA;AAC1C,qCAA4C;AAAnC,0GAAA,eAAe,OAAA"}
|
package/dist/audit/service.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type IAuditEvent, type ToolCall } from './AuditEvent';
|
|
2
|
-
import type
|
|
1
|
+
import { type IAuditEvent, type ReplyCost, type ToolCall } from './AuditEvent';
|
|
2
|
+
import { type ActorKind } from './actor';
|
|
3
3
|
export interface AuditQuery {
|
|
4
4
|
userId: string;
|
|
5
5
|
/** narrow to one actor — a key's id or an OAuth client id */
|
|
@@ -9,6 +9,13 @@ export interface AuditQuery {
|
|
|
9
9
|
resource?: string;
|
|
10
10
|
/** narrow to one area — 'relationship-service', 'album-service' */
|
|
11
11
|
service?: string;
|
|
12
|
+
/**
|
|
13
|
+
* Only what chat assistants did through their per-reply keys (true), or only
|
|
14
|
+
* what everything else with a key did (false). Meaningful with `actorKind: 'key'`.
|
|
15
|
+
*/
|
|
16
|
+
chat?: boolean;
|
|
17
|
+
/** free text, matched against who, what, which tool and the name or description of the record */
|
|
18
|
+
q?: string;
|
|
12
19
|
from?: Date;
|
|
13
20
|
to?: Date;
|
|
14
21
|
limit?: number;
|
|
@@ -33,6 +40,21 @@ export interface AuditEntry {
|
|
|
33
40
|
count?: number;
|
|
34
41
|
/** present on 'call': which tool ran, how long it took, and what it cost */
|
|
35
42
|
tool?: ToolCall;
|
|
43
|
+
/** present on 'reply': which model answered and what it cost */
|
|
44
|
+
reply?: ReplyCost;
|
|
45
|
+
}
|
|
46
|
+
export interface AuditPage {
|
|
47
|
+
events: AuditEntry[];
|
|
48
|
+
total: number;
|
|
49
|
+
page: number;
|
|
50
|
+
totalPages: number;
|
|
51
|
+
/**
|
|
52
|
+
* What the assistant replies matching the filter cost, in dollars, across
|
|
53
|
+
* every page. On the first page only: it is the same on every page, and it is
|
|
54
|
+
* a sum over the whole match, which a page that only appends has no use for
|
|
55
|
+
* again. Absent when nothing matching was paid for.
|
|
56
|
+
*/
|
|
57
|
+
spent?: number;
|
|
36
58
|
}
|
|
37
59
|
/**
|
|
38
60
|
* One account's trail, newest first.
|
|
@@ -42,10 +64,5 @@ export interface AuditEntry {
|
|
|
42
64
|
* carries old values of journal entries, which makes it as sensitive as the
|
|
43
65
|
* journal itself.
|
|
44
66
|
*/
|
|
45
|
-
export declare const listAuditEvents: (query: AuditQuery) => Promise<
|
|
46
|
-
events: AuditEntry[];
|
|
47
|
-
total: number;
|
|
48
|
-
page: number;
|
|
49
|
-
totalPages: number;
|
|
50
|
-
}>;
|
|
67
|
+
export declare const listAuditEvents: (query: AuditQuery) => Promise<AuditPage>;
|
|
51
68
|
//# sourceMappingURL=service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/audit/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/audit/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC3F,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,SAAS,CAAC;AAE1D,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,6DAA6D;IAC7D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,MAAM,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,iGAAiG;IACjG,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,EAAE,CAAC,EAAE,IAAI,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,EAAE,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACzD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,gEAAgE;IAChE,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAeD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAyBD;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,GAC1B,OAAO,UAAU,KAChB,OAAO,CAAC,SAAS,CA+CnB,CAAC"}
|
package/dist/audit/service.js
CHANGED
|
@@ -2,6 +2,19 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.listAuditEvents = void 0;
|
|
4
4
|
const AuditEvent_1 = require("./AuditEvent");
|
|
5
|
+
const actor_1 = require("./actor");
|
|
6
|
+
/** Text that means itself in a pattern: a search for "a.b" is not a search for "a-b". */
|
|
7
|
+
const escapePattern = (text) => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
8
|
+
/**
|
|
9
|
+
* What someone typed, as a pattern. A space also finds an underscore, because
|
|
10
|
+
* the page shows `api_key` as "api key" and that is what people will type.
|
|
11
|
+
*/
|
|
12
|
+
const searchPattern = (text) => new RegExp(escapePattern(text).replace(/[ _]+/g, '[ _]+'), 'i');
|
|
13
|
+
/** The fields a search looks in. Snapshots only by the two a person would name a record by. */
|
|
14
|
+
const SEARCHED_FIELDS = ['actorLabel', 'resource', 'tool.name', 'reply.model', 'snapshot.description', 'snapshot.name'];
|
|
15
|
+
/** Only replies carry a price, so a filter to any other action has nothing to add up. */
|
|
16
|
+
const mayHaveReplies = (query) => (query.action === undefined || query.action === 'reply') &&
|
|
17
|
+
(query.actorKind === undefined || query.actorKind === 'key');
|
|
5
18
|
const toEntry = (event) => ({
|
|
6
19
|
id: String(event._id),
|
|
7
20
|
at: event.at.toISOString(),
|
|
@@ -16,7 +29,8 @@ const toEntry = (event) => ({
|
|
|
16
29
|
changes: event.changes,
|
|
17
30
|
snapshot: event.snapshot,
|
|
18
31
|
count: event.count,
|
|
19
|
-
tool: event.tool
|
|
32
|
+
tool: event.tool,
|
|
33
|
+
reply: event.reply
|
|
20
34
|
});
|
|
21
35
|
/**
|
|
22
36
|
* One account's trail, newest first.
|
|
@@ -40,6 +54,15 @@ const listAuditEvents = async (query) => {
|
|
|
40
54
|
filter.resource = query.resource;
|
|
41
55
|
if (query.service)
|
|
42
56
|
filter.service = query.service;
|
|
57
|
+
if (query.chat !== undefined) {
|
|
58
|
+
const chatKey = new RegExp(`${escapePattern(actor_1.CHAT_KEY_SUFFIX)}$`);
|
|
59
|
+
filter.actorLabel = query.chat ? { $regex: chatKey } : { $not: chatKey };
|
|
60
|
+
}
|
|
61
|
+
const text = query.q?.trim();
|
|
62
|
+
if (text) {
|
|
63
|
+
const pattern = searchPattern(text);
|
|
64
|
+
filter.$or = SEARCHED_FIELDS.map((field) => ({ [field]: pattern }));
|
|
65
|
+
}
|
|
43
66
|
if (query.from || query.to) {
|
|
44
67
|
const at = {};
|
|
45
68
|
if (query.from)
|
|
@@ -48,18 +71,25 @@ const listAuditEvents = async (query) => {
|
|
|
48
71
|
at.$lte = query.to;
|
|
49
72
|
filter.at = at;
|
|
50
73
|
}
|
|
51
|
-
const [events, total] = await Promise.all([
|
|
74
|
+
const [events, total, spent] = await Promise.all([
|
|
52
75
|
AuditEvent_1.AuditEvent.find(filter)
|
|
53
76
|
.sort({ at: -1 })
|
|
54
77
|
.skip((page - 1) * limit)
|
|
55
78
|
.limit(limit),
|
|
56
|
-
AuditEvent_1.AuditEvent.countDocuments(filter)
|
|
79
|
+
AuditEvent_1.AuditEvent.countDocuments(filter),
|
|
80
|
+
page === 1 && mayHaveReplies(query)
|
|
81
|
+
? AuditEvent_1.AuditEvent.aggregate([
|
|
82
|
+
{ $match: { ...filter, 'reply.dollars': { $gt: 0 } } },
|
|
83
|
+
{ $group: { _id: null, dollars: { $sum: '$reply.dollars' } } }
|
|
84
|
+
])
|
|
85
|
+
: Promise.resolve([])
|
|
57
86
|
]);
|
|
58
87
|
return {
|
|
59
88
|
events: events.map(toEntry),
|
|
60
89
|
total,
|
|
61
90
|
page,
|
|
62
|
-
totalPages: Math.ceil(total / limit)
|
|
91
|
+
totalPages: Math.ceil(total / limit),
|
|
92
|
+
...(spent[0]?.dollars ? { spent: spent[0].dollars } : {})
|
|
63
93
|
};
|
|
64
94
|
};
|
|
65
95
|
exports.listAuditEvents = listAuditEvents;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/audit/service.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/audit/service.ts"],"names":[],"mappings":"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"}
|