@zhin.js/plugin-group-suite 1.0.0 → 1.1.0

package/middlewares/keyword-reply.js

@@ -0,0 +1,36 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineMiddleware } from 'zhin.js/middleware';
+import { resolveGroupSuiteConfig } from "../lib/config.js";
+import { matchKeyword } from "../lib/keyword-store.js";
+import { resolveGroupSuiteRuntime } from "../lib/runtime-state.js";
+/**
+ * Keyword auto-reply (enabled via config.keywordReply).
+ * Uses Runtime Message.content / metadata (legacy used $raw / $channel).
+ */
+export default defineMiddleware({
+    target: 'inbound',
+    async handle(context, next) {
+        const config = resolveGroupSuiteConfig(context.config);
+        if (!config.keywordReply) {
+            await next();
+            return;
+        }
+        const meta = context.input.metadata ?? {};
+        const channelType = String(meta.type ?? meta.channelType ?? '');
+        if (channelType === 'private') {
+            await next();
+            return;
+        }
+        const text = typeof context.input.content === 'string' ? context.input.content.trim() : '';
+        if (!text) {
+            await next();
+            return;
+        }
+        const reply = matchKeyword(text, resolveGroupSuiteRuntime(context)?.keywords);
+        if (reply) {
+            await context.input.$reply(reply);
+            return;
+        }
+        await next();
+    },
+});

package/middlewares/keyword-reply.ts

@@ -0,0 +1,37 @@
+import { defineMiddleware } from 'zhin.js/middleware';
+import type { Message } from '@zhin.js/core/runtime';
+import { resolveGroupSuiteConfig, type GroupSuiteConfig } from '../src/config.js';
+import { matchKeyword } from '../src/keyword-store.js';
+import { resolveGroupSuiteRuntime } from '../src/runtime-state.js';
+
+/**
+ * Keyword auto-reply (enabled via config.keywordReply).
+ * Uses Runtime Message.content / metadata (legacy used $raw / $channel).
+ */
+export default defineMiddleware<Message, GroupSuiteConfig>({
+  target: 'inbound',
+  async handle(context, next) {
+    const config = resolveGroupSuiteConfig(context.config);
+    if (!config.keywordReply) {
+      await next();
+      return;
+    }
+    const meta = context.input.metadata ?? {};
+    const channelType = String(meta.type ?? meta.channelType ?? '');
+    if (channelType === 'private') {
+      await next();
+      return;
+    }
+    const text = typeof context.input.content === 'string' ? context.input.content.trim() : '';
+    if (!text) {
+      await next();
+      return;
+    }
+    const reply = matchKeyword(text, resolveGroupSuiteRuntime(context)?.keywords);
+    if (reply) {
+      await context.input.$reply(reply);
+      return;
+    }
+    await next();
+  },
+});

package/middlewares/stats-count.js

@@ -0,0 +1,20 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineMiddleware } from 'zhin.js/middleware';
+import { recordMessage } from "../lib/stats-lib.js";
+import { resolveGroupSuiteRuntime } from "../lib/runtime-state.js";
+/**
+ * Buffer inbound messages into in-memory message_stats (flushed on query).
+ * Skips command messages (legacy used `isActionMessage` to skip interactive
+ * action/command messages; the Runtime pipeline represents commands as
+ * text starting with the dispatcher prefix '/').
+ */
+export default defineMiddleware({
+    target: 'inbound',
+    async handle(context, next) {
+        const content = typeof context.input.content === 'string' ? context.input.content : '';
+        if (!content.startsWith('/')) {
+            recordMessage(context.input, resolveGroupSuiteRuntime(context));
+        }
+        await next();
+    },
+});

package/middlewares/stats-count.ts

