@nekosuneprojects/vector-sdk 1.0.3 → 1.0.4

package/README.md

@@ -56,22 +56,23 @@ client.on('error', (error) => {
   console.error('Bot error:', error);
 });
 
-client.on('message', async (channel, tags, message, self) => {
+client.on('message', async (senderPubkey, tags, message, self) => {
   if (self) return;
 
-  console.log(`${channel}: ${message}`);
+  const senderName = tags.displayName || senderPubkey;
+  console.log(`${senderName}: ${message}`);
 
   if (message.startsWith('!ping')) {
-    await client.sendMessage(channel, 'pong');
+    await client.sendMessage(senderPubkey, 'pong');
     return;
   }
 
   if (message.startsWith('!upload')) {
     if (!process.env.UPLOAD_FILE_PATH) {
-      await client.sendMessage(channel, 'Set UPLOAD_FILE_PATH to send a file.');
+      await client.sendMessage(senderPubkey, 'Set UPLOAD_FILE_PATH to send a file.');
       return;
     }
-    await client.sendFile(channel, process.env.UPLOAD_FILE_PATH);
+    await client.sendFile(senderPubkey, process.env.UPLOAD_FILE_PATH);
   }
 });
 

package/dist/bot.js

@@ -126,17 +126,19 @@ export class Channel {
     }
     async sendReaction(referenceId, emoji) {
         try {
-            const event = finalizeEvent({
+            const rumor = {
                 kind: kinds.Reaction,
                 created_at: Math.floor(Date.now() / 1000),
                 tags: [
                     ['e', referenceId],
                     ['p', this.recipient],
+                    ['k', kinds.PrivateDirectMessage.toString()],
                     ['ms', (Date.now() % 1000).toString()],
                 ],
                 content: emoji,
-            }, this.baseBot.privateKeyBytes);
-            await this.baseBot.client.publishEvent(event);
+            };
+            const wrapped = nip59.wrapEvent(rumor, this.baseBot.privateKeyBytes, this.recipient);
+            await this.baseBot.client.publishEvent(wrapped);
             return true;
         }
         catch (error) {
@@ -147,17 +149,19 @@ export class Channel {
     async sendTypingIndicator() {
         try {
             const now = Math.floor(Date.now() / 1000);
-            const event = finalizeEvent({
+            const rumor = {
                 kind: kinds.Application,
                 created_at: now,
                 tags: [
                     ['p', this.recipient],
+                    ['d', 'vector'],
                     ['ms', (Date.now() % 1000).toString()],
-                    ['expiration', (now + 3600).toString()],
+                    ['expiration', (now + 30).toString()],
                 ],
                 content: 'typing',
-            }, this.baseBot.privateKeyBytes);
-            await this.baseBot.client.publishEvent(event);
+            };
+            const wrapped = nip59.wrapEvent(rumor, this.baseBot.privateKeyBytes, this.recipient);
+            await this.baseBot.client.publishEvent(wrapped);
             return true;
         }
         catch (error) {

package/dist/client.js

@@ -1,5 +1,6 @@
 import { SimplePool } from 'nostr-tools';
 import { finalizeEvent, getPublicKey } from 'nostr-tools/pure';
+import WebSocket from 'ws';
 import { normalizePrivateKey } from './keys.js';
 const DEFAULT_RELAYS = [
     'wss://jskitty.cat/nostr',
@@ -7,9 +8,15 @@ const DEFAULT_RELAYS = [
     'wss://auth.nostr1.com',
     'wss://nostr.computingcache.com',
 ];
+function ensureWebSocket() {
+    if (typeof globalThis.WebSocket === 'undefined') {
+        globalThis.WebSocket = WebSocket;
+    }
+}
 export class VectorClient {
     constructor(keys, config) {
         this.pool = new SimplePool();
+        ensureWebSocket();
         const normalized = normalizePrivateKey(keys);
         this.privateKey = normalized.hex;
         this.privateKeyBytes = normalized.bytes;

package/dist/demo.js

@@ -170,7 +170,7 @@ export class VectorBotClient extends EventEmitter {
     }
     async emitMessage(bot, pubkey, kind, rawEvent, content, wrapped) {
         const profile = await this.getProfile(bot, pubkey);
-        this.emit('message', profile?.displayName || profile?.name || pubkey, {
+        this.emit('message', pubkey, {
             pubkey,
             kind,
             rawEvent,

package/dist/keys.js

@@ -2,32 +2,43 @@ import { nip19 } from 'nostr-tools';
 import { bytesToHex, hexToBytes } from 'nostr-tools/utils';
 export class KeyFormatError extends Error {
 }
+function stripNostrUriPrefix(value) {
+    const trimmed = value.trim();
+    if (trimmed.toLowerCase().startsWith('nostr:')) {
+        return trimmed.slice('nostr:'.length).trim();
+    }
+    return trimmed;
+}
 export function normalizePrivateKey(privateKey) {
-    const trimmed = privateKey.trim();
-    if (trimmed.startsWith('nsec1')) {
-        const decoded = nip19.decode(trimmed);
+    const trimmed = stripNostrUriPrefix(privateKey);
+    const lowered = trimmed.toLowerCase();
+    if (lowered.startsWith('nsec1')) {
+        const decoded = nip19.decode(lowered);
         if (decoded.type !== 'nsec') {
             throw new KeyFormatError('Invalid nsec private key');
         }
         return { hex: bytesToHex(decoded.data), bytes: decoded.data };
     }
-    if (!/^[0-9a-fA-F]{64}$/.test(trimmed)) {
+    const hexCandidate = lowered.startsWith('0x') ? lowered.slice(2) : lowered;
+    if (!/^[0-9a-f]{64}$/.test(hexCandidate)) {
         throw new KeyFormatError('Private key must be a 32-byte hex string or nsec');
     }
-    const hex = trimmed.toLowerCase();
+    const hex = hexCandidate;
     return { hex, bytes: hexToBytes(hex) };
 }
 export function normalizePublicKey(publicKey) {
-    const trimmed = publicKey.trim();
-    if (trimmed.startsWith('npub1')) {
-        const decoded = nip19.decode(trimmed);
+    const trimmed = stripNostrUriPrefix(publicKey);
+    const lowered = trimmed.toLowerCase();
+    if (lowered.startsWith('npub1')) {
+        const decoded = nip19.decode(lowered);
         if (decoded.type !== 'npub') {
             throw new KeyFormatError('Invalid npub public key');
         }
         return decoded.data;
     }
-    if (!/^[0-9a-fA-F]{64}$/.test(trimmed)) {
+    const hexCandidate = lowered.startsWith('0x') ? lowered.slice(2) : lowered;
+    if (!/^[0-9a-f]{64}$/.test(hexCandidate)) {
         throw new KeyFormatError('Public key must be a 32-byte hex string or npub');
     }
-    return trimmed.toLowerCase();
+    return hexCandidate;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nekosuneprojects/vector-sdk",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Node.js reimplementation of the Vector Bot SDK",
   "type": "module",
   "main": "dist/index.js",
@@ -35,11 +35,13 @@
     "form-data": "^4.0.5",
     "mime-types": "^3.0.2",
     "node-fetch": "^3.3.1",
-    "nostr-tools": "^2.19.4"
+    "nostr-tools": "^2.19.4",
+    "ws": "^8.18.3"
   },
   "devDependencies": {
     "@types/mime-types": "^2.1.4",
     "@types/node": "^20.7.0",
+    "@types/ws": "^8.18.1",
     "typescript": "^5.5.2"
   }
 }