@michengai/dsh-im-connect 1.0.48 → 1.0.49
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/CHANGELOG.md +10 -0
- package/CHANGELOG.zh-CN.md +10 -0
- package/client.js +206 -70
- package/lib/client.js +206 -70
- package/lib/manager.d.ts +11 -5
- package/lib/manager.d.ts.map +1 -1
- package/lib/manager.js +63 -7
- package/lib/manager.js.map +1 -1
- package/package.json +1 -1
- package/src/manager.ts +75 -8
package/lib/client.js
CHANGED
|
@@ -474,8 +474,13 @@ function resolveApiUrl(path) {
|
|
|
474
474
|
function parseChannelSettingsRequest(value) {
|
|
475
475
|
if (!value || typeof value !== "object") return undefined;
|
|
476
476
|
const channelId = typeof value.channelId === "string" ? value.channelId.trim() : "";
|
|
477
|
-
|
|
478
|
-
|
|
477
|
+
const accountId = typeof value.accountId === "string" ? value.accountId.trim() : "";
|
|
478
|
+
if (!channelId && !accountId) return undefined;
|
|
479
|
+
return {
|
|
480
|
+
channelId,
|
|
481
|
+
accountId: accountId || undefined,
|
|
482
|
+
name: typeof value.name === "string" ? value.name : "",
|
|
483
|
+
};
|
|
479
484
|
}
|
|
480
485
|
function writeChannelSettingsRequest(storage, request) {
|
|
481
486
|
try { storage && storage.setItem(CHANNEL_SETTINGS_STORAGE_KEY, JSON.stringify(request)); } catch { /* ignore */ }
|
|
@@ -498,10 +503,20 @@ function resolveApiUrl(path) {
|
|
|
498
503
|
function resolveChannelSettingsTarget(request, channels) {
|
|
499
504
|
const parsed = parseChannelSettingsRequest(request);
|
|
500
505
|
if (!parsed || !Array.isArray(channels)) return undefined;
|
|
501
|
-
|
|
506
|
+
if (parsed.accountId) {
|
|
507
|
+
for (const channel of channels) {
|
|
508
|
+
const account = (channel.accounts || []).find((a) => a && a.id === parsed.accountId);
|
|
509
|
+
if (account) return { channelId: channel.id, accountId: account.id };
|
|
510
|
+
}
|
|
511
|
+
}
|
|
512
|
+
const channel = channels.find((item) => item && (item.id === parsed.channelId || (item.accounts || []).some((a) => a && a.id === parsed.channelId)));
|
|
502
513
|
if (!channel) return undefined;
|
|
503
514
|
const accounts = channel.accounts || [];
|
|
504
|
-
|
|
515
|
+
const matchedAccount = accounts.find((a) => a && (a.id === parsed.accountId || a.id === parsed.channelId));
|
|
516
|
+
return {
|
|
517
|
+
channelId: channel.id,
|
|
518
|
+
accountId: matchedAccount ? matchedAccount.id : (accounts.length === 1 ? accounts[0].id : undefined),
|
|
519
|
+
};
|
|
505
520
|
}
|
|
506
521
|
function pickSettingsSectionButton(buttons, labels) {
|
|
507
522
|
const normalize = (value) => String(value || "").replace(/\s+/g, "").trim().toLowerCase();
|
|
@@ -3343,15 +3358,33 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
3343
3358
|
let requestHostSessionRefresh = () => {};
|
|
3344
3359
|
let channelSessionIds = new Set();
|
|
3345
3360
|
let channelSessionChannels = new Map();
|
|
3361
|
+
let channelSessionAccounts = new Map();
|
|
3362
|
+
let channelAccountMeta = new Map();
|
|
3346
3363
|
let channelMembershipRevision = 0;
|
|
3347
3364
|
const channelMembershipListeners = new Set();
|
|
3365
|
+
function parsePlatformFromChannelId(id) {
|
|
3366
|
+
const val = String(id || "");
|
|
3367
|
+
const split = val.indexOf("_");
|
|
3368
|
+
return split > 0 ? val.slice(0, split) : val;
|
|
3369
|
+
}
|
|
3348
3370
|
function updateChannelMembership(groups) {
|
|
3349
3371
|
const next = new Set();
|
|
3350
3372
|
const channels = new Map();
|
|
3351
|
-
|
|
3373
|
+
const accounts = new Map();
|
|
3374
|
+
const meta = new Map();
|
|
3375
|
+
for (const group of groups || []) {
|
|
3376
|
+
const platform = group.platform || parsePlatformFromChannelId(group.id);
|
|
3377
|
+
const accountId = group.accountId || group.id;
|
|
3378
|
+
meta.set(accountId, {
|
|
3379
|
+
id: accountId,
|
|
3380
|
+
accountId,
|
|
3381
|
+
platform,
|
|
3382
|
+
label: group.label || "",
|
|
3383
|
+
});
|
|
3352
3384
|
for (const session of group.sessions || []) {
|
|
3353
3385
|
next.add(session.sessionId);
|
|
3354
|
-
channels.set(String(session.sessionId),
|
|
3386
|
+
channels.set(String(session.sessionId), platform);
|
|
3387
|
+
accounts.set(String(session.sessionId), accountId);
|
|
3355
3388
|
}
|
|
3356
3389
|
}
|
|
3357
3390
|
let changed = next.size !== channelSessionIds.size || [...next].some(id => !channelSessionIds.has(id));
|
|
@@ -3360,15 +3393,35 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
3360
3393
|
if (channelSessionChannels.get(id) !== channel) { changed = true; break; }
|
|
3361
3394
|
}
|
|
3362
3395
|
}
|
|
3396
|
+
if (!changed) {
|
|
3397
|
+
for (const [id, account] of accounts) {
|
|
3398
|
+
if (channelSessionAccounts.get(id) !== account) { changed = true; break; }
|
|
3399
|
+
}
|
|
3400
|
+
}
|
|
3401
|
+
if (!changed) {
|
|
3402
|
+
if (meta.size !== channelAccountMeta.size) {
|
|
3403
|
+
changed = true;
|
|
3404
|
+
} else {
|
|
3405
|
+
for (const [id, item] of meta) {
|
|
3406
|
+
const prev = channelAccountMeta.get(id);
|
|
3407
|
+
if (!prev || prev.label !== item.label || prev.platform !== item.platform) {
|
|
3408
|
+
changed = true;
|
|
3409
|
+
break;
|
|
3410
|
+
}
|
|
3411
|
+
}
|
|
3412
|
+
}
|
|
3413
|
+
}
|
|
3363
3414
|
if (changed) {
|
|
3364
3415
|
channelSessionIds = next;
|
|
3365
3416
|
channelSessionChannels = channels;
|
|
3417
|
+
channelSessionAccounts = accounts;
|
|
3418
|
+
channelAccountMeta = meta;
|
|
3366
3419
|
channelMembershipRevision += 1;
|
|
3367
3420
|
for (const listener of channelMembershipListeners) listener();
|
|
3368
3421
|
}
|
|
3369
3422
|
try { requestHostSessionRefresh(changed); } catch { /* 下次频道轮询继续重试 */ }
|
|
3370
3423
|
}
|
|
3371
|
-
/** IM 会话 ID
|
|
3424
|
+
/** IM 会话 ID 所属渠道平台(如 weixin/feishu),供会话行图标展示。 */
|
|
3372
3425
|
function channelIdOfSession(sessionId) {
|
|
3373
3426
|
const value = String(sessionId || "");
|
|
3374
3427
|
const mapped = channelSessionChannels.get(value);
|
|
@@ -3381,6 +3434,17 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
3381
3434
|
const platform = instance.split("_", 1)[0];
|
|
3382
3435
|
return platform || undefined;
|
|
3383
3436
|
}
|
|
3437
|
+
/** IM 会话 ID 所属具体账号实例(如 feishu_1)。 */
|
|
3438
|
+
function accountIdOfSession(sessionId) {
|
|
3439
|
+
const value = String(sessionId || "");
|
|
3440
|
+
const mapped = channelSessionAccounts.get(value);
|
|
3441
|
+
if (mapped) return mapped;
|
|
3442
|
+
if (!value.startsWith("im:")) return channelSessionChannels.get(value);
|
|
3443
|
+
const rest = value.slice(3);
|
|
3444
|
+
const split = rest.indexOf(":");
|
|
3445
|
+
const instance = split > 0 ? rest.slice(0, split) : rest;
|
|
3446
|
+
return instance || undefined;
|
|
3447
|
+
}
|
|
3384
3448
|
// 新旧两代 IM 前缀都要认,否则存量会话升级后会掉出渠道页签。
|
|
3385
3449
|
const isChannelSession = (id) => {
|
|
3386
3450
|
const value = String(id);
|
|
@@ -5315,7 +5379,6 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5315
5379
|
// ---------------------------------------------------------------------
|
|
5316
5380
|
|
|
5317
5381
|
const CHANNEL_WORKSPACE_PREFIX = "dsh-im-channel:";
|
|
5318
|
-
const CHANNEL_GROUP_IDS = ["weixin", "wecom", "qq", "feishu", "lark", "dingtalk", "telegram", "discord", "slack"];
|
|
5319
5382
|
const EMPTY_SESSION_STATE = { ids: [], byId: {}, current: null };
|
|
5320
5383
|
const EMPTY_WORKSPACE_STATE = { items: [], archivedSessionIds: [], pinnedSessionIds: [], state: "idle", phase: "ready", error: null };
|
|
5321
5384
|
const CHANNEL_GROUP_OPTION_ATTR = "data-ima-channel-group-option";
|
|
@@ -5443,16 +5506,34 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5443
5506
|
}
|
|
5444
5507
|
|
|
5445
5508
|
function channelGroupsFromSessionState(state, t) {
|
|
5446
|
-
const groups = new Map(
|
|
5447
|
-
|
|
5448
|
-
|
|
5449
|
-
|
|
5450
|
-
|
|
5509
|
+
const groups = new Map();
|
|
5510
|
+
const metaMap = channelAccountMeta;
|
|
5511
|
+
for (const [accountId, meta] of metaMap) {
|
|
5512
|
+
groups.set(accountId, {
|
|
5513
|
+
id: accountId,
|
|
5514
|
+
platform: meta.platform,
|
|
5515
|
+
label: meta.label || channelLabel({ id: meta.platform }, t),
|
|
5516
|
+
sessions: [],
|
|
5517
|
+
});
|
|
5518
|
+
}
|
|
5451
5519
|
const src = state || EMPTY_SESSION_STATE;
|
|
5452
5520
|
for (const id of src.ids || []) {
|
|
5453
|
-
const
|
|
5521
|
+
const platform = channelIdOfSession(id);
|
|
5522
|
+
if (!platform) continue;
|
|
5523
|
+
const accountId = accountIdOfSession(id) || platform;
|
|
5524
|
+
let group = groups.get(accountId);
|
|
5525
|
+
if (!group) {
|
|
5526
|
+
const meta = metaMap.get(accountId);
|
|
5527
|
+
group = {
|
|
5528
|
+
id: accountId,
|
|
5529
|
+
platform,
|
|
5530
|
+
label: (meta && meta.label) || channelLabel({ id: platform }, t),
|
|
5531
|
+
sessions: [],
|
|
5532
|
+
};
|
|
5533
|
+
groups.set(accountId, group);
|
|
5534
|
+
}
|
|
5454
5535
|
const session = src.byId && src.byId[id];
|
|
5455
|
-
if (
|
|
5536
|
+
if (session) group.sessions.push({ sessionId: id, updatedAt: session.updatedAt });
|
|
5456
5537
|
}
|
|
5457
5538
|
return [...groups.values()].filter((group) => group.sessions.length > 0);
|
|
5458
5539
|
}
|
|
@@ -5474,7 +5555,7 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5474
5555
|
const src = state || EMPTY_WORKSPACE_STATE;
|
|
5475
5556
|
const key = groups.map((group) => [
|
|
5476
5557
|
group.id,
|
|
5477
|
-
channelLabel(group, t),
|
|
5558
|
+
group.label || channelLabel(group, t),
|
|
5478
5559
|
channelGroupCreatedAt(group),
|
|
5479
5560
|
(group.sessions || []).map((session) => session.sessionId).join(","),
|
|
5480
5561
|
].join("\0")).join("\0\0");
|
|
@@ -5485,7 +5566,7 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5485
5566
|
return {
|
|
5486
5567
|
workspaceId,
|
|
5487
5568
|
id: workspaceId,
|
|
5488
|
-
title: channelLabel(group, t),
|
|
5569
|
+
title: group.label || channelLabel(group, t),
|
|
5489
5570
|
path: "",
|
|
5490
5571
|
sessionIds: (group.sessions || []).map((session) => session.sessionId),
|
|
5491
5572
|
createdAt: channelGroupCreatedAt(group),
|
|
@@ -5512,8 +5593,6 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5512
5593
|
return result;
|
|
5513
5594
|
}
|
|
5514
5595
|
|
|
5515
|
-
let channelIconCssValue;
|
|
5516
|
-
|
|
5517
5596
|
/** 把 React 元素渲染成可直接注入官方 DOM 的 HTML。 */
|
|
5518
5597
|
function channelMarkup(element) {
|
|
5519
5598
|
if (typeof document === "undefined") return "";
|
|
@@ -5540,7 +5619,7 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5540
5619
|
}
|
|
5541
5620
|
|
|
5542
5621
|
const channelLogoUrlCache = new Map();
|
|
5543
|
-
/** 频道品牌标 data URL
|
|
5622
|
+
/** 频道品牌标 data URL,供工作区图标和会话行复用。 */
|
|
5544
5623
|
function channelLogoUrl(id) {
|
|
5545
5624
|
if (channelLogoUrlCache.has(id)) return channelLogoUrlCache.get(id);
|
|
5546
5625
|
const markup = channelMarkup(h(BrandMark, { id, compact: true }));
|
|
@@ -5549,26 +5628,6 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5549
5628
|
return url;
|
|
5550
5629
|
}
|
|
5551
5630
|
|
|
5552
|
-
/** 频道分组头图标:用品牌标覆盖官方文件夹图标,并保持悬停时可见。 */
|
|
5553
|
-
function channelIconCss() {
|
|
5554
|
-
if (channelIconCssValue !== undefined) return channelIconCssValue;
|
|
5555
|
-
if (typeof document === "undefined") {
|
|
5556
|
-
channelIconCssValue = "";
|
|
5557
|
-
return channelIconCssValue;
|
|
5558
|
-
}
|
|
5559
|
-
channelIconCssValue = CHANNEL_GROUP_IDS.map((id) => {
|
|
5560
|
-
const logo = channelLogoUrl(id);
|
|
5561
|
-
if (!logo) return "";
|
|
5562
|
-
const row = `[data-row-key="workspace:${channelWorkspaceId(id)}"]`;
|
|
5563
|
-
return `.ima-channel-official ${row}>span:first-child>svg{display:none!important}`
|
|
5564
|
-
+ `.ima-channel-official ${row}>span:first-child{display:inline-flex!important;background:${logo} center/contain no-repeat!important}`
|
|
5565
|
-
// 宿主在悬停时用 chevron 换掉文件夹;频道分组保持品牌图标可见。
|
|
5566
|
-
+ `.ima-channel-official ${row}:hover>span:first-child{display:inline-flex!important}`
|
|
5567
|
-
+ `.ima-channel-official ${row}:hover>span:nth-child(2){display:none!important}`;
|
|
5568
|
-
}).join("");
|
|
5569
|
-
return channelIconCssValue;
|
|
5570
|
-
}
|
|
5571
|
-
|
|
5572
5631
|
let channelWorkspaceIconCache = { key: "", css: "" };
|
|
5573
5632
|
/**
|
|
5574
5633
|
* 按工作区/工作区树分组时,如果某个工作区的频道会话都来自同一个频道,
|
|
@@ -5605,6 +5664,55 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5605
5664
|
return css;
|
|
5606
5665
|
}
|
|
5607
5666
|
|
|
5667
|
+
/**
|
|
5668
|
+
* 替换菜单项内的图标与文案,兼容各种带有嵌套包装、CSS Module 类名或纯结构节点的宿主 DOM。
|
|
5669
|
+
*/
|
|
5670
|
+
function replaceMenuItemContent(button, templateText, label, icon) {
|
|
5671
|
+
const ownerDoc = button.ownerDocument || (typeof document !== "undefined" ? document : null);
|
|
5672
|
+
let iconContainer = button.querySelector('[class*="itemIcon"], [class*="Icon"]');
|
|
5673
|
+
if (!iconContainer && button.firstElementChild) {
|
|
5674
|
+
const first = button.firstElementChild;
|
|
5675
|
+
const isSvg = first.tagName && first.tagName.toLowerCase() === "svg";
|
|
5676
|
+
const isImg = first.tagName && first.tagName.toLowerCase() === "img";
|
|
5677
|
+
if (isSvg || isImg || button.children.length > 1) {
|
|
5678
|
+
iconContainer = first;
|
|
5679
|
+
}
|
|
5680
|
+
}
|
|
5681
|
+
const isInsideIcon = (el) => iconContainer && typeof iconContainer.contains === "function" && iconContainer.contains(el);
|
|
5682
|
+
const labelContainer = button.querySelector('[class*="itemLabel"], [class*="Label"]')
|
|
5683
|
+
|| [...button.querySelectorAll("span, div")].find((el) => el !== iconContainer && !isInsideIcon(el) && (el.textContent || "").trim() === templateText)
|
|
5684
|
+
|| (button.children.length > 1 ? button.children[1] : null)
|
|
5685
|
+
|| (button.lastElementChild !== iconContainer ? button.lastElementChild : null);
|
|
5686
|
+
|
|
5687
|
+
if (icon !== undefined) {
|
|
5688
|
+
if (!iconContainer && ownerDoc && typeof ownerDoc.createElement === "function") {
|
|
5689
|
+
iconContainer = ownerDoc.createElement("span");
|
|
5690
|
+
if (typeof iconContainer.setAttribute === "function") {
|
|
5691
|
+
iconContainer.setAttribute("class", "ima-menu-item-icon");
|
|
5692
|
+
iconContainer.setAttribute("aria-hidden", "true");
|
|
5693
|
+
}
|
|
5694
|
+
button.insertBefore(iconContainer, button.firstChild);
|
|
5695
|
+
}
|
|
5696
|
+
if (iconContainer) {
|
|
5697
|
+
iconContainer.innerHTML = icon;
|
|
5698
|
+
}
|
|
5699
|
+
}
|
|
5700
|
+
if (labelContainer && labelContainer !== iconContainer) {
|
|
5701
|
+
labelContainer.textContent = label;
|
|
5702
|
+
} else {
|
|
5703
|
+
const remaining = [...button.children].filter((el) => el !== iconContainer);
|
|
5704
|
+
if (remaining.length >= 1) {
|
|
5705
|
+
remaining[0].textContent = label;
|
|
5706
|
+
} else if (ownerDoc && typeof ownerDoc.createElement === "function") {
|
|
5707
|
+
const textNode = ownerDoc.createElement("span");
|
|
5708
|
+
textNode.textContent = label;
|
|
5709
|
+
button.appendChild(textNode);
|
|
5710
|
+
} else {
|
|
5711
|
+
button.textContent = label;
|
|
5712
|
+
}
|
|
5713
|
+
}
|
|
5714
|
+
}
|
|
5715
|
+
|
|
5608
5716
|
/**
|
|
5609
5717
|
* 官方视图选项菜单没有扩展位,注入第四个分组项「按频道」。
|
|
5610
5718
|
* 只在频道页签挂载期间生效。
|
|
@@ -5631,11 +5739,11 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5631
5739
|
button.removeAttribute("disabled");
|
|
5632
5740
|
button.disabled = false;
|
|
5633
5741
|
button.classList.remove("danger");
|
|
5634
|
-
for (const
|
|
5635
|
-
|
|
5636
|
-
|
|
5637
|
-
|
|
5638
|
-
|
|
5742
|
+
for (const child of [...button.children]) {
|
|
5743
|
+
if (child.tagName && child.tagName.toLowerCase() === "svg") child.remove();
|
|
5744
|
+
}
|
|
5745
|
+
for (const check of button.querySelectorAll('[class*="check"], svg[class*="check"]')) check.remove();
|
|
5746
|
+
replaceMenuItemContent(button, (first.textContent || "").trim(), options.label, channelMarkup(h(IconQueueOutline, { size: 16 })));
|
|
5639
5747
|
if (options.checked) {
|
|
5640
5748
|
const check = document.createElement("span");
|
|
5641
5749
|
check.innerHTML = channelMarkup(h(IconCheckOutline, { size: 16 }));
|
|
@@ -5692,23 +5800,53 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5692
5800
|
}
|
|
5693
5801
|
if (target.closest('[role="menu"]') === null) channelId = undefined;
|
|
5694
5802
|
};
|
|
5695
|
-
const
|
|
5803
|
+
const hiddenElements = new Map();
|
|
5804
|
+
const hideElement = (el) => {
|
|
5805
|
+
if (!el || typeof el.getAttribute !== "function") return;
|
|
5806
|
+
if (!hiddenElements.has(el)) {
|
|
5807
|
+
hiddenElements.set(el, {
|
|
5808
|
+
display: el.style.display || "",
|
|
5809
|
+
ariaHidden: el.getAttribute("aria-hidden"),
|
|
5810
|
+
});
|
|
5811
|
+
}
|
|
5812
|
+
el.style.display = "none";
|
|
5813
|
+
el.setAttribute("aria-hidden", "true");
|
|
5814
|
+
};
|
|
5815
|
+
const purgeDetached = () => {
|
|
5816
|
+
for (const el of hiddenElements.keys()) {
|
|
5817
|
+
if (typeof document.contains === "function" && !document.contains(el)) {
|
|
5818
|
+
hiddenElements.delete(el);
|
|
5819
|
+
}
|
|
5820
|
+
}
|
|
5821
|
+
};
|
|
5696
5822
|
const hideOthers = (menu, ours) => {
|
|
5823
|
+
purgeDetached();
|
|
5697
5824
|
for (const item of menu.querySelectorAll('button[role="menuitem"]')) {
|
|
5698
5825
|
if (ours.has(item)) continue;
|
|
5699
|
-
|
|
5700
|
-
|
|
5701
|
-
|
|
5702
|
-
|
|
5703
|
-
|
|
5826
|
+
hideElement(item);
|
|
5827
|
+
const wrapper = item.parentElement;
|
|
5828
|
+
if (wrapper && wrapper !== menu && wrapper.parentElement === menu) {
|
|
5829
|
+
let containsOurs = false;
|
|
5830
|
+
for (const o of ours) {
|
|
5831
|
+
if (typeof wrapper.contains === "function" && wrapper.contains(o)) {
|
|
5832
|
+
containsOurs = true;
|
|
5833
|
+
break;
|
|
5834
|
+
}
|
|
5835
|
+
}
|
|
5836
|
+
if (!containsOurs) hideElement(wrapper);
|
|
5704
5837
|
}
|
|
5705
|
-
|
|
5706
|
-
|
|
5838
|
+
}
|
|
5839
|
+
for (const sep of menu.querySelectorAll('[role="separator"], hr, [class*="separator"], [class*="divider"]')) {
|
|
5840
|
+
hideElement(sep);
|
|
5707
5841
|
}
|
|
5708
5842
|
};
|
|
5709
5843
|
const inject = (menu) => {
|
|
5710
5844
|
if (channelId === undefined || performance.now() - rememberedAt > 2000) return;
|
|
5711
|
-
|
|
5845
|
+
const existing = menu.querySelector(`button[${CHANNEL_GROUP_MENU_ATTR}="true"]`);
|
|
5846
|
+
if (existing !== null) {
|
|
5847
|
+
hideOthers(menu, new Set([existing]));
|
|
5848
|
+
return;
|
|
5849
|
+
}
|
|
5712
5850
|
const items = [...menu.querySelectorAll('button[role="menuitem"]')];
|
|
5713
5851
|
if (items.length === 0) return;
|
|
5714
5852
|
const menuText = items.map((item) => item.textContent || "").join(" ");
|
|
@@ -5728,15 +5866,15 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5728
5866
|
button.removeAttribute(CHANNEL_GROUP_MENU_ATTR);
|
|
5729
5867
|
button.removeAttribute("aria-disabled");
|
|
5730
5868
|
button.removeAttribute("disabled");
|
|
5869
|
+
button.removeAttribute("aria-keyshortcuts");
|
|
5870
|
+
button.removeAttribute("aria-describedby");
|
|
5731
5871
|
button.disabled = false;
|
|
5732
5872
|
button.style.opacity = "";
|
|
5733
5873
|
button.style.cursor = "";
|
|
5734
5874
|
button.classList.remove("danger");
|
|
5735
5875
|
button.setAttribute(CHANNEL_GROUP_MENU_ATTR, "true");
|
|
5736
|
-
const
|
|
5737
|
-
|
|
5738
|
-
if (spans[1] !== undefined) spans[1].textContent = label;
|
|
5739
|
-
else button.textContent = label;
|
|
5876
|
+
for (const extra of button.querySelectorAll('[class*="check"], [class*="shortcut"]')) extra.remove();
|
|
5877
|
+
replaceMenuItemContent(button, (template.textContent || "").trim(), label, icon);
|
|
5740
5878
|
let fired = false;
|
|
5741
5879
|
const activate = (event) => {
|
|
5742
5880
|
if (fired) return;
|
|
@@ -5777,12 +5915,12 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5777
5915
|
observer.disconnect();
|
|
5778
5916
|
document.removeEventListener("pointerdown", remember, true);
|
|
5779
5917
|
document.removeEventListener("click", remember, true);
|
|
5780
|
-
for (const [
|
|
5781
|
-
|
|
5782
|
-
if (previous.ariaHidden === null)
|
|
5783
|
-
else
|
|
5918
|
+
for (const [el, previous] of hiddenElements) {
|
|
5919
|
+
el.style.display = previous.display;
|
|
5920
|
+
if (previous.ariaHidden === null) el.removeAttribute("aria-hidden");
|
|
5921
|
+
else el.setAttribute("aria-hidden", previous.ariaHidden);
|
|
5784
5922
|
}
|
|
5785
|
-
|
|
5923
|
+
hiddenElements.clear();
|
|
5786
5924
|
for (const item of document.querySelectorAll(`[${CHANNEL_GROUP_MENU_ATTR}="true"]`)) item.parentElement?.remove();
|
|
5787
5925
|
};
|
|
5788
5926
|
}
|
|
@@ -5837,7 +5975,6 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5837
5975
|
const groups = useMemo(() => channelGroupsFromSessionState(sessionSource, t), [membershipRevision, sessionSource, t]);
|
|
5838
5976
|
const groupsRef = useRef(groups);
|
|
5839
5977
|
groupsRef.current = groups;
|
|
5840
|
-
const [channelIcons, setChannelIcons] = useState("");
|
|
5841
5978
|
const [workspaceIcons, setWorkspaceIcons] = useState("");
|
|
5842
5979
|
const open = props.openSession || hostProps.open || hostProps.openSession;
|
|
5843
5980
|
const openChannelSettings = props.openChannelSettings || hostProps.openChannelSettings;
|
|
@@ -5845,10 +5982,6 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5845
5982
|
|
|
5846
5983
|
useEffect(() => { ensureStyle(); }, []);
|
|
5847
5984
|
|
|
5848
|
-
useEffect(() => {
|
|
5849
|
-
if (groupBy === "channel" && channelIcons === "") setChannelIcons(channelIconCss());
|
|
5850
|
-
}, [channelIcons, groupBy]);
|
|
5851
|
-
|
|
5852
5985
|
const memberKey = groups.map((group) => group.id + ":" + (group.sessions || []).map((session) => session.sessionId).join(",")).join("|");
|
|
5853
5986
|
const memberIds = useMemo(() => {
|
|
5854
5987
|
const ids = new Set();
|
|
@@ -5916,7 +6049,11 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5916
6049
|
resolve: (channelId) => groupsRef.current.find((group) => group.id === channelId),
|
|
5917
6050
|
onSettings: (group) => {
|
|
5918
6051
|
if (typeof openChannelSettings === "function") {
|
|
5919
|
-
openChannelSettings({
|
|
6052
|
+
openChannelSettings({
|
|
6053
|
+
channelId: group.platform || group.id,
|
|
6054
|
+
accountId: group.accountId || group.id,
|
|
6055
|
+
name: group.label || channelLabel(group, t),
|
|
6056
|
+
});
|
|
5920
6057
|
return;
|
|
5921
6058
|
}
|
|
5922
6059
|
openImSettings();
|
|
@@ -5984,7 +6121,6 @@ body:not([data-ds-dark-theme]) .ima-section-card{background:var(--dsw-alias-bg-l
|
|
|
5984
6121
|
|
|
5985
6122
|
return h(React.Fragment, null,
|
|
5986
6123
|
h("div", { className: "ima-channel-official", "data-mode": groupBy },
|
|
5987
|
-
groupBy === "channel" && channelIcons !== "" && h("style", null, channelIcons),
|
|
5988
6124
|
groupBy !== "channel" && workspaceIcons !== "" && h("style", null, workspaceIcons),
|
|
5989
6125
|
// 宿主列表失败时 phase 仍停在 pending,没有横幅就是整页空白。
|
|
5990
6126
|
groupsError && h("div", { className: "ima-channel-error", role: "alert" }, t("error.load")),
|
package/lib/manager.d.ts
CHANGED
|
@@ -109,6 +109,15 @@ export interface ChannelView {
|
|
|
109
109
|
online: number;
|
|
110
110
|
total: number;
|
|
111
111
|
}
|
|
112
|
+
export interface ChannelSessionGroup {
|
|
113
|
+
/** 兼容期平台标识(供旧客户端按平台聚合),多账号时平台内各账号实例共享;后续大版本迁移后将统一为 accountId */
|
|
114
|
+
id: string;
|
|
115
|
+
/** 账号唯一实例 ID */
|
|
116
|
+
accountId: string;
|
|
117
|
+
platform: ChannelId;
|
|
118
|
+
label: string;
|
|
119
|
+
sessions: SessionRecord[];
|
|
120
|
+
}
|
|
112
121
|
interface PendingRequest {
|
|
113
122
|
userId: string;
|
|
114
123
|
username?: string;
|
|
@@ -149,11 +158,8 @@ export declare class ChannelManager {
|
|
|
149
158
|
private hydrateProxyUrl;
|
|
150
159
|
private hydrateProxyUrls;
|
|
151
160
|
private accountView;
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
label: string;
|
|
155
|
-
sessions: SessionRecord[];
|
|
156
|
-
}[];
|
|
161
|
+
accountGroupLabel(accountId: string, state: ChannelState | undefined, multiAccount: boolean): string;
|
|
162
|
+
channelSessions(): ChannelSessionGroup[];
|
|
157
163
|
connect(id: ChannelId, config?: Record<string, string>, settings?: Record<string, unknown>): Promise<{
|
|
158
164
|
ok: boolean;
|
|
159
165
|
error?: string;
|
package/lib/manager.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"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"}
|
package/lib/manager.js
CHANGED
|
@@ -331,16 +331,72 @@ export class ChannelManager {
|
|
|
331
331
|
lastCheckedAt: state.lastCheckedAt,
|
|
332
332
|
};
|
|
333
333
|
}
|
|
334
|
+
accountGroupLabel(accountId, state, multiAccount) {
|
|
335
|
+
const platform = this.platformOf(accountId, state);
|
|
336
|
+
const platformLabel = CHANNEL_META[platform]?.label ?? platform;
|
|
337
|
+
if (!multiAccount)
|
|
338
|
+
return platformLabel;
|
|
339
|
+
if (state && typeof this.accountView === 'function') {
|
|
340
|
+
try {
|
|
341
|
+
const view = this.accountView(accountId, state);
|
|
342
|
+
if (!view.autoName && view.name) {
|
|
343
|
+
return `${platformLabel} · ${view.name}`;
|
|
344
|
+
}
|
|
345
|
+
if (view.nameOrdinal) {
|
|
346
|
+
return `${platformLabel} · #${view.nameOrdinal}`;
|
|
347
|
+
}
|
|
348
|
+
}
|
|
349
|
+
catch {
|
|
350
|
+
// fallback below
|
|
351
|
+
}
|
|
352
|
+
}
|
|
353
|
+
const rawName = state?.name?.trim();
|
|
354
|
+
if (rawName)
|
|
355
|
+
return `${platformLabel} · ${rawName}`;
|
|
356
|
+
return `${platformLabel} · ${accountId}`;
|
|
357
|
+
}
|
|
334
358
|
channelSessions() {
|
|
335
|
-
const
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
359
|
+
const channelStore = this.store.channels;
|
|
360
|
+
const platformAccounts = new Map();
|
|
361
|
+
for (const [accountId, state] of Object.entries(channelStore)) {
|
|
362
|
+
const platform = this.platformOf(accountId, state);
|
|
363
|
+
const list = platformAccounts.get(platform) ?? [];
|
|
364
|
+
list.push(accountId);
|
|
365
|
+
platformAccounts.set(platform, list);
|
|
366
|
+
}
|
|
367
|
+
const accountGroups = new Map();
|
|
368
|
+
for (const platform of CHANNEL_ORDER) {
|
|
369
|
+
const accounts = platformAccounts.get(platform) ?? [];
|
|
370
|
+
const isMulti = accounts.length > 1;
|
|
371
|
+
for (const accountId of accounts) {
|
|
372
|
+
const state = channelStore[accountId];
|
|
373
|
+
accountGroups.set(accountId, {
|
|
374
|
+
id: platform,
|
|
375
|
+
accountId,
|
|
376
|
+
platform,
|
|
377
|
+
label: this.accountGroupLabel(accountId, state, isMulti),
|
|
378
|
+
sessions: [],
|
|
379
|
+
});
|
|
380
|
+
}
|
|
381
|
+
}
|
|
340
382
|
for (const item of this.sessions.list()) {
|
|
341
|
-
|
|
383
|
+
const accountId = item.channel;
|
|
384
|
+
let group = accountGroups.get(accountId);
|
|
385
|
+
if (!group) {
|
|
386
|
+
const platform = this.platformOf(accountId, channelStore[accountId]);
|
|
387
|
+
const platformLabel = CHANNEL_META[platform]?.label ?? platform;
|
|
388
|
+
group = {
|
|
389
|
+
id: platform,
|
|
390
|
+
accountId,
|
|
391
|
+
platform,
|
|
392
|
+
label: platformLabel,
|
|
393
|
+
sessions: [],
|
|
394
|
+
};
|
|
395
|
+
accountGroups.set(accountId, group);
|
|
396
|
+
}
|
|
397
|
+
group.sessions.push(item);
|
|
342
398
|
}
|
|
343
|
-
return [...
|
|
399
|
+
return [...accountGroups.values()].filter((group) => group.sessions.length > 0);
|
|
344
400
|
}
|
|
345
401
|
async connect(id, config, settings) {
|
|
346
402
|
if (!CHANNEL_META[id])
|