Merge branch 'main' into support_php_85

Author: Sebastix

README.md

@@ -234,12 +234,12 @@ $bech32_public = $key->convertPublicKeyToBech32($public_key);
 $bech32_private = $key->convertPrivateKeyToBech32($private_key);
 ```
 
-## Run tests
+## Run tests with debug output
 
 All tests can be found in `tests`.
 
 ```console
-$ php vendor/bin/phpunit
+$ php vendor/bin/phpunit --debug
 ```
 
 ## Documentation

src/Encryption/Nip44.php

@@ -148,10 +148,10 @@ private static function unpad(string $padded): string
         $unpaddedLen = unpack('n', substr($padded, 0, 2))[1];
         $unpadded = substr($padded, 2, $unpaddedLen);
 
-        if ($unpaddedLen < self::MIN_PLAINTEXT_SIZE ||
-            $unpaddedLen > self::MAX_PLAINTEXT_SIZE ||
-            strlen($unpadded) !== $unpaddedLen ||
-            strlen($padded) !== 2 + self::calcPaddedLen($unpaddedLen)
+        if ($unpaddedLen < self::MIN_PLAINTEXT_SIZE
+            || $unpaddedLen > self::MAX_PLAINTEXT_SIZE
+            || strlen($unpadded) !== $unpaddedLen
+            || strlen($padded) !== 2 + self::calcPaddedLen($unpaddedLen)
         ) {
             throw new Exception('Invalid padding');
         }

src/Examples/vertex-search-profile.php

@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+use swentel\nostr\Event\Event;
+use swentel\nostr\Filter\Filter;
+use swentel\nostr\Key\Key;
+use swentel\nostr\Message\EventMessage;
+use swentel\nostr\Message\RequestMessage;
+use swentel\nostr\Relay\Relay;
+use swentel\nostr\RelayResponse\RelayResponseOk;
+use swentel\nostr\Request\Request;
+use swentel\nostr\Sign\Sign;
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+try {
+    $event = new Event();
+    $event->setKind(5315);
+    $search = 'jack';
+    $sort = 'globalPagerank';
+    $limit = "10";
+    $event->setTags([
+        ['param', 'search', $search],
+        ['param', 'sort', $sort],
+        ['param', 'limit', $limit],
+    ]);
+    /**
+     * You should use a private key here with credits from Vertex.
+     */
+    $private_key = new Key();
+    $private_key = $private_key->generatePrivateKey();
+    $signer = new Sign();
+    $signer->signEvent($event, $private_key);
+    // Send search request event to relay wss://relay.vertexlab.io
+    $relay = new Relay('wss://relay.vertexlab.io');
+    $eventMessage = new EventMessage($event);
+    $relay->setMessage($eventMessage);
+    $request = new Request($relay, $eventMessage);
+    $response = $request->send();
+    foreach ($response as $relayUrl => $relayResponses) {
+        foreach ($relayResponses as $relayResponse) {
+            if ($relayResponse->isSuccess && $relayResponse instanceof RelayResponseOk) {
+                $event_id = $relayResponse->eventId;
+                echo $event_id . PHP_EOL;
+                $relay = new Relay($relayUrl);
+                $filter = new Filter();
+                $filter->setKinds([6315, 7000]);
+                $filter->setTags([
+                    '#e' => [$event_id],
+                ]);
+                $filters = [$filter];
+                $requestMessage = new RequestMessage($event_id, $filters);
+                $request = new Request($relay, $requestMessage);
+                $responses = $request->send();
+                if (empty($responses)) {
+                    throw new \RuntimeException(sprintf('Response from relay %s is empty', $relay->getUrl()));
+                }
+                print_r($responses) . PHP_EOL;
+            }
+        }
+    }
+} catch (Exception $e) {
+    print 'Exception error: ' . $e->getMessage() . PHP_EOL;
+}

src/Nip17/DirectMessage.php

@@ -117,14 +117,14 @@ public static function decryptDirectMessage(
 
         try {
             // Extract the encrypted content from the gift wrap
-            $encryptedContent = method_exists($giftWrap, 'getContent') ?
-                $giftWrap->getContent() :
-                ($giftWrap->content ?? '');
+            $encryptedContent = method_exists($giftWrap, 'getContent')
+                ? $giftWrap->getContent()
+                : ($giftWrap->content ?? '');
 
             // Extract the gift wrap's random public key
-            $giftWrapPubkey = method_exists($giftWrap, 'getPublicKey') ?
-                $giftWrap->getPublicKey() :
-                $giftWrap->pubkey;
+            $giftWrapPubkey = method_exists($giftWrap, 'getPublicKey')
+                ? $giftWrap->getPublicKey()
+                : $giftWrap->pubkey;
 
             // Create the conversation key for the gift wrap layer
             // Gift wrap is encrypted using a conversation key between the recipient and the one-time random pubkey

src/Nip19/Nip19Helper.php

@@ -392,9 +392,9 @@ private function convertEventToBytes(Event $event, TLV $metadata): array
         $relays = Bech32::fromRelaysToBytes(
             $metadata->getRelays() ?? [],
         );
-        $pubkey = $metadata->getAuthor() ?
-            [Bech32::fromHexToBytes($metadata->getAuthor())] :
-            [Bech32::fromHexToBytes($event->getPublicKey())];
+        $pubkey = $metadata->getAuthor()
+            ? [Bech32::fromHexToBytes($metadata->getAuthor())]
+            : [Bech32::fromHexToBytes($event->getPublicKey())];
         $kind = [
             Bech32::fromIntegerToBytes($event->getKind()),
         ];
@@ -421,9 +421,9 @@ private function convertAddressableEventToBytes(Event $event, TLV $metadata): ar
         $relays = Bech32::fromRelaysToBytes(
             $metadata->getRelays() ?? [],
         );
-        $pubkey = $metadata->getAuthor() ?
-            [Bech32::fromHexToBytes($metadata->getAuthor())] :
-            [Bech32::fromHexToBytes($event->getPublicKey())];
+        $pubkey = $metadata->getAuthor()
+            ? [Bech32::fromHexToBytes($metadata->getAuthor())]
+            : [Bech32::fromHexToBytes($event->getPublicKey())];
         $kind = [
             Bech32::fromIntegerToBytes($event->getKind()),
         ];
@@ -437,9 +437,9 @@ private function convertAddressableEventToBytes(Event $event, TLV $metadata): ar
      */
     private function convertProfileToBytes(Profile $profile, TLV $metadata): array
     {
-        $pubkey = $metadata->getAuthor() ?
-            [Bech32::fromHexToBytes($metadata->getAuthor())] :
-            [Bech32::fromHexToBytes($profile->getPublicKey())];
+        $pubkey = $metadata->getAuthor()
+            ? [Bech32::fromHexToBytes($metadata->getAuthor())]
+            : [Bech32::fromHexToBytes($profile->getPublicKey())];
         $relays = Bech32::fromRelaysToBytes(
             $metadata->getRelays() ?? [],
         );

src/Relay/Relay.php

@@ -45,7 +45,7 @@ class Relay implements RelayInterface
      * @param string $url
      *   The socket URL.
      */
-    public function __construct(string $url, MessageInterface|null $message = null)
+    public function __construct(string $url, ?MessageInterface $message = null)
     {
         $this->url = $url;
         $this->validateUrl();

src/Request/Request.php

@@ -105,7 +105,7 @@ public function send(): array
      * @return array|RelayResponse
      * @throws \Throwable
      */
-    private function getResponseFromRelay(Relay $relay): array | RelayResponse
+    private function getResponseFromRelay(Relay $relay): array|RelayResponse
     {
         $client = $relay->getClient();
         $client->setTimeout(60);

src/Sign/Sign.php

@@ -50,8 +50,8 @@ public function signEvent(EventInterface $event, string $private_key): void
      */
     public static function serializeEvent(EventInterface $event): bool|string
     {
-        $array =
-        [
+        $array
+        = [
             0,
             $event->getPublicKey(),
             $event->getCreatedAt(),

tests/RelayListMetadataTest.php

@@ -11,7 +11,6 @@
 class RelayListMetadataTest extends TestCase
 {
     private const TEST_PUBKEY = '884704bd421721e292edbec8466287dd3a3c834c2ed269822b95a85e4f8a0c47';
-    private const TEST_RELAY_URL = 'wss://purplepag.es';
 
     /**
      * Test that the kind number cannot be changed from 10002.