Update/040

.gitignore

@@ -1,6 +1,6 @@
-nostr.s9pk
-image.tar
-scripts/*.js
+*.s9pk
+procedures/*.js
+node_modules/
 .DS_Store
 .vscode/
 docker-images

Makefile

@@ -20,21 +20,27 @@ else
 endif
 
 # for rebuilding just the arm image. will include docker-images/x86_64.tar into the s9pk if it exists
-arm: docker-images/aarch64.tar scripts/embassy.js
+arm: docker-images/aarch64.tar procedures/embassy.js
 	embassy-sdk pack
 
 # for rebuilding just the x86 image. will include docker-images/aarch64.tar into the s9pk if it exists
-x86: docker-images/x86_64.tar scripts/embassy.js
+x86: docker-images/x86_64.tar procedures/embassy.js
 	embassy-sdk pack
 
 clean:
 	rm -rf docker-images
 	rm -f image.tar
 	rm -f $(PKG_ID).s9pk
-	rm -f scripts/*.js
+	rm -f procedures/*.js
 
-scripts/embassy.js: $(TS_FILES)
-	deno bundle scripts/embassy.ts scripts/embassy.js
+procedures/embassy.js: $(TS_FILES)
+	cd procedures && npm run build
+
+check: $(TS_FILES)
+	cd procedures && npm run check
+
+fmt: $(TS_FILES)
+	cd procedures && npm run prettier
 
 docker-images/aarch64.tar: Dockerfile docker_entrypoint.sh
 ifeq ($(ARCH),x86_64)
@@ -50,7 +56,7 @@ else
 	docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --build-arg ARCH=x86_64 --build-arg PLATFORM=amd64 --platform=linux/amd64 -o type=docker,dest=docker-images/x86_64.tar .
 endif
 
-$(PKG_ID).s9pk: manifest.yaml instructions.md icon.png LICENSE scripts/embassy.js docker-images/aarch64.tar docker-images/x86_64.tar
+$(PKG_ID).s9pk: manifest.yaml instructions.md icon.png LICENSE procedures/embassy.js docker-images/aarch64.tar docker-images/x86_64.tar
 ifeq ($(ARCH),aarch64)
 	@echo "embassy-sdk: Preparing aarch64 package ..."
 else ifeq ($(ARCH),x86_64)

README.md

@@ -1,112 +1 @@
-# Wrapper for nostr
-
-This is a nostr relay, written in Rust. It currently supports the entire relay protocol, and persists data with SQLite. This repository creates the `s9pk` package that is installed to run `nostr` on [embassyOS](https://github.com/Start9Labs/embassy-os/). Learn more about service packaging in the [Developer Docs](https://start9.com/latest/developer-docs/).
-
-## Dependencies
-
-Install the system dependencies below to build this project by following the instructions in the provided links. You can also find detailed steps to setup your environment in the service packaging [documentation](https://github.com/Start9Labs/service-pipeline#development-environment).
-
-- [docker](https://docs.docker.com/get-docker)
-- [docker-buildx](https://docs.docker.com/buildx/working-with-buildx/)
-- [yq](https://mikefarah.gitbook.io/yq)
-- [deno](https://deno.land/)
-- [make](https://www.gnu.org/software/make/)
-- [embassy-sdk](https://github.com/Start9Labs/embassy-os/tree/master/backend)
-
-## Build environment
-Prepare your embassyOS build environment. In this example we are using Ubuntu 20.04.
-1. Install docker
-```
-curl -fsSL https://get.docker.com -o- | bash
-sudo usermod -aG docker "$USER"
-exec sudo su -l $USER
-```
-2. Set buildx as the default builder
-```
-docker buildx install
-docker buildx create --use
-```
-3. Enable cross-arch emulated builds in docker
-```
-docker run --privileged --rm linuxkit/binfmt:v0.8
-```
-4. Install yq
-```
-sudo snap install yq
-```
-5. Install deno
-```
-sudo snap install deno
-```
-6. Install essentials build packages
-```
-sudo apt-get install -y build-essential openssl libssl-dev libc6-dev clang libclang-dev ca-certificates
-```
-7. Install Rust
-```
-curl https://sh.rustup.rs -sSf | sh
-# Choose nr 1 (default install)
-source $HOME/.cargo/env
-```
-8. Build and install embassy-sdk
-```
-cd ~/ && git clone --recursive https://github.com/Start9Labs/embassy-os.git
-cd embassy-os/backend/
-./install-sdk.sh
-embassy-sdk init
-```
-Now you are ready to build the `nostr` package!
-
-## Cloning
-
-Clone the project locally:
-
-```
-git clone https://github.com/Start9Labs/nostr-wrapper.git
-cd nostr-wrapper
-```
-
-## Building
-
-To build the `nostr` package for all platforms using embassy-sdk version >=0.3.3, run the following command:
-
-```
-make
-```
-
-To build the `nostr` package for a single platform using embassy-sdk version <=0.3.2, run:
-
-```
-# for amd64
-make ARCH=x86_64
-```
-or
-```
-# for arm64
-make ARCH=aarch64
-```
-
-## Installing (on embassyOS)
-
-Run the following commands to determine successful install:
-> :information_source: Change embassy-server-name.local to your Embassy address
-
-```
-embassy-cli auth login
-# Enter your embassy password
-embassy-cli --host https://embassy-server-name.local package install nostr.s9pk
-```
-
-If you already have your `embassy-cli` config file setup with a default `host`, you can install simply by running:
-
-```
-make install
-```
-
-> **Tip:** You can also install the nostr.s9pk using **Sideload Service** under the **System > Manage** section.
-
-### Verify Install
-
-Go to your Embassy Services page, select **Nostr**, configure and start the service. Then, verify its interfaces are accessible.
-
-**Done!**
+# Wrapper for Nostr RS Relay

instructions.md → assets/instructions.md

@@ -26,7 +26,7 @@ You will not be able to save the config until you follow the instructions below.
 
 ### Running a private relay
 
-Private relays act as a personal backup for your posts, follows, messages,
+Private relays act as a private backup for your posts, follows, messages,
 settings, etc. Without a private relay, there is no guaranteeing these things
 will be saved anywhere, and they could disappear at any time.