@@ -0,0 +1,22 @@
+import { defineMiddleware } from 'zhin.js/middleware';
+import type { Message } from '@zhin.js/core/runtime';
+import type { GroupSuiteConfig } from '../src/config.js';
+import { recordMessage } from '../src/stats-lib.js';
+import { resolveGroupSuiteRuntime } from '../src/runtime-state.js';
+
+/**
+ * Buffer inbound messages into in-memory message_stats (flushed on query).
+ * Skips command messages (legacy used `isActionMessage` to skip interactive
+ * action/command messages; the Runtime pipeline represents commands as
+ * text starting with the dispatcher prefix '/').
+ */
+export default defineMiddleware<Message, GroupSuiteConfig>({
+  target: 'inbound',
+  async handle(context, next) {
+    const content = typeof context.input.content === 'string' ? context.input.content : '';
+    if (!content.startsWith('/')) {
+      recordMessage(context.input, resolveGroupSuiteRuntime(context));
+    }
+    await next();
+  },
+});

package/middlewares/teach-reply.js

@@ -0,0 +1,21 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineMiddleware } from 'zhin.js/middleware';
+import { resolveGroupSuiteConfig } from "../lib/config.js";
+import { tryTeachReply } from "../lib/teach-lib.js";
+import { resolveGroupSuiteRuntime } from "../lib/runtime-state.js";
+/**
+ * Teach Q&A auto-reply (exact / optional regex).
+ * Uses Runtime Message.content / metadata.
+ */
+export default defineMiddleware({
+    target: 'inbound',
+    async handle(context, next) {
+        const config = resolveGroupSuiteConfig(context.config);
+        const reply = await tryTeachReply(context.input, config, resolveGroupSuiteRuntime(context));
+        if (reply) {
+            await context.input.$reply(reply);
+            return;
+        }
+        await next();
+    },
+});

package/middlewares/teach-reply.ts

@@ -0,0 +1,22 @@
+import { defineMiddleware } from 'zhin.js/middleware';
+import type { Message } from '@zhin.js/core/runtime';
+import { resolveGroupSuiteConfig, type GroupSuiteConfig } from '../src/config.js';
+import { tryTeachReply } from '../src/teach-lib.js';
+import { resolveGroupSuiteRuntime } from '../src/runtime-state.js';
+
+/**
+ * Teach Q&A auto-reply (exact / optional regex).
+ * Uses Runtime Message.content / metadata.
+ */
+export default defineMiddleware<Message, GroupSuiteConfig>({
+  target: 'inbound',
+  async handle(context, next) {
+    const config = resolveGroupSuiteConfig(context.config);
+    const reply = await tryTeachReply(context.input, config, resolveGroupSuiteRuntime(context));
+    if (reply) {
+      await context.input.$reply(reply);
+      return;
+    }
+    await next();
+  },
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zhin.js/plugin-group-suite",
-  "version": "1.0.0",
-  "description": "Zhin.js 群运营套件 — 群管、签到、统计、日常分析、问答（合并原 5 个插件）",
+  "version": "1.1.0",
+  "description": "Zhin.js 群运营套件 — slice-2 checkin/teach/stats + keywords (Plugin Runtime, in-memory)",
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -14,11 +14,14 @@
     "./package.json": "./package.json"
   },
   "files": [
+    "plugin.js",
+    "schema.json",
+    "commands",
+    "middlewares",
     "src",
     "lib",
-    "skills",
+    "agent",
     "tools",
-    "plugin.yml",
     "README.md"
   ],
   "keywords": [
@@ -29,8 +32,7 @@
     "group",
     "checkin",
     "stats",
-    "teach",
-    "welcome"
+    "teach"
   ],
   "author": {
     "name": "lc-cn",
@@ -39,19 +41,34 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@zhin.js/satori": "0.2.13"
+    "@zhin.js/core": "1.1.35",
+    "@zhin.js/satori": "1.1.0"
   },
   "devDependencies": {
     "typescript": "^6.0.3",
-    "zhin.js": "2.0.0",
-    "@zhin.js/plugin-html-renderer": "1.0.0"
+    "vitest": "^4.1.10",
+    "zod": "^4.4.3",
+    "@zhin.js/agent": "1.1.23",
+    "zhin.js": "1.1.0"
   },
   "peerDependencies": {
-    "zhin.js": "2.0.0",
-    "@zhin.js/plugin-html-renderer": "1.0.0"
+    "zod": "^4.0.0",
+    "@zhin.js/agent": "^1.1.23",
+    "@zhin.js/command": "^1.1.0",
+    "@zhin.js/middleware": "^1.1.0",
+    "zhin.js": "^1.1.0"
   },
   "peerDependenciesMeta": {
-    "@zhin.js/plugin-html-renderer": {
+    "@zhin.js/agent": {
+      "optional": true
+    },
+    "@zhin.js/command": {
+      "optional": true
+    },
+    "@zhin.js/middleware": {
+      "optional": true
+    },
+    "zod": {
       "optional": true
     }
   },
@@ -64,8 +81,30 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  },
+  "zhin": {
+    "protocol": 1,
+    "type": "plugin",
+    "entry": "./plugin.js",
+    "engine": "^1.0.0",
+    "runtime": "trusted",
+    "features": [
+      {
+        "package": "@zhin.js/command",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/middleware",
+        "api": "^1.0.0"
+      }
+    ],
+    "plugins": []
+  },
   "scripts": {
-    "build": "tsc --build",
-    "clean": "rimraf lib"
+    "build": "tsc",
+    "clean": "rimraf lib",
+    "test": "NODE_OPTIONS=--experimental-strip-types vitest run --root ../../.. plugins/utils/group-suite/tests"
   }
 }

