Merge pull request #17 from hoytech/master

[pull] master from hoytech:master

.github/workflows/ubuntu.yml

@@ -16,8 +16,7 @@ jobs:
         run: |
           sudo apt update && sudo apt install -y --no-install-recommends \
           git g++ make pkg-config libtool ca-certificates \
-          libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev \
-          liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
+          libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
           git submodule update --init
           make setup-golpe
           make -j4

Dockerfile

@@ -13,17 +13,13 @@ RUN \
     pkgconfig \
     libtool \
     ca-certificates \
-    perl-yaml \
-    perl-template-toolkit \
-    perl-app-cpanminus \
     libressl-dev \
     zlib-dev \
     lmdb-dev \
     flatbuffers-dev \
     libsecp256k1-dev \
     zstd-dev \
   && rm -rf /var/cache/apk/* \
-  && cpanm Regexp::Grammars \
   && git submodule update --init \
   && make setup-golpe \
   && make clean \

Makefile

@@ -8,6 +8,6 @@ LDLIBS += -lsecp256k1 -lzstd
 INCS += -Iexternal/negentropy/cpp
 
 build/StrfryTemplates.h: $(shell find src/tmpls/ -type f -name '*.tmpl')
-	perl golpe/external/templar/templar.pl src/tmpls/ strfrytmpl $@
+	PERL5LIB=golpe/vendor/ perl golpe/external/templar/templar.pl src/tmpls/ strfrytmpl $@
 
 src/apps/relay/RelayWebsocket.o: build/StrfryTemplates.h

README.md

@@ -31,15 +31,15 @@ A C++20 compiler is required, along with a few other common dependencies. On Deb
 
 #### Linux
 
-    sudo apt install -y git build-essential libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
+    sudo apt install -y git g++ make libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
     git clone https://github.com/hoytech/strfry && cd strfry/
     git submodule update --init
     make setup-golpe
     make -j4
 
 #### FreeBSD
 
-    pkg install -y gcc gmake cmake git perl5 openssl lmdb flatbuffers libuv libinotify zstr secp256k1 zlib-ng p5-Regexp-Grammars p5-Module-Install-Template p5-YAML
+    pkg install -y gcc gmake cmake git perl5 openssl lmdb flatbuffers libuv libinotify zstr secp256k1 zlib-ng
     git clone https://github.com/hoytech/strfry && cd strfry/
     git submodule update --init
     gmake setup-golpe

arch.Dockerfile

@@ -14,14 +14,9 @@ RUN pacman -Syu --noconfirm
 RUN pacman -S --noconfirm \
 # build essentials
   base-devel git \
-# perl stuff
-  cpanminus perl-template-toolkit perl-yaml \
 # flatbuffers, lmdb, libsecp256k1
   flatbuffers lmdb libsecp256k1
 
-# necessary perl pod
-RUN /usr/bin/vendor_perl/cpanm Regexp::Grammars
-
 # update submodules
 RUN git submodule update --init 
 

golpe.yaml

@@ -1,7 +1,13 @@
 appName: strfry
-onAppStartup: true
-useGlobalH: true
-customLMDBSetup: true
+features:
+    ssl: true
+    config: true
+    onAppStartup: true
+    db: true
+    customLMDBSetup: true
+    flatbuffers: true
+    websockets: true
+    templar: true
 
 flatBuffers: |
     include "../fbs/nostr-index.fbs";

shell.nix

@@ -2,7 +2,6 @@
 with pkgs;
 mkShell {
   buildInputs = [ 
-    perl perlPackages.YAML perlPackages.TemplateToolkit perlPackages.RegexpGrammars
-    lmdb zstd secp256k1 flatbuffers zlib openssl libuv
+    perl lmdb zstd secp256k1 flatbuffers zlib openssl libuv
   ];
 }

src/apps/relay/RelayIngester.cpp

@@ -92,6 +92,17 @@ void RelayServer::ingesterProcessEvent(lmdb::txn &txn, uint64_t connId, std::str
 
     auto *flat = flatbuffers::GetRoot<NostrIndex::Event>(flatStr.data());
 
+    {
+        for (const auto &tagArr : origJson.at("tags").get_array()) {
+            auto tag = tagArr.get_array();
+            if (tag.size() == 1 && tag.at(0).get_string() == "-") {
+                LI << "Protected event, skipping";
+                sendOKResponse(connId, to_hex(sv(flat->id())), false, "blocked: event marked as protected");
+                return;
+            }
+        }
+    }
+
     {
         auto existing = lookupEventById(txn, sv(flat->id()));
         if (existing) {

src/apps/relay/RelayWebsocket.cpp

@@ -48,20 +48,26 @@ void RelayServer::runWebsocket(ThreadPool<MsgWebsocket>::Thread &thr) {
     tempBuf.reserve(cfg().events__maxEventSize + MAX_SUBID_SIZE + 100);
 
 
-    tao::json::value supportedNips = tao::json::value::array({ 1, 2, 4, 9, 11, 12, 16, 20, 22, 28, 33, 40 });
+    tao::json::value supportedNips = tao::json::value::array({ 1, 2, 4, 9, 11, 20, 22, 28, 40, 70 });
 
     auto getServerInfoHttpResponse = [&supportedNips, ver = uint64_t(0), rendered = std::string("")]() mutable {
         if (ver != cfg().version()) {
             tao::json::value nip11 = tao::json::value({
                 { "supported_nips", supportedNips },
                 { "software", "git+https://github.com/hoytech/strfry.git" },
                 { "version", APP_GIT_VERSION },
+                { "limitation", tao::json::value({
+                    { "max_message_length", cfg().relay__maxWebsocketPayloadSize },
+                    { "max_subscriptions", cfg().relay__maxSubsPerConnection },
+                    { "max_limit", cfg().relay__maxFilterLimit },
+                }) },
             });
 
             if (cfg().relay__info__name.size()) nip11["name"] = cfg().relay__info__name;
             if (cfg().relay__info__description.size()) nip11["description"] = cfg().relay__info__description;
             if (cfg().relay__info__contact.size()) nip11["contact"] = cfg().relay__info__contact;
             if (cfg().relay__info__pubkey.size()) nip11["pubkey"] = cfg().relay__info__pubkey;
+            if (cfg().relay__info__icon.size()) nip11["icon"] = cfg().relay__info__icon;
 
             rendered = preGenerateHttpResponse("application/json", tao::json::to_string(nip11));
             ver = cfg().version();

src/apps/relay/golpe.yaml

@@ -27,6 +27,9 @@ config:
   - name: relay__info__contact
     desc: "NIP-11: Alternative administrative contact (email, website, etc)"
     default: ""
+  - name: relay__info__icon
+    desc: "NIP-11: URL pointing to an image to be used as an icon for the relay"
+    default: ""
 
   - name: relay__maxWebsocketPayloadSize
     desc: "Maximum accepted incoming websocket frame size (should be larger than max event)"

src/onAppStartup.cpp

@@ -22,20 +22,6 @@ static void dbCheck(lmdb::txn &txn, const std::string &cmd) {
     auto s = env.lookup_Meta(txn, 1);
 
     if (!s) {
-        {
-            // The first version of the DB didn't use a Meta entry -- we consider this version 0
-
-            bool eventFound = false;
-
-            env.foreach_Event(txn, [&](auto &ev){
-                eventFound = true;
-                return false;
-            });
-
-            if (cmd == "export" || cmd == "info") return;
-            if (eventFound) dbTooOld(0);
-        }
-
         env.insert_Meta(txn, CURR_DB_VERSION, 1);
         return;
     }

strfry.conf

@@ -64,6 +64,9 @@ relay {
 
         # NIP-11: Alternative administrative contact (email, website, etc)
         contact = ""
+
+        # NIP-11: URL pointing to an image to be used as an icon for the relay
+        icon = ""
     }
 
     # Maximum accepted incoming websocket frame size (should be larger than max event) (restart required)

ubuntu.Dockerfile

@@ -9,9 +9,8 @@ ARG DEBCONF_NONINTERACTIVE_SEEN true
 RUN apt-get update && apt-get -y upgrade && \
     apt-get --no-install-recommends -y install \
     git g++ make pkg-config libtool ca-certificates \
-    libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev \
-    liblmdb-dev libflatbuffers-dev libsecp256k1-dev \
-    libzstd-dev
+    libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev \
+    libsecp256k1-dev libzstd-dev
 
 COPY . .
 RUN git submodule update --init