@agentunion/fastaun 0.5.32 → 0.5.34

package/dist/tools/cross-sdk-agent.js

@@ -25,6 +25,14 @@ const credentialProcessStartupId = crypto.randomUUID();
 const { DatabaseSync } = createRequire(import.meta.url)('node:sqlite');
 const cacheReadContext = new AsyncLocalStorage();
 const cacheReadObservers = new WeakMap();
+function storageAclTargets(params) {
+    const raw = jsonObjectOf(params.subject), ownership = jsonObjectOf(raw?.ownership);
+    return {
+        granteeAid: (params.grantee_aid !== undefined ? params.grantee_aid : params.granteeAID),
+        granteeAids: (params.grantee_aids !== undefined ? params.grantee_aids : params.granteeAids),
+        subject: (raw && ownership ? { ...raw, ownership: { ownerAid: ownership.owner_aid ?? ownership.ownerAid, ...(ownership.scope !== undefined ? { scope: ownership.scope } : {}) } } : params.subject),
+    };
+}
 function loadTrustedArchive(configPath, issuer) {
     if (!configPath)
         return undefined;
@@ -205,6 +213,7 @@ export class CrossSdkTsAgent {
     rpcFailures = [];
     messageOperations = new Map();
     rpcObservedTransports = new WeakSet();
+    rpcObservedChannelFactories = new WeakSet();
     rpcObservedPipelines = new WeakSet();
     rpcObservedPulls = new WeakMap();
     groupChangedEvents = [];
@@ -215,6 +224,11 @@ export class CrossSdkTsAgent {
     traces = new Map();
     sendResults = new Map();
     inlineRealtimePayloadV1 = true;
+    messageClassesV2 = envBool('AUN_TEST_MESSAGE_CLASSES_V2', true);
+    controlAdvertisedCapabilities = {};
+    controlNegotiatedCapabilities = {};
+    controlWireSends = [];
+    sdkControlMessages = [];
     constructor() {
         this.client = this.newClient();
     }
@@ -242,8 +256,41 @@ export class CrossSdkTsAgent {
         if (internal._configModel)
             internal._configModel.requireForwardSecrecy = false;
         internal._testSlotId = this.slotId;
+        const controls = internal._controlMessages?.();
+        if (controls) {
+            const consume = controls.consume.bind(controls);
+            controls.consume = async (message, admission) => {
+                const result = await consume(message, admission);
+                if (message.encrypted === true)
+                    this.sdkControlMessages.push(structuredClone(message));
+                return result;
+            };
+        }
         return client;
     }
+    prepareControlMatrixRequest(method, params) {
+        if (method === 'auth.connect' && jsonObjectOf(params)) {
+            const request = { ...jsonObjectOf(params) };
+            const capabilities = { ...(jsonObjectOf(request.capabilities) ?? {}) };
+            if (this.inlineRealtimePayloadV1 === false)
+                delete capabilities.inline_realtime_payload_v1;
+            if (this.messageClassesV2 === false) {
+                delete capabilities.message_classes_v2;
+                delete capabilities.message_classes_v1;
+                delete capabilities.sdk_control_protocols;
+            }
+            request.capabilities = capabilities;
+            this.controlAdvertisedCapabilities = structuredClone(capabilities);
+            return request;
+        }
+        if (['message.send', 'message.v2.send', 'group.send', 'group.v2.send'].includes(method) && params) {
+            const envelope = jsonObjectOf(params.envelope) ?? jsonObjectOf(params.payload) ?? {};
+            this.controlWireSends.push({ method, message_id: textOf(params.message_id) || textOf(envelope.message_id) || textOf(jsonObjectOf(envelope.aad)?.message_id), to: textOf(params.to),
+                group_id: textOf(params.group_id ?? params.group_aid), message_class: params.message_class ?? null, message_class_present: 'message_class' in params, ttl: params.ttl ?? 0,
+                payload_type: textOf(envelope.type), protected_headers: structuredClone(jsonObjectOf(envelope.protected_headers) ?? jsonObjectOf(params.protected_headers) ?? {}) });
+        }
+        return params;
+    }
     bindClientEvents() {
         this.eventBoundClients ??= new WeakSet();
         if (this.eventBoundClients.has(this.client)) {
@@ -275,6 +322,17 @@ export class CrossSdkTsAgent {
         for (const event of ['message.read_changed', 'group.read_changed', 'read_state_sync']) {
             this.client.on(event, (payload) => { this.readStateEvents.push({ event, payload: jsonSafe(payload) }); });
         }
+        this.client.on('sync.error', (value) => {
+            const data = jsonObjectOf(value) ?? {}, error = textOf(data.error), method = textOf(data.method);
+            const internal = this.client;
+            this.eventLedger.push({
+                observation_id: this.rawPushObservationId, event: 'sync.error', event_index: this.eventLedger.length + 1, time_ms: Date.now(),
+                scope: method.startsWith('group.') ? 'group' : 'p2p', receiver_aid: this.aid,
+                device_id: textOf(internal._deviceId), slot_id: textOf(internal._slotId || this.slotId),
+                payload: { namespace: textOf(data.namespace), method, code: textOf(data.code),
+                    error_sha256: crypto.createHash('sha256').update(error, 'utf8').digest('hex'), error_length: Buffer.byteLength(error, 'utf8') },
+            });
+        });
         this.client.on('message.peers_snapshot', (payload) => {
             this.peersSnapshots.push({ event: 'message.peers_snapshot', payload: jsonSafe(payload) });
         });
@@ -296,17 +354,17 @@ export class CrossSdkTsAgent {
         this.singleEventCounts ??= { 'message.received': 0, 'group.message_created': 0, 'group.changed': 0 };
         this.singleEventCounts[event] = Number(this.singleEventCounts[event] ?? 0) + 1;
     }
-    async storeApplicationEvent(event, value) {
+    async storeApplicationEvent(event, value, observationId = this.rawPushObservationId) {
         if (event === 'message.received') {
-            this.storeEventLedger(event, value);
+            this.storeEventLedger(event, value, observationId);
             await this.storeInboxItem(this.normalizeMessage(value, true));
         }
         else if (event === 'group.message_created') {
-            this.storeEventLedger(event, value);
+            this.storeEventLedger(event, value, observationId);
             await this.storeGroupInboxItem(this.normalizeGroupMessage(value, true));
         }
         else if (event === 'group.changed')
-            this.storeGroupChangedPublicEvent(value);
+            this.storeGroupChangedPublicEvent(value, observationId);
     }
     setP2pSubscription(enabled) {
         this.p2pSubscription = enabled;
@@ -318,10 +376,11 @@ export class CrossSdkTsAgent {
         if (enabled && !this.p2pEventHandler) {
             const client = this.client;
             this.p2pEventHandler = async (msg) => {
+                const observationId = this.rawPushObservationId;
+                this.countSingleEvent('message.received');
                 if ((this.p2pDeliveryPaused || this.p2pDeliveryRetiredClients?.has(client)) && !await this.waitForP2pDelivery(client))
                     return;
-                this.countSingleEvent('message.received');
-                await this.storeApplicationEvent('message.received', msg);
+                await this.storeApplicationEvent('message.received', msg, observationId);
             };
             this.client.on('message.received', this.p2pEventHandler);
         }
@@ -378,22 +437,37 @@ export class CrossSdkTsAgent {
         const client = this.client;
         for (const event of events) {
             const handler = async (value) => {
+                const observationId = this.rawPushObservationId;
                 if (event === 'message.batch' && (this.p2pDeliveryPaused || this.p2pDeliveryRetiredClients?.has(client)) && !await this.waitForP2pDelivery(client))
                     return;
                 const data = jsonObjectOf(value) ?? {};
                 const items = JSON.parse(JSON.stringify(jsonSafe(Array.isArray(data.items) ? data.items : [])));
                 this.batchEvents ??= [];
-                this.batchEvents.push({ observation_id: this.rawPushObservationId, time_ms: Date.now(), event,
+                this.batchEvents.push({ observation_id: observationId, time_ms: Date.now(), event,
                     namespace: textOf(data.namespace), source: textOf(data.source), items });
                 for (const item of items)
-                    await this.storeApplicationEvent(textOf(item.event), item.payload);
+                    await this.storeApplicationEvent(textOf(item.event), item.payload, observationId);
             };
             this.batchEventHandlers.push({ event, handler });
             this.client.on(event, handler);
         }
     }
-    installTransportRpcObserver() {
+    installTransportRpcObserver(transport) {
         const client = this.client;
+        if (!transport) {
+            const options = this.client._historyChannels?.().options;
+            this.rpcObservedChannelFactories ??= new WeakSet();
+            if (options && !this.rpcObservedChannelFactories.has(options)) {
+                const create = options.create;
+                this.rpcObservedChannelFactories.add(options);
+                options.create = async (...args) => {
+                    const channel = await create.apply(options, args);
+                    this.installTransportRpcObserver(channel.transport);
+                    return channel;
+                };
+            }
+            transport = client._transport;
+        }
         const pipeline = client._rpcPipeline;
         this.rpcObservedPipelines ??= new WeakSet();
         this.rpcObservedPulls ??= new WeakMap();
@@ -415,7 +489,6 @@ export class CrossSdkTsAgent {
                 return result;
             };
         }
-        const transport = this.client._transport;
         transport?.setTraceMode('diag');
         if (!transport?.call || this.rpcObservedTransports.has(transport))
             return;
@@ -436,16 +509,7 @@ export class CrossSdkTsAgent {
             };
         transport.call = (method, params, timeout, trace, background) => {
             this.storeRawPushRpcMethod({ type: 'rpc', method, request_window: this.rawPushRequestWindow(params) });
-            let requestParams = params;
-            if (method === 'auth.connect' && !this.inlineRealtimePayloadV1 && jsonObjectOf(params)) {
-                const request = { ...jsonObjectOf(params) };
-                const capabilities = jsonObjectOf(request.capabilities);
-                if (capabilities) {
-                    delete capabilities.inline_realtime_payload_v1;
-                    request.capabilities = capabilities;
-                }
-                requestParams = request;
-            }
+            const requestParams = this.prepareControlMatrixRequest(method, params);
             const generation = this.observationGeneration;
             const span = this.startRpcSpan(method, requestParams);
             const controller = new AbortController();
@@ -455,6 +519,8 @@ export class CrossSdkTsAgent {
                 try {
                     request = originalCall.call(transport, method, requestParams, timeout, trace, background);
                     const result = await request;
+                    if (method === 'auth.connect')
+                        this.controlNegotiatedCapabilities = structuredClone(jsonObjectOf(jsonObjectOf(result)?.negotiated_capabilities) ?? {});
                     if (span) {
                         this.finishRpcResponse(span, result);
                         if (generation === this.observationGeneration && (this.isObservedPull(method) || this.pullBarrier?.method === method)) {
@@ -483,12 +549,12 @@ export class CrossSdkTsAgent {
             return pending;
         };
     }
-    storeEventLedger(event, value) {
+    storeEventLedger(event, value, observationId = this.rawPushObservationId) {
         const data = jsonObjectOf(value) ?? {};
         const internal = this.client;
         const payload = JSON.parse(stableStringify(jsonSafe(data.payload ?? null)));
         this.eventLedger.push({
-            observation_id: this.rawPushObservationId, event, event_index: this.eventLedger.length + 1, time_ms: Date.now(),
+            observation_id: observationId, event, event_index: this.eventLedger.length + 1, time_ms: Date.now(),
             scope: event === 'message.received' ? 'p2p' : 'group', receiver_aid: this.aid,
             device_id: textOf(internal._deviceId), slot_id: textOf(internal._slotId ?? this.slotId),
             sender_aid: textOf(data.sender_aid ?? data.from_aid ?? data.from), group_id: textOf(data.group_id),
@@ -527,7 +593,7 @@ export class CrossSdkTsAgent {
             if (typeof params[key] === 'number' && Number.isSafeInteger(params[key]))
                 window[key] = params[key];
         }
-        for (const key of ['window_mode', 'cursor_scope', 'sender_aid', 'group_id', 'group_aid', 'device_id', 'slot_id', 'after_volatile_cursor', 'mode', 'after_sender_aid']) {
+        for (const key of ['window_mode', 'cursor_scope', 'storage_scope', 'sender_aid', 'group_id', 'group_aid', 'device_id', 'slot_id', 'after_volatile_cursor', 'mode', 'after_sender_aid']) {
             if (typeof params[key] === 'string')
                 window[key] = params[key];
         }
@@ -575,6 +641,22 @@ export class CrossSdkTsAgent {
         span.has_more_volatile = typeof response.volatile_has_more === 'boolean' ? response.volatile_has_more : null;
         span.persistent_has_more = span.has_more_persistent;
         span.volatile_has_more = span.has_more_volatile;
+        const safeSeq = (value) => typeof value === 'number' && Number.isSafeInteger(value) && value >= 0 ? value : null;
+        for (const key of ['head_seq', 'scan_after_seq', 'covered_through_seq', 'next_after_seq', 'retention_floor_seq',
+            'retention_floor_message_seq', 'retention_floor_event_seq']) {
+            const value = safeSeq(response[key]);
+            if (value !== null)
+                span[key] = value;
+        }
+        const cursor = jsonObjectOf(response.cursor);
+        if (span.retention_floor_seq === undefined) {
+            const cursorRetentionFloor = safeSeq(cursor?.retention_floor_seq);
+            if (cursorRetentionFloor !== null)
+                span.retention_floor_seq = cursorRetentionFloor;
+        }
+        const cursorJoinSeq = safeSeq(cursor?.join_seq);
+        if (cursorJoinSeq !== null)
+            span.join_seq = cursorJoinSeq;
         for (const key of ['peer_ack_seq', 'effective_ack_seq', 'server_ack_seq', 'ack_seq', 'up_to_seq', 'acked_seq']) {
             if (typeof response[key] === 'number' && Number.isSafeInteger(response[key]))
                 span[key] = response[key];
@@ -691,10 +773,10 @@ export class CrossSdkTsAgent {
     storeRawGroupChangedObservation(value) {
         this.storeRawPushObservation('_raw.group.changed', 'group', 'changed', value);
     }
-    storeGroupChangedPublicEvent(value) {
+    storeGroupChangedPublicEvent(value, observationId = this.rawPushObservationId) {
         const data = jsonObjectOf(value) ?? {};
         this.groupChangedEvents.push({
-            observation_id: this.rawPushObservationId,
+            observation_id: observationId,
             time: Date.now(),
             group_id: textOf(data.group_id),
             action: textOf(data.action),
@@ -775,9 +857,12 @@ export class CrossSdkTsAgent {
             }
         }
         else {
-            const registered = await store.register(this.aid, { type: 'service', owner: textOf(process.env.AUN_TEST_OWNER_AID).trim() });
-            if (!registered.ok)
-                throw new Error(`${registered.error.code}: ${registered.error.message}`);
+            const local = store.load(this.aid);
+            if (!local.ok || !local.data.aid.isPrivateKeyValid()) {
+                const registered = await store.register(this.aid, { type: 'service', owner: textOf(process.env.AUN_TEST_OWNER_AID).trim() });
+                if (!registered.ok)
+                    throw new Error(`${registered.error.code}: ${registered.error.message}`);
+            }
         }
         const loaded = store.load(this.aid);
         if (!loaded.ok) {
@@ -812,7 +897,8 @@ export class CrossSdkTsAgent {
             return;
         }
         try {
-            const task = role === 'owner' ? await this.client.bindSubaid(peerAid) : await this.client.bindOwneraid(peerAid);
+            const options = body.batch_id === undefined ? [] : [{ batchId: body.batch_id }];
+            const task = role === 'owner' ? await this.client.bindSubaid(peerAid, ...options) : await this.client.bindOwneraid(peerAid, ...options);
             sendJson(res, 200, { ok: true, operation_id: task.operation_id, task: jsonSafe(task) });
         }
         catch (err) {
@@ -826,15 +912,20 @@ export class CrossSdkTsAgent {
     async ownershipAction(req, res, action) {
         const body = await readJson(req);
         const operationId = textOf(body.operation_id).trim(), subAid = textOf(body.sub_aid).trim(), newOwnerAid = textOf(body.new_owner_aid).trim();
-        if ((action === 'accept' || action === 'reject') ? !operationId : !subAid || action === 'transfer' && !newOwnerAid) {
+        if ((action === 'accept' || action === 'reject') ? !operationId && !Array.isArray(body.operation_ids) : !subAid || action === 'transfer' && !newOwnerAid) {
             sendJson(res, 400, { ok: false, error_code: 'bad_request', error_message: action === 'accept' || action === 'reject' ? 'operation_id is required' : 'sub_aid and transfer new_owner_aid are required' });
             return;
         }
         try {
+            if ((action === 'accept' || action === 'reject') && Array.isArray(body.operation_ids)) {
+                const report = action === 'accept' ? await this.client.acceptOwnershipRequests(body.operation_ids) : await this.client.rejectOwnershipRequests(body.operation_ids, body.reason);
+                sendJson(res, 200, { ok: true, report: jsonSafe(report) });
+                return;
+            }
             const task = action === 'accept' ? await this.client.acceptOwnershipRequest(operationId)
                 : action === 'reject' ? await this.client.rejectOwnershipRequest(operationId, body.reason)
                     : action === 'release' ? await this.client.releaseSubaid(subAid)
-                        : await this.client.transferSubaid(subAid, newOwnerAid);
+                        : await this.client.transferSubaid(subAid, newOwnerAid, ...(body.batch_id === undefined ? [] : [{ batchId: body.batch_id }]));
             sendJson(res, 200, { ok: true, operation_id: task.operation_id, task: jsonSafe(task) });
         }
         catch (err) {
@@ -928,6 +1019,8 @@ export class CrossSdkTsAgent {
             expires_at: Number(data.expires_at ?? 0) || 0,
             error_code: errorCode,
             raw_sha256: sha256Json(data),
+            message_class: data.message_class ?? jsonObjectOf(data.protected_headers)?.message_class ?? 'normal',
+            delivery_class: data.delivery_class ?? data.message_class ?? 'normal',
             ...metadata,
             ...(decrypted && jsonObjectOf(data._semantic_evidence) ? { _semantic_evidence: structuredClone(data._semantic_evidence) } : {}),
         };
@@ -950,6 +1043,8 @@ export class CrossSdkTsAgent {
             need_render: data.need_render !== false,
             error_code: errorCode,
             raw_sha256: sha256Json(data),
+            message_class: data.message_class ?? jsonObjectOf(data.protected_headers)?.message_class ?? 'normal',
+            delivery_class: data.delivery_class ?? data.message_class ?? 'normal',
             ...metadata,
             ...(decrypted && jsonObjectOf(data._semantic_evidence) ? { _semantic_evidence: structuredClone(data._semantic_evidence) } : {}),
         };
@@ -963,6 +1058,20 @@ export class CrossSdkTsAgent {
     async handle(req, res) {
         const url = new URL(req.url ?? '/', `http://${req.headers.host ?? 'localhost'}`);
         try {
+            if (req.method === 'POST' && url.pathname === '/control/config') {
+                const body = await readJson(req);
+                this.messageClassesV2 = body.enabled !== false;
+                await this.client.disconnect();
+                await this.client.connect({ auto_reconnect: false, background_sync: true });
+                sendJson(res, 200, { ok: true, requested_capabilities: this.controlAdvertisedCapabilities, negotiated_capabilities: this.controlNegotiatedCapabilities });
+                return;
+            }
+            if (req.method === 'GET' && ['/capabilities', '/control/observations', '/control/state'].includes(url.pathname)) {
+                sendJson(res, 200, { ok: true, enabled: this.messageClassesV2, advertised: this.controlAdvertisedCapabilities,
+                    requested_capabilities: this.controlAdvertisedCapabilities, negotiated_capabilities: this.controlNegotiatedCapabilities,
+                    wire_sends: this.controlWireSends, sdk_messages: this.sdkControlMessages });
+                return;
+            }
             if (req.method === 'GET' && url.pathname === '/health') {
                 const state = textOf(this.client.state ?? this.client._state ?? '');
                 sendJson(res, this.startupError ? 503 : 200, {
@@ -1151,6 +1260,17 @@ export class CrossSdkTsAgent {
                 await this.messageCall(req, res);
                 return;
             }
+            if (req.method === 'POST' && url.pathname === '/sync/channels/drop') {
+                const body = await readJson(req);
+                const connectionId = textOf(body.connection_id);
+                const ok = await this.client._historyChannels().dropChannel(connectionId);
+                sendJson(res, ok ? 200 : 404, { ok, connection_id: connectionId });
+                return;
+            }
+            if (req.method === 'GET' && url.pathname === '/sync/channels/state') {
+                sendJson(res, 200, { ...this.client._historyChannels().snapshot(), metrics: { rss_bytes: process.memoryUsage().rss } });
+                return;
+            }
             if (req.method === 'GET' && url.pathname === '/sync/state') {
                 this.syncState(url, res);
                 return;
@@ -1387,6 +1507,11 @@ export class CrossSdkTsAgent {
         };
         if (body.ttl !== undefined)
             params.ttl = Number(body.ttl);
+        if (jsonObjectOf(body.payload))
+            params.payload = { ...jsonObjectOf(body.payload), trace_id: traceId };
+        for (const key of ['message_class', 'sdk_control_protocol', 'sdk_control_version', 'protected_headers'])
+            if (key in body)
+                params[key] = body[key];
         if (body.need_render !== undefined)
             params.need_render = body.need_render;
         try {
@@ -1531,6 +1656,7 @@ export class CrossSdkTsAgent {
                 error_code: err instanceof Error ? err.name : 'Error',
                 error_message: err instanceof Error ? err.message : String(err),
             };
+            error.rpc_error_code = err?.code ?? null;
             this.recordTrace(traceId, { stage: 'message_call_error', method, error });
             sendJson(res, 500, error);
         }
@@ -1579,7 +1705,7 @@ export class CrossSdkTsAgent {
         const afterSeq = Number(body.after_seq ?? 0) || 0;
         const limit = Number(body.limit ?? 50) || 50;
         try {
-            const params = { limit, window_mode: tail ? 'tail' : 'forward' };
+            const params = { limit, ...(tail ? { window_mode: 'tail' } : {}) };
             if (scope === 'group' || body.after_seq !== undefined)
                 params.after_seq = afterSeq;
             if (scope === 'p2p' && senderAid)
@@ -1679,11 +1805,13 @@ export class CrossSdkTsAgent {
     }
     async sessionConnect(req, res) {
         const body = await readJson(req);
-        if (['background_sync', 'inline_realtime_payload_v1', 'batch_events'].some((key) => body[key] !== undefined && typeof body[key] !== 'boolean')) {
+        if (['background_sync', 'inline_realtime_payload_v1', 'batch_events', 'message_classes_v2'].some((key) => body[key] !== undefined && typeof body[key] !== 'boolean')) {
             sendJson(res, 400, { ok: false, error_code: 'bad_request', error_message: 'invalid session parameters' });
             return;
         }
         const backgroundSync = body.background_sync === true;
+        if (typeof body.message_classes_v2 === 'boolean')
+            this.messageClassesV2 = body.message_classes_v2;
         if (Object.prototype.hasOwnProperty.call(body, 'inline_realtime_payload_v1')) {
             this.inlineRealtimePayloadV1 = body.inline_realtime_payload_v1 !== false;
         }
@@ -1703,11 +1831,13 @@ export class CrossSdkTsAgent {
     }
     async sessionRestart(req, res) {
         const body = await readJson(req);
-        if (['background_sync', 'inline_realtime_payload_v1', 'batch_events'].some((key) => body[key] !== undefined && typeof body[key] !== 'boolean')) {
+        if (['background_sync', 'inline_realtime_payload_v1', 'batch_events', 'message_classes_v2'].some((key) => body[key] !== undefined && typeof body[key] !== 'boolean')) {
             sendJson(res, 400, { ok: false, error_code: 'bad_request', error_message: 'invalid session parameters' });
             return;
         }
         const backgroundSync = body.background_sync === true;
+        if (typeof body.message_classes_v2 === 'boolean')
+            this.messageClassesV2 = body.message_classes_v2;
         if (Object.prototype.hasOwnProperty.call(body, 'inline_realtime_payload_v1')) {
             this.inlineRealtimePayloadV1 = body.inline_realtime_payload_v1 !== false;
         }
@@ -2441,6 +2571,7 @@ export class CrossSdkTsAgent {
                 error_code: err instanceof Error ? err.name : 'Error',
                 error_message: err instanceof Error ? err.message : String(err),
             };
+            error.rpc_error_code = err?.code ?? null;
             this.recordTrace(traceId, { stage: 'storage_call_error', action, error });
             sendJson(res, 500, error);
         }
@@ -2832,7 +2963,7 @@ export class CrossSdkTsAgent {
                 return await storage.setAcl(path, {
                     owner,
                     bucket,
-                    granteeAid: textOf(params.grantee_aid ?? params.granteeAID).trim(),
+                    ...storageAclTargets(params),
                     perms: textOf(params.perms).trim(),
                     expiresAt: params.expires_at == null && params.expiresAt == null ? undefined : Number(params.expires_at ?? params.expiresAt),
                     maxUses: params.max_uses == null && params.maxUses == null ? undefined : Number(params.max_uses ?? params.maxUses),
@@ -2841,7 +2972,7 @@ export class CrossSdkTsAgent {
                 return await storage.removeAcl(path, {
                     owner,
                     bucket,
-                    granteeAid: textOf(params.grantee_aid ?? params.granteeAID).trim(),
+                    ...storageAclTargets(params),
                 });
             case 'list':
                 return await storage.list(path, {
@@ -3127,10 +3258,11 @@ export class CrossSdkTsAgent {
         try {
             const result = await this.client.call('group.send', {
                 group_id: groupId,
-                payload,
+                payload: jsonObjectOf(body.payload) ? { ...jsonObjectOf(body.payload), trace_id: traceId } : payload,
                 encrypt: e2ee,
                 message_id: messageId,
                 ...(body.need_render !== undefined ? { need_render: body.need_render } : {}),
+                ...Object.fromEntries(['message_class', 'ttl', 'sdk_control_protocol', 'sdk_control_version', 'protected_headers'].filter(key => key in body).map(key => [key, body[key]])),
             });
             const resultObj = result && typeof result === 'object' && !Array.isArray(result) ? result : {};
             const response = {