package/plugin.js

@@ -0,0 +1,40 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { definePlugin, databaseHostToken } from 'zhin.js';
+import { registerGroupSuiteDb } from "./lib/db-store.js";
+import { createInMemoryGroupSuiteDb } from "./lib/memory-store.js";
+import { createGroupSuiteRuntime, groupSuiteRuntimeToken } from "./lib/runtime-state.js";
+import { flushStatsBuffer } from "./lib/stats-lib.js";
+import { defineGroupSuiteTables } from "./lib/tables.js";
+/**
+ * Plugin Runtime:
+ * - checkin / teach / stats commands + keyword middleware
+ * - DB: prefer `databaseHostToken`; else in-memory fallback
+ * - Stats buffer: periodic flush every 10s + final flush on dispose
+ */
+export default definePlugin({
+    name: 'group-suite',
+    metadata: {
+        displayName: 'Group Suite',
+    },
+    setup(context) {
+        // host 与 memory 模型表面结构兼容（where 均返回 PromiseLike），可直接互换。
+        const db = (() => {
+            if (context.resources.has(databaseHostToken)) {
+                const host = context.resources.use(databaseHostToken);
+                defineGroupSuiteTables(host);
+                return host;
+            }
+            return createInMemoryGroupSuiteDb();
+        })();
+        const runtime = createGroupSuiteRuntime(db);
+        context.resources.provide(groupSuiteRuntimeToken, runtime);
+        context.lifecycle.add(registerGroupSuiteDb(db));
+        const flushTimer = setInterval(() => {
+            void flushStatsBuffer(runtime);
+        }, 10_000);
+        context.lifecycle.add(async () => {
+            clearInterval(flushTimer);
+            await flushStatsBuffer(runtime);
+        });
+    },
+});

package/schema.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "keywordReply": { "type": "boolean", "default": false },
+    "basePointsMin": { "type": "number", "default": 10 },
+    "basePointsMax": { "type": "number", "default": 30 },
+    "streakBonus": { "type": "number", "default": 5 },
+    "streakCap": { "type": "number", "default": 50 },
+    "rankSize": { "type": "number", "default": 10 },
+    "teachMaxPerGroup": { "type": "number", "default": 200 },
+    "teachCooldownMs": { "type": "number", "default": 3000 },
+    "teachAllowRegex": { "type": "boolean", "default": true },
+    "teachPageSize": { "type": "number", "default": 10 }
+  }
+}

package/src/analysis.ts

