conflicts fixed

.env.example

@@ -2,9 +2,11 @@ NODE_ENV=dev
 
 PORT=5420
 
+# Kubo RPC endpoints
 IPFS_NODE_URL=http://host.docker.internal:5001
 PUBLIC_IPFS_RESOLVER=http://host.docker.internal:5002
 
+# Kubo path gateway endpoint
 IPFS_RESOLVER_OVERRIDE=http://host.docker.internal:8089/ipfs
 
 ### Database - Postgres
@@ -161,4 +163,4 @@ ES_DB_USER=
 ES_DB_PASSWORD=
 
 ### open Alex Database - Postgres 
-OPEN_ALEX_DATABASE_URL=postgresql://username:password@host/database?schema=openalex
+OPEN_ALEX_DATABASE_URL=postgresql://username:password@host/database?schema=openalex

.github/workflows/build-and-test.yaml

@@ -9,6 +9,7 @@ on:
       - desci-server/**
       - desci-repo/**
       - desci-contracts/**
+      - sync-server/**
       - Dockerfile
 
 name: Test desci-server
@@ -32,6 +33,12 @@ jobs:
     #   options: --user 1001
 
     steps:
+      - name: Delete huge unnecessary tools folder
+        run: |
+          echo "DISK USE:"; find / -maxdepth 1 -mindepth 1 -type d -exec du -hs {} \; 2>/dev/null
+          rm -rf /opt/hostedtoolcache
+          echo "DISK USE:"; find / -maxdepth 1 -mindepth 1 -type d -exec du -hs {} \; 2>/dev/null
+
       - name: Check out repository
         uses: actions/checkout@v4
 
@@ -49,12 +56,15 @@ jobs:
             desci-repo/yarn.lock
 
       - name: Install dependencies
-        run: cd desci-models && npm i -g yarn && yarn && yarn build && cd ../desci-server && yarn --ignore-engines && cd ../desci-repo && yarn
+        run: |
+          cd desci-models && npm i -g yarn && yarn && yarn build && cd ../desci-server && yarn --ignore-engines && cd ../desci-repo && yarn
+          echo "DISK USE:"; find / -maxdepth 1 -mindepth 1 -type d -exec du -hs {} \; 2>/dev/null
 
       - name: Stub contract
         run: |
           echo "{\"proxies\":[{\"address\":\"\"}]}" > desci-server/src/desci-contracts-config/unknown-research-object.json
           echo "{\"proxies\":[{\"address\":\"\"}]}" > desci-server/src/desci-contracts-config/unknown-dpid.json
+          echo "DISK USE:"; find / -maxdepth 1 -mindepth 1 -type d -exec du -hs {} \; 2>/dev/null
 
       - name: Set up Sentry CLI
         run: |
@@ -65,9 +75,19 @@ jobs:
           echo -e "\nSENTRY_AUTH_TOKEN=$SENTRY_AUTH" >> desci-server/.env
           cd desci-server && yarn build
 
+      - name: Set up sync server
+        run: |
+          cd sync-server && yarn --ignore-engines && ./scripts/build.sh test
+          if [ $? -ne 0 ]; then
+            exit 1
+          fi
+          echo "DISK USE:"; find / -maxdepth 1 -mindepth 1 -type d -exec du -hs {} \; 2>/dev/null
+
       - name: Run tests
         run: |
+          echo "DISK USE:"; find / -maxdepth 1 -mindepth 1 -type d -exec du -hs {} \; 2>/dev/null
           cd desci-server && export DOCKER_BUILDKIT=1 && yarn --ignore-engines && yarn test
           if [ $? -ne 0 ]; then
             exit 1
           fi
+          echo "DISK USE:"; find / -maxdepth 1 -mindepth 1 -type d -exec du -hs {} \; 2>/dev/null

.github/workflows/deploy-sync-server.yaml

@@ -0,0 +1,48 @@
+name: Deploy Worker
+on:
+  pull_request:
+    paths:
+      - .github/workflows/deploy-sync-server.yaml
+      - sync-server/**
+    branches: # array of glob patterns matching against refs/heads. Optional; defaults to all
+      - main # triggers on pushes that contain changes
+      - develop
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+      # - name: Show github ref
+      #   run: |
+      #     echo ${{ github.ref }}
+      #     echo ${{ github.ref_name }}
+      #     echo ${{ github.head_ref }}
+      # - name: Build & Deploy Worker (Dev)
+      #   if: github.head_ref == 'tay/automerge-party-flagged'
+      #   uses: cloudflare/wrangler-action@v3
+      #   with:
+      #     apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+      #     accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+      #     environment: staging
+      #     workingDirectory: sync-server
+      #     wranglerVersion: 3.95.0
+      - name: Build & Deploy Worker (Staging)
+        if: github.ref == 'refs/heads/develop'
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          environment: staging
+          workingDirectory: sync-server
+          wranglerVersion: 3.95.0
+      - name: Build & Deploy Worker (Production)
+        if: github.ref == 'refs/heads/main'
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          environment: production
+          workingDirectory: sync-server
+          wranglerVersion: 3.95.0

.gitignore

@@ -15,6 +15,6 @@ ipfs-data/
 local-data/
 **/node_modules
 .idea
+**/*.iml
 .composedbRuntimeDefinition.json
 openalex-importer
-sync-server

.nvmrc

@@ -1 +1 @@
-20.8.1
+20.18.1

.vscode/settings.json

@@ -43,5 +43,14 @@
   },
   "[sql]": {
     "editor.defaultFormatter": "ms-mssql.mssql"
+  },
+  "[dotenv]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
+  },
+  "[dockerfile]": {
+    "editor.defaultFormatter": "ms-azuretools.vscode-docker"
+  },
+  "[shellscript]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
   }
 }

Dockerfile

@@ -1,10 +1,8 @@
-FROM node:20.8.1-bullseye-slim
+FROM node:20.18.1-bullseye-slim
 
 VOLUME /root/.yarn
 
-RUN apt-get -qy update && apt-get -qy install openssl curl
-
-RUN npm install -g npm@9.8.1
+RUN apt-get -qy update && apt-get -qy install openssl curl socat jq
 
 RUN mkdir /app
 RUN chown -R node:node /app

Makefile

@@ -4,6 +4,8 @@ build: .env desci-contracts/.env
 	$(MAKE) -C desci-contracts build
 	$(MAKE) -C desci-server install
 	$(MAKE) -C desci-repo install
+	$(MAKE) -C sync-server install
+	$(MAKE) -C nodes-lib build
 
 .PHONY: sterile
 sterile: clean-rec