@narumitw/pi-chat 0.1.5 → 0.1.7
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/README.md +47 -64
- package/dist/chunks/{chat-view-EZ24L3LM.js → chat-view-7OBZGYZM.ts} +2 -2
- package/dist/chunks/chat-view-7OBZGYZM.ts.map +7 -0
- package/dist/chunks/{chunk-ZR2JESR5.js → chunk-7FD7DDSU.ts} +6 -36
- package/dist/chunks/chunk-7FD7DDSU.ts.map +7 -0
- package/dist/chunks/{chunk-XYZZR6DW.js → chunk-EOZIFFAD.ts} +6 -23
- package/dist/chunks/chunk-EOZIFFAD.ts.map +7 -0
- package/dist/chunks/{chunk-UE3UAOJX.js → chunk-LN3NAZRC.ts} +1 -1
- package/dist/chunks/{chunk-UE3UAOJX.js.map → chunk-LN3NAZRC.ts.map} +1 -1
- package/dist/chunks/{chunk-OQLAKS7O.js → chunk-MHSYNYS3.ts} +4 -7
- package/dist/chunks/chunk-MHSYNYS3.ts.map +7 -0
- package/dist/chunks/{chunk-UQPD3L6X.js → chunk-WUCSLYAK.ts} +1 -1
- package/dist/chunks/chunk-WUCSLYAK.ts.map +7 -0
- package/dist/chunks/{directory-network-EWFZFLGK.js → directory-network-6OPGA4EH.ts} +7 -19
- package/dist/chunks/directory-network-6OPGA4EH.ts.map +7 -0
- package/dist/chunks/{menu-2XYZAYXF.js → menu-S7MZCVYM.ts} +7 -7
- package/dist/chunks/menu-S7MZCVYM.ts.map +7 -0
- package/dist/chunks/{network-MXCIGGQ2.js → network-Y4Z4JJ5J.ts} +3 -3
- package/dist/chunks/network-Y4Z4JJ5J.ts.map +7 -0
- package/dist/chunks/{widget-4OBABJDY.js → widget-QT53EBN6.ts} +4 -10
- package/dist/chunks/widget-QT53EBN6.ts.map +7 -0
- package/dist/index.ts +21 -69
- package/dist/index.ts.map +2 -2
- package/package.json +54 -58
- package/src/chat-session.ts +571 -594
- package/src/chat-view.ts +221 -226
- package/src/directory-network.ts +347 -365
- package/src/external.d.ts +56 -66
- package/src/identity.ts +74 -88
- package/src/menu.ts +535 -541
- package/src/network-contract.ts +5 -5
- package/src/network.ts +154 -157
- package/src/nickname.ts +6 -6
- package/src/pi-chat.ts +700 -777
- package/src/protocol.ts +296 -335
- package/src/public-room-directory.ts +276 -310
- package/src/room.ts +54 -58
- package/src/settings.ts +234 -259
- package/src/text.ts +57 -57
- package/src/widget.ts +56 -72
- package/dist/chunks/chat-view-EZ24L3LM.js.map +0 -7
- package/dist/chunks/chunk-OQLAKS7O.js.map +0 -7
- package/dist/chunks/chunk-UQPD3L6X.js.map +0 -7
- package/dist/chunks/chunk-XYZZR6DW.js.map +0 -7
- package/dist/chunks/chunk-ZR2JESR5.js.map +0 -7
- package/dist/chunks/directory-network-EWFZFLGK.js.map +0 -7
- package/dist/chunks/menu-2XYZAYXF.js.map +0 -7
- package/dist/chunks/network-MXCIGGQ2.js.map +0 -7
- package/dist/chunks/widget-4OBABJDY.js.map +0 -7
package/src/network-contract.ts
CHANGED
|
@@ -4,9 +4,9 @@ import type { RoomDescriptor } from "./room.js";
|
|
|
4
4
|
export const MAX_DIRECT_NEIGHBORS = 8;
|
|
5
5
|
|
|
6
6
|
export interface HyperswarmTransportOptions {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
7
|
+
room: RoomDescriptor;
|
|
8
|
+
identity: ChatIdentity;
|
|
9
|
+
maxPeers?: number;
|
|
10
|
+
dht?: unknown;
|
|
11
|
+
bootstrap?: unknown[];
|
|
12
12
|
}
|
package/src/network.ts
CHANGED
|
@@ -7,183 +7,180 @@ import { encodeFrame, FrameDecoder, type ProtocolMessage } from "./protocol.js";
|
|
|
7
7
|
export type { HyperswarmTransportOptions } from "./network-contract.js";
|
|
8
8
|
|
|
9
9
|
interface ActiveConnection {
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
socket: Duplex;
|
|
11
|
+
peer: TransportPeer;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
export { MAX_DIRECT_NEIGHBORS } from "./network-contract.js";
|
|
15
15
|
|
|
16
16
|
export function directNeighborLimit(requested?: number): number {
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
if (!Number.isSafeInteger(requested) || (requested ?? 0) <= 0) return MAX_DIRECT_NEIGHBORS;
|
|
18
|
+
return Math.min(requested ?? MAX_DIRECT_NEIGHBORS, MAX_DIRECT_NEIGHBORS);
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
export class HyperswarmTransport implements ChatTransport {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
22
|
+
private readonly options: HyperswarmTransportOptions;
|
|
23
|
+
private swarm: Hyperswarm | undefined;
|
|
24
|
+
private discovery: PeerDiscovery | undefined;
|
|
25
|
+
private listener: ChatTransportListener | undefined;
|
|
26
|
+
private readonly connections = new Map<Duplex, ActiveConnection>();
|
|
27
|
+
private readonly refreshTimers = new Set<NodeJS.Timeout>();
|
|
28
|
+
private stopPromise: Promise<void> | undefined;
|
|
29
29
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
constructor(options: HyperswarmTransportOptions) {
|
|
31
|
+
this.options = options;
|
|
32
|
+
}
|
|
33
33
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
34
|
+
get connectionCount(): number {
|
|
35
|
+
return this.connections.size;
|
|
36
|
+
}
|
|
37
37
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
get connectedPeerKeys(): string[] {
|
|
39
|
+
return [...this.connections.values()].map(({ peer }) => peer.publicKey.toString("hex")).sort();
|
|
40
|
+
}
|
|
41
41
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
}
|
|
76
|
-
}
|
|
42
|
+
async start(listener: ChatTransportListener, signal?: AbortSignal): Promise<void> {
|
|
43
|
+
if (this.swarm) throw new Error("Hyperswarm transport has already started.");
|
|
44
|
+
const startupSignal = signal ? AbortSignal.any([signal, AbortSignal.timeout(15_000)]) : AbortSignal.timeout(15_000);
|
|
45
|
+
startupSignal.throwIfAborted();
|
|
46
|
+
this.listener = listener;
|
|
47
|
+
const maxPeers = directNeighborLimit(this.options.maxPeers);
|
|
48
|
+
const swarm = new Hyperswarm({
|
|
49
|
+
keyPair: {
|
|
50
|
+
publicKey: this.options.identity.publicKey,
|
|
51
|
+
secretKey: this.options.identity.secretKey,
|
|
52
|
+
},
|
|
53
|
+
maxPeers,
|
|
54
|
+
...(this.options.dht ? { dht: this.options.dht } : {}),
|
|
55
|
+
...(this.options.bootstrap ? { bootstrap: this.options.bootstrap } : {}),
|
|
56
|
+
});
|
|
57
|
+
this.swarm = swarm;
|
|
58
|
+
swarm.on("connection", (socket, info) => this.accept(socket, info));
|
|
59
|
+
swarm.on("error", (error) => this.listener?.onError(safeNetworkError(error)));
|
|
60
|
+
try {
|
|
61
|
+
const discovery = swarm.join(this.options.room.topic, {
|
|
62
|
+
server: true,
|
|
63
|
+
client: true,
|
|
64
|
+
limit: maxPeers,
|
|
65
|
+
});
|
|
66
|
+
this.discovery = discovery;
|
|
67
|
+
await raceAbort(discovery.flushed(), startupSignal);
|
|
68
|
+
startupSignal.throwIfAborted();
|
|
69
|
+
this.scheduleEarlyRefreshes(discovery);
|
|
70
|
+
} catch (error) {
|
|
71
|
+
await this.stop();
|
|
72
|
+
throw error;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
77
75
|
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
76
|
+
stop(): Promise<void> {
|
|
77
|
+
if (this.stopPromise) return this.stopPromise;
|
|
78
|
+
this.stopPromise = this.stopOwned();
|
|
79
|
+
return this.stopPromise;
|
|
80
|
+
}
|
|
83
81
|
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
82
|
+
private scheduleEarlyRefreshes(discovery: PeerDiscovery): void {
|
|
83
|
+
const delays = [250, 750, 1_500, 3_000, 6_000, 12_000];
|
|
84
|
+
const schedule = (index: number): void => {
|
|
85
|
+
const delayMs = delays[index];
|
|
86
|
+
if (delayMs === undefined || this.discovery !== discovery) return;
|
|
87
|
+
const timer = setTimeout(() => {
|
|
88
|
+
this.refreshTimers.delete(timer);
|
|
89
|
+
if (this.discovery !== discovery) return;
|
|
90
|
+
void discovery
|
|
91
|
+
.refresh()
|
|
92
|
+
.catch(() => undefined)
|
|
93
|
+
.finally(() => {
|
|
94
|
+
if (this.discovery === discovery) schedule(index + 1);
|
|
95
|
+
});
|
|
96
|
+
}, delayMs);
|
|
97
|
+
this.refreshTimers.add(timer);
|
|
98
|
+
};
|
|
99
|
+
schedule(0);
|
|
100
|
+
}
|
|
103
101
|
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
102
|
+
private accept(socket: Duplex, info: PeerInfo): void {
|
|
103
|
+
if (!this.swarm || !this.listener || this.connections.size >= MAX_DIRECT_NEIGHBORS) {
|
|
104
|
+
socket.destroy();
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
const decoder = new FrameDecoder();
|
|
108
|
+
let closed = false;
|
|
109
|
+
const peer: TransportPeer = {
|
|
110
|
+
publicKey: Buffer.from(info.publicKey),
|
|
111
|
+
send(message: ProtocolMessage) {
|
|
112
|
+
if (closed || socket.destroyed) throw new Error("Peer connection is closed.");
|
|
113
|
+
const accepted = socket.write(encodeFrame(message));
|
|
114
|
+
if (!accepted && socket.destroyed) throw new Error("Peer connection rejected the message.");
|
|
115
|
+
},
|
|
116
|
+
close() {
|
|
117
|
+
if (closed) return;
|
|
118
|
+
closed = true;
|
|
119
|
+
socket.destroy();
|
|
120
|
+
},
|
|
121
|
+
};
|
|
122
|
+
this.connections.set(socket, { socket, peer });
|
|
123
|
+
this.listener.onPeer(peer);
|
|
124
|
+
socket.on("data", (chunk: unknown) => {
|
|
125
|
+
if (closed || !this.listener) return;
|
|
126
|
+
try {
|
|
127
|
+
const bytes =
|
|
128
|
+
typeof chunk === "string"
|
|
129
|
+
? Buffer.from(chunk)
|
|
130
|
+
: Buffer.isBuffer(chunk)
|
|
131
|
+
? chunk
|
|
132
|
+
: Buffer.from(chunk as Uint8Array);
|
|
133
|
+
for (const message of decoder.push(bytes)) this.listener.onMessage(peer, message);
|
|
134
|
+
} catch {
|
|
135
|
+
closed = true;
|
|
136
|
+
socket.destroy();
|
|
137
|
+
this.listener?.onError(new Error("Pi Chat rejected invalid peer protocol data."));
|
|
138
|
+
}
|
|
139
|
+
});
|
|
140
|
+
const disconnected = () => {
|
|
141
|
+
if (!this.connections.delete(socket)) return;
|
|
142
|
+
closed = true;
|
|
143
|
+
this.listener?.onDisconnect(peer);
|
|
144
|
+
};
|
|
145
|
+
socket.once("close", disconnected);
|
|
146
|
+
socket.once("error", (error) => {
|
|
147
|
+
this.listener?.onError(safeNetworkError(error));
|
|
148
|
+
disconnected();
|
|
149
|
+
});
|
|
150
|
+
}
|
|
153
151
|
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
152
|
+
private async stopOwned(): Promise<void> {
|
|
153
|
+
for (const timer of this.refreshTimers) clearTimeout(timer);
|
|
154
|
+
this.refreshTimers.clear();
|
|
155
|
+
const discovery = this.discovery;
|
|
156
|
+
this.discovery = undefined;
|
|
157
|
+
if (discovery) await discovery.destroy().catch(() => undefined);
|
|
158
|
+
for (const { socket } of this.connections.values()) socket.destroy();
|
|
159
|
+
this.connections.clear();
|
|
160
|
+
const swarm = this.swarm;
|
|
161
|
+
this.swarm = undefined;
|
|
162
|
+
this.listener = undefined;
|
|
163
|
+
if (swarm) await swarm.destroy().catch(() => undefined);
|
|
164
|
+
}
|
|
167
165
|
}
|
|
168
166
|
|
|
169
167
|
async function raceAbort<T>(operation: Promise<T>, signal?: AbortSignal): Promise<T> {
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
168
|
+
if (!signal) return operation;
|
|
169
|
+
signal.throwIfAborted();
|
|
170
|
+
let remove = () => {};
|
|
171
|
+
const aborted = new Promise<never>((_resolve, reject) => {
|
|
172
|
+
const onAbort = () => reject(signal.reason ?? new DOMException("Aborted", "AbortError"));
|
|
173
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
174
|
+
remove = () => signal.removeEventListener("abort", onAbort);
|
|
175
|
+
});
|
|
176
|
+
try {
|
|
177
|
+
return await Promise.race([operation, aborted]);
|
|
178
|
+
} finally {
|
|
179
|
+
remove();
|
|
180
|
+
}
|
|
183
181
|
}
|
|
184
182
|
|
|
185
183
|
function safeNetworkError(error: unknown): Error {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
return new Error(`Pi Chat network ${code}.`);
|
|
184
|
+
const code = error instanceof Error && "code" in error ? String(Reflect.get(error, "code")) : "error";
|
|
185
|
+
return new Error(`Pi Chat network ${code}.`);
|
|
189
186
|
}
|
package/src/nickname.ts
CHANGED
|
@@ -2,10 +2,10 @@ const MAX_NICKNAME_GRAPHEMES = 24;
|
|
|
2
2
|
const BIDI_CONTROLS = /[\u061c\u200e\u200f\u202a-\u202e\u2066-\u2069]/u;
|
|
3
3
|
|
|
4
4
|
export function normalizeNickname(value: unknown): string | undefined {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
5
|
+
if (typeof value !== "string") return undefined;
|
|
6
|
+
const normalized = value.normalize("NFKC").trim();
|
|
7
|
+
if (!normalized || /\p{Cc}/u.test(normalized) || BIDI_CONTROLS.test(normalized)) return undefined;
|
|
8
|
+
const segmenter = new Intl.Segmenter(undefined, { granularity: "grapheme" });
|
|
9
|
+
if (Array.from(segmenter.segment(normalized)).length > MAX_NICKNAME_GRAPHEMES) return undefined;
|
|
10
|
+
return normalized;
|
|
11
11
|
}
|