port42-openclaw 0.4.0 → 0.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/connection.d.ts +2 -1
- package/dist/connection.js +10 -4
- package/dist/connection.js.map +1 -1
- package/dist/index.js +15 -3
- package/dist/index.js.map +1 -1
- package/dist/invite.js +3 -1
- package/dist/invite.js.map +1 -1
- package/package.json +1 -1
package/dist/connection.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export interface ConnectionConfig {
|
|
|
8
8
|
displayName: string;
|
|
9
9
|
encryptionKey: string | null;
|
|
10
10
|
token: string | null;
|
|
11
|
+
senderOwner: string | null;
|
|
11
12
|
trigger: 'mention' | 'all';
|
|
12
13
|
onMessage: (senderName: string, content: string, messageId: string) => void;
|
|
13
14
|
onPresence?: (onlineIds: string[]) => void;
|
|
@@ -22,7 +23,7 @@ export declare class Port42Connection {
|
|
|
22
23
|
private shouldReconnect;
|
|
23
24
|
private identified;
|
|
24
25
|
constructor(config: ConnectionConfig);
|
|
25
|
-
connect(): void;
|
|
26
|
+
connect(autoReconnect?: boolean): void;
|
|
26
27
|
disconnect(): void;
|
|
27
28
|
sendResponse(content: string): void;
|
|
28
29
|
sendTyping(isTyping: boolean): void;
|
package/dist/connection.js
CHANGED
|
@@ -20,8 +20,8 @@ class Port42Connection {
|
|
|
20
20
|
constructor(config) {
|
|
21
21
|
this.config = config;
|
|
22
22
|
}
|
|
23
|
-
connect() {
|
|
24
|
-
this.shouldReconnect =
|
|
23
|
+
connect(autoReconnect = true) {
|
|
24
|
+
this.shouldReconnect = autoReconnect;
|
|
25
25
|
this.openSocket();
|
|
26
26
|
}
|
|
27
27
|
disconnect() {
|
|
@@ -41,7 +41,7 @@ class Port42Connection {
|
|
|
41
41
|
content,
|
|
42
42
|
senderName: this.config.displayName,
|
|
43
43
|
senderType: "agent",
|
|
44
|
-
senderOwner:
|
|
44
|
+
senderOwner: this.config.senderOwner,
|
|
45
45
|
replyToId: null,
|
|
46
46
|
};
|
|
47
47
|
const blob = (0, crypto_1.encrypt)(payload, this.config.encryptionKey);
|
|
@@ -84,8 +84,14 @@ class Port42Connection {
|
|
|
84
84
|
console.error('[port42] Failed to parse message:', err);
|
|
85
85
|
}
|
|
86
86
|
});
|
|
87
|
-
this.ws.on('close', () => {
|
|
87
|
+
this.ws.on('close', (code, reason) => {
|
|
88
|
+
const msg = reason?.toString() || '';
|
|
89
|
+
console.log(`[port42] WS closed: code=${code} reason=${msg}`);
|
|
88
90
|
this.identified = false;
|
|
91
|
+
if (msg === 'replaced by new connection') {
|
|
92
|
+
// Another connection with our sender_id took over, don't reconnect
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
89
95
|
this.config.onDisconnected?.();
|
|
90
96
|
this.scheduleReconnect();
|
|
91
97
|
});
|
package/dist/connection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;AAEH,4CAA2B;AAC3B,yCAQoB;AACpB,qCAA4C;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -16,7 +16,8 @@ const node_crypto_1 = require("node:crypto");
|
|
|
16
16
|
let pluginRuntime = null;
|
|
17
17
|
// ── Helpers ──
|
|
18
18
|
function stableSenderId(name) {
|
|
19
|
-
|
|
19
|
+
// Use a unique namespace to avoid collision with Port42 native app companions
|
|
20
|
+
const h = (0, node_crypto_1.createHash)('sha256').update(`openclaw-channel-adapter:${name}`).digest('hex');
|
|
20
21
|
return [h.slice(0, 8), h.slice(8, 12), h.slice(12, 16), h.slice(16, 20), h.slice(20, 32)].join('-');
|
|
21
22
|
}
|
|
22
23
|
function connectAccount(account, onMessage) {
|
|
@@ -24,12 +25,14 @@ function connectAccount(account, onMessage) {
|
|
|
24
25
|
let channelId;
|
|
25
26
|
let encryptionKey = null;
|
|
26
27
|
let token = null;
|
|
28
|
+
let senderOwner = null;
|
|
27
29
|
if (account.invite) {
|
|
28
30
|
const parsed = (0, invite_1.parseInviteLink)(account.invite);
|
|
29
31
|
gateway = account.gateway || parsed.gateway;
|
|
30
32
|
channelId = account.channelId || parsed.channelId;
|
|
31
33
|
encryptionKey = account.encryptionKey || parsed.encryptionKey;
|
|
32
34
|
token = account.token || parsed.token;
|
|
35
|
+
senderOwner = parsed.host;
|
|
33
36
|
}
|
|
34
37
|
else {
|
|
35
38
|
gateway = account.gateway;
|
|
@@ -44,12 +47,13 @@ function connectAccount(account, onMessage) {
|
|
|
44
47
|
displayName: account.displayName,
|
|
45
48
|
encryptionKey,
|
|
46
49
|
token,
|
|
50
|
+
senderOwner,
|
|
47
51
|
trigger: account.trigger || 'mention',
|
|
48
52
|
onMessage: onMessage || (() => { }),
|
|
49
53
|
onConnected: () => console.log(`[port42] Connected as "${account.displayName}"`),
|
|
50
54
|
onDisconnected: () => console.log(`[port42] Disconnected: ${account.accountId}`),
|
|
51
55
|
});
|
|
52
|
-
conn.connect();
|
|
56
|
+
conn.connect(false);
|
|
53
57
|
return conn;
|
|
54
58
|
}
|
|
55
59
|
// ── Active connections (keyed by accountId for outbound lookups) ──
|
|
@@ -114,7 +118,15 @@ const port42Channel = {
|
|
|
114
118
|
gateway: {
|
|
115
119
|
startAccount: async (ctx) => {
|
|
116
120
|
const account = port42Channel.config.resolveAccount(ctx.cfg, ctx.accountId);
|
|
117
|
-
console.log(`[port42] startAccount "${ctx.accountId}"`);
|
|
121
|
+
console.log(`[port42] startAccount "${ctx.accountId}" (existing conn: ${connections.has(ctx.accountId)})`);
|
|
122
|
+
// Disconnect any existing connection for this account
|
|
123
|
+
const existing = connections.get(ctx.accountId);
|
|
124
|
+
if (existing) {
|
|
125
|
+
console.log(`[port42] Cleaning up previous connection for "${ctx.accountId}"`);
|
|
126
|
+
existing.disconnect();
|
|
127
|
+
connections.delete(ctx.accountId);
|
|
128
|
+
await new Promise((r) => setTimeout(r, 2000));
|
|
129
|
+
}
|
|
118
130
|
// Get the channel ID from the invite for routing
|
|
119
131
|
let p42ChannelId = account.channelId;
|
|
120
132
|
if (!p42ChannelId && account.invite) {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/invite.js
CHANGED
|
@@ -14,9 +14,11 @@ function parseInviteLink(invite) {
|
|
|
14
14
|
throw new Error('Invite link missing channel id (id= parameter)');
|
|
15
15
|
}
|
|
16
16
|
const channelName = url.searchParams.get('name') || 'unknown';
|
|
17
|
-
const encryptionKey = url.searchParams.get('key') || null;
|
|
18
17
|
const token = url.searchParams.get('token') || null;
|
|
19
18
|
const host = url.searchParams.get('host') || null;
|
|
19
|
+
// Parse key manually to preserve '+' chars (searchParams decodes + as space)
|
|
20
|
+
const keyMatch = url.search.match(/[?&]key=([^&]+)/);
|
|
21
|
+
const encryptionKey = keyMatch ? decodeURIComponent(keyMatch[1]) : null;
|
|
20
22
|
// Derive WebSocket URL from the HTTPS host
|
|
21
23
|
const protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
|
|
22
24
|
const gateway = `${protocol}//${url.host}/ws`;
|
package/dist/invite.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invite.js","sourceRoot":"","sources":["../src/invite.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAWH,
|
|
1
|
+
{"version":3,"file":"invite.js","sourceRoot":"","sources":["../src/invite.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAWH,0CAqBC;AArBD,SAAgB,eAAe,CAAC,MAAc;IAC5C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IAE5B,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC7C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC;IAC9D,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;IACpD,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;IAElD,6EAA6E;IAC7E,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrD,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAExE,2CAA2C;IAC3C,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;IAC5D,MAAM,OAAO,GAAG,GAAG,QAAQ,KAAK,GAAG,CAAC,IAAI,KAAK,CAAC;IAE9C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACzE,CAAC"}
|
package/package.json
CHANGED