@@ -9,7 +9,7 @@
 export interface InboxMessageRow {
   id?: number;
   adapter: string;
-  bot_id: string;
+  endpoint_id: string;
   channel_id: string;
   channel_type: string;
   sender_id: string;

package/src/checkin-lib.ts

@@ -0,0 +1,165 @@
+import type { GroupSuiteConfig } from './config.js';
+import { getCheckinModel } from './db-store.js';
+import {
+  randomInt,
+  resolveContextKey,
+  resolveSender,
+  todayStr,
+  ts,
+  yesterdayStr,
+} from './shared-runtime.js';
+import type { GroupSuiteRuntime } from './runtime-state.js';
+
+async function getOrCreateUser(
+  model: any,
+  userId: string,
+  userName: string,
+  ctxType: string,
+  ctxId: string,
+): Promise<Record<string, unknown> | null> {
+  const rows = (await model.select().where({
+    user_id: userId,
+    context_type: ctxType,
+    context_id: ctxId,
+  })) as Record<string, unknown>[];
+  if (rows.length > 0) return rows[0];
+
+  await model.insert({
+    user_id: userId,
+    user_name: userName,
+    points: 0,
+    total_checkins: 0,
+    streak: 0,
+    max_streak: 0,
+    last_checkin: '',
+    context_type: ctxType,
+    context_id: ctxId,
+    created_at: ts(),
+    updated_at: ts(),
+  });
+
+  const created = (await model.select().where({
+    user_id: userId,
+    context_type: ctxType,
+    context_id: ctxId,
+  })) as Record<string, unknown>[];
+  return created[0] ?? null;
+}
+
+/**
+ * 同一 user_id+context 的签到串行化（per-user promise 链），
+ * 避免 check-then-act 竞态导致连发两条都签到成功。
+ */
+const checkinChains = new Map<string, Promise<unknown>>();
+
+function serializedCheckin<T>(key: string, task: () => Promise<T>): Promise<T> {
+  const prev = checkinChains.get(key) ?? Promise.resolve();
+  const next = prev.then(task, task);
+  checkinChains.set(key, next);
+  return next.finally(() => {
+    if (checkinChains.get(key) === next) checkinChains.delete(key);
+  });
+}
+
+export async function doCheckin(
+  input: { sender?: { readonly id: string; readonly name?: string }; target?: string; metadata?: Readonly<Record<string, unknown>> },
+  cfg: GroupSuiteConfig,
+  runtime?: GroupSuiteRuntime,
+): Promise<string> {
+  const M = getCheckinModel(runtime?.db);
+  if (!M) return '签到数据库尚未就绪，请稍后重试';
+
+  const { id: userId, name: userName } = resolveSender(input);
+  if (!userId) return '无法获取用户信息';
+
+  const { type: ctxType, id: ctxId } = resolveContextKey(input);
+  return serializedCheckin(`${userId}:${ctxType}:${ctxId}`, async () => {
+    const user = await getOrCreateUser(M, userId, userName, ctxType, ctxId);
+    if (!user) return '签到失败，请重试';
+
+    const today = todayStr();
+    if (user.last_checkin === today) {
+      return `你今天已经签到过了哦～\n当前积分: ${user.points}\n连续签到: ${user.streak} 天`;
+    }
+
+    const isConsecutive = user.last_checkin === yesterdayStr();
+    const newStreak = isConsecutive ? Number(user.streak) + 1 : 1;
+    const base = randomInt(cfg.basePointsMin, cfg.basePointsMax);
+    const bonus = Math.min(newStreak * cfg.streakBonus, cfg.streakCap);
+    const earned = base + bonus;
+    const newPoints = Number(user.points || 0) + earned;
+
+    await M.update({
+      points: newPoints,
+      total_checkins: Number(user.total_checkins || 0) + 1,
+      streak: newStreak,
+      max_streak: Math.max(Number(user.max_streak || 0), newStreak),
+      last_checkin: today,
+      user_name: userName,
+      updated_at: ts(),
+    }).where({
+      user_id: userId,
+      context_type: ctxType,
+      context_id: ctxId,
+    });
+
+    const lines = [`签到成功！`, `基础积分: +${base}`];
+    if (bonus > 0) lines.push(`连续奖励: +${bonus} (连续${newStreak}天)`);
+    lines.push(`本次获得: +${earned}`, `当前积分: ${newPoints}`);
+    return lines.join('\n');
+  });
+}
+
+export async function myPoints(
+  input: { sender?: { readonly id: string; readonly name?: string }; target?: string; metadata?: Readonly<Record<string, unknown>> },
+  runtime?: GroupSuiteRuntime,
+): Promise<string> {
+  const M = getCheckinModel(runtime?.db);
+  if (!M) return '签到数据库尚未就绪';
+  const { id: userId } = resolveSender(input);
+  const { type: ctxType, id: ctxId } = resolveContextKey(input);
+  const rows = (await M.select().where({
+    user_id: userId,
+    context_type: ctxType,
+    context_id: ctxId,
+  })) as Record<string, unknown>[];
+  if (rows.length === 0) return '你还没有签到记录哦，发送「checkin」开始吧！';
+  const u = rows[0];
+  const checkedToday = u.last_checkin === todayStr();
+  return [
+    `${u.user_name || '用户'} 的积分信息`,
+    `积分: ${u.points}`,
+    `累计签到: ${u.total_checkins} 天`,
+    `连续签到: ${u.streak} 天`,
+    `最长连续: ${u.max_streak} 天`,
+    checkedToday ? '今日已签到 ✓' : '今日未签到',
+  ].join('\n');
+}
+
+export async function pointsRank(
+  input: { sender?: { readonly id: string; readonly name?: string }; target?: string; metadata?: Readonly<Record<string, unknown>> },
+  cfg: GroupSuiteConfig,
+  runtime?: GroupSuiteRuntime,
+): Promise<string> {
+  const M = getCheckinModel(runtime?.db);
+  if (!M) return '签到数据库尚未就绪';
+  const { type: ctxType, id: ctxId } = resolveContextKey(input);
+  const all = (await M.select().where(
+    ctxType === 'global'
+      ? { context_type: 'global' }
+      : { context_type: ctxType, context_id: ctxId },
+  )) as Record<string, unknown>[];
+  if (all.length === 0) return '还没有人签到过哦～';
+  const sorted = all.sort((a, b) => Number(b.points || 0) - Number(a.points || 0));
+  const top = sorted.slice(0, cfg.rankSize);
+  const medals = ['🥇', '🥈', '🥉'];
+  const lines = top.map((u, i) => {
+    const prefix = i < 3 ? medals[i] : `${i + 1}.`;
+    return `${prefix} ${u.user_name || u.user_id} — ${u.points}分 (${u.total_checkins}天)`;
+  });
+  const title = ctxType === 'group' ? '本群积分排行' : '全局积分排行';
+  const { id: userId } = resolveSender(input);
+  const myRank = sorted.findIndex((u) => u.user_id === userId);
+  const footer = myRank >= 0 ? `\n你的排名: 第${myRank + 1}名` : '';
+  return `${title}\n${lines.join('\n')}${footer}`;
+}

package/src/config.ts

@@ -1,68 +1,34 @@
-import { Schema } from "zhin.js";
-
-/** 扁平 groupSuite 配置（单层字段，默认值覆盖多数场景） */
-export const groupSuiteSchema = Schema.object({
-  welcome: Schema.string()
-    .default("欢迎新成员加入本群！")
-    .description("入群欢迎语"),
-  recallNotify: Schema.boolean()
-    .default(true)
-    .description("群消息撤回时是否提示"),
-  keywordReply: Schema.boolean()
-    .default(false)
-    .description("内置关键词回复（默认关闭，用 teach 问答）"),
-  noticeAdapters: Schema.list(Schema.string())
-    .default(["icqq"])
-    .description("处理 notice 的适配器（欢迎/撤回）"),
-
-  basePointsMin: Schema.number().default(10).min(1).max(100),
-  basePointsMax: Schema.number().default(30).min(1).max(200),
-  streakBonus: Schema.number().default(5).min(0).max(100),
-  streakCap: Schema.number().default(50).min(0).max(500),
-
-  rankSize: Schema.number()
-    .default(10)
-    .min(3)
-    .max(50)
-    .description("签到排行与消息统计排行显示人数"),
-  statsRetentionDays: Schema.number().default(90).min(7).max(365),
-
-  analysisDays: Schema.number().default(1).min(1).max(30),
-  autoAnalysisEnabled: Schema.boolean().default(false),
-  autoAnalysisCron: Schema.string().default("0 9 * * *"),
-  analysisGroups: Schema.list(Schema.string())
-    .default([])
-    .description("启用群日报的群 ID 白名单（空=不限制）"),
-  analysisGroupsBlock: Schema.list(Schema.string())
-    .default([])
-    .description("禁用群日报的群 ID"),
-  analysisMaxMessages: Schema.number().default(500).min(100).max(5000),
-
-  teachMaxPerGroup: Schema.number().default(200).min(1).max(1000),
-  teachCooldownMs: Schema.number().default(3000).min(0).max(60000),
-  teachAllowRegex: Schema.boolean().default(true),
-  teachPageSize: Schema.number().default(10).min(5).max(50),
-});
-
-export type GroupSuiteConfig = {
-  welcome: string;
-  recallNotify: boolean;
+export interface GroupSuiteConfig {
   keywordReply: boolean;
-  noticeAdapters: string[];
   basePointsMin: number;
   basePointsMax: number;
   streakBonus: number;
   streakCap: number;
   rankSize: number;
-  statsRetentionDays: number;
-  analysisDays: number;
-  autoAnalysisEnabled: boolean;
-  autoAnalysisCron: string;
-  analysisGroups: string[];
-  analysisGroupsBlock: string[];
-  analysisMaxMessages: number;
   teachMaxPerGroup: number;
   teachCooldownMs: number;
   teachAllowRegex: boolean;
   teachPageSize: number;
+}
+
+export const DEFAULT_GROUP_SUITE_CONFIG: GroupSuiteConfig = {
+  keywordReply: false,
+  basePointsMin: 10,
+  basePointsMax: 30,
+  streakBonus: 5,
+  streakCap: 50,
+  rankSize: 10,
+  teachMaxPerGroup: 200,
+  teachCooldownMs: 3000,
+  teachAllowRegex: true,
+  teachPageSize: 10,
 };
+
+export function resolveGroupSuiteConfig(
+  raw: Partial<GroupSuiteConfig> | undefined,
+): GroupSuiteConfig {
+  return {
+    ...DEFAULT_GROUP_SUITE_CONFIG,
+    ...raw,
+  };
+}

package/src/db-store.ts

@@ -0,0 +1,51 @@
+import {
+  CHECKIN_TABLE,
+  createInMemoryGroupSuiteDb,
+  STATS_TABLE,
+  TEACH_TABLE,
+  type GroupSuiteMemoryDb,
+  type GroupSuiteModel,
+} from './memory-store.js';
+
+let _db: GroupSuiteMemoryDb | null = null;
+const registrations: Array<{ readonly value: GroupSuiteMemoryDb }> = [];
+
+/** Ensure an in-memory store when Runtime DatabaseFeature Resource is not wired yet. */
+export function ensureGroupSuiteMemoryDb(): GroupSuiteMemoryDb {
+  if (!_db) _db = createInMemoryGroupSuiteDb();
+  return _db;
+}
+
+export function getGroupSuiteDb(): GroupSuiteMemoryDb | null {
+  return registrations[registrations.length - 1]?.value ?? ensureGroupSuiteMemoryDb();
+}
+
+export function setGroupSuiteDb(db: GroupSuiteMemoryDb | null): void {
+  _db = db;
+}
+
+export function registerGroupSuiteDb(db: GroupSuiteMemoryDb): () => void {
+  const registration = Object.freeze({ value: db });
+  registrations.push(registration);
+  return () => {
+    const index = registrations.lastIndexOf(registration);
+    if (index >= 0) registrations.splice(index, 1);
+  };
+}
+
+/** Test helper: clear module store. */
+export function resetGroupSuiteDb(): void {
+  _db = null;
+}
+
+export function getCheckinModel(db = getGroupSuiteDb()): GroupSuiteModel | null {
+  return db?.models.get(CHECKIN_TABLE) ?? null;
+}
+
+export function getTeachModel(db = getGroupSuiteDb()): GroupSuiteModel | null {
+  return db?.models.get(TEACH_TABLE) ?? null;
+}
+
+export function getStatsModel(db = getGroupSuiteDb()): GroupSuiteModel | null {
+  return db?.models.get(STATS_TABLE) ?? null;
+}