Testing

.github/workflows/deploy.yml

@@ -36,7 +36,7 @@ jobs:
                   chmod 600 ./ssh-key
             - name: Create .env file
               env:
-                  TARGET_HOST: ${{ vars.HOST_DOMAIN }}
+                  TARGET_HOST: ${{ vars.HOST_DOMAIN}}
                   TARGET_IP: ${{ vars.HOST_IP }}
               run: |
                   echo "REACT_APP_ADDR_ENS_SUBDOMAIN=${{ vars.ADDR_ENS_SUBDOMAIN }}" >> ./.env.react
@@ -57,7 +57,7 @@ jobs:
                   echo "REACT_APP_CHAIN_ID=${{ vars.CHAIN_ID }}" >> ./.env.react
                   echo "REACT_APP_GENOME_REGISTRY_ADDRESS=${{ vars.GENOME_REGISTRY_ADDRESS }}" >> ./.env.react
                   cat ./.env.react >> ./.env
-                  echo "RESOLVER_ADDR=${{ vars.ERC3668_RESOLVER_ADDRESS }}" >> ./.env
+                  echo "RESOLVER_ADDRESS=${{ vars.ERC3668_RESOLVER_ADDRESS }}" >> ./.env
                   echo "SIGNING_PUBLIC_KEY=${{ secrets.SIGNING_PUBLIC_KEY }}" >> ./.env
                   echo "SIGNING_PRIVATE_KEY=${{ secrets.SIGNING_PRIVATE_KEY }}" >> ./.env
                   echo "SIGNER_PRIVATE_KEY=${{ secrets.SIGNER_PRIVATE_KEY }}" >> ./.env
@@ -106,10 +106,10 @@ jobs:
                     --tag dm3org/$image_name:$version${{ env.docker_suffix }}.${{ env.unix_now }}.${{ env.sha_short }}  .
                   docker save -o ./$image_name.tar $image_name:latest
                   docker push --all-tags dm3org/$image_name
-            - name: Build offchain-resolver docker image
+            - name: Build and publish offchain-resolver docker image
               shell: bash
               run: |
-                  version=$(NODE_PATH=packages/delivery-service node -p "require('package.json').version")
+                  version=$(NODE_PATH=packages/offchain-resolver node -p "require('package.json').version")
                   image_name=dm3-offchain-resolver
                   docker build --progress=plain -f ./docker/DockerfilePackages --build-arg="PACKAGE=offchain-resolver" \
                     --tag $image_name:latest \
@@ -142,11 +142,17 @@ jobs:
                   ssh -i ./ssh-key app@${{ vars.HOST_DOMAIN }} "\
                   cd dm3 && ls |grep -E 'dm3-.*tar' | xargs --no-run-if-empty -L 1 docker load -i; \
                   rm dm3-*.tar || true"
+            - name: Reset state of testing environment
+              run: |
+                  if [ $environment_name == "testing" ]; then
+                      ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\
+                      cd /mnt/dm3_prod_volume/db && rm -r * || true"
+                  fi
             - name: Configure Firewall
               run: |
                   ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\
-                  ufw allow from 172.18.0.1/16 proto tcp to ${{ vars.HOST_IP}} port 80; 
-                  ufw allow from 172.18.0.1/16 proto tcp to ${{ secrets.IP_ADDRESS }} port 443;
+                  ufw allow from 172.18.0.1/16 proto tcp to ${{ vars.HOST_IP }} port 80; 
+                  ufw allow from 172.18.0.1/16 proto tcp to ${{ vars.HOST_IP }} port 443;
                   ufw enable"
             - name: Start docker on server
               run: |

.github/workflows/resetStagingState.yml

@@ -0,0 +1,22 @@
+name: deploy
+on: workflow_dispatch
+
+jobs:
+    reset-staging-state:
+        environment: 'staging'
+        runs-on: ubuntu-latest
+        steps:
+            - name: Stop docker on server
+              run: |
+                  ssh -i ./ssh-key app@${{ vars.HOST_DOMAIN }} "\
+                  cd dm3 && docker compose down"
+                  ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\
+                  systemctl restart docker.service"
+            - name: Reset state of staging environment
+              run: |
+                  ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\
+                  cd /mnt/dm3_prod_volume/db && rm -r * || true"
+            - name: Start docker on server
+              run: |
+                  ssh -i ./ssh-key app@${{ vars.HOST_DOMAIN }} "\
+                  cd dm3 && docker compose --env-file .env up -d && docker system prune -af"

docker/docker-compose.yml

@@ -112,7 +112,7 @@ services:
             REACT_APP_USER_ENS_SUBDOMAIN: ${REACT_APP_USER_ENS_SUBDOMAIN}
             REACT_APP_WALLET_CONNECT_PROJECT_ID: ${REACT_APP_WALLET_CONNECT_PROJECT_ID}
             REACT_APP_GENOME_REGISTRY_ADDRESS: ${REACT_APP_GENOME_REGISTRY_ADDRESS}
-            RESOLVER_ADDR: ${RESOLVER_ADDR}
+            RESOLVER_ADDRESS: ${RESOLVER_ADDRESS}
 
     certbot:
         image: certbot/certbot

packages/backend/src/storage.ts

@@ -216,6 +216,8 @@ export default (
         try {
             const ensName = normalizeEnsName(req.params.ensName);
 
+            console.log('getConversations query', req.query);
+
             const pageSize =
                 parseInt(req.query.pageSize as string) ||
                 DEFAULT_CONVERSATION_PAGE_SIZE;
@@ -231,6 +233,8 @@ export default (
                 return;
             }
 
+            console.log('fetch conversations', pageSize, offset);
+
             const conversations = await db.getConversationList(
                 ensName,
                 pageSize,

packages/lib/shared/src/IBackendConnector.ts

@@ -1,6 +1,10 @@
 export interface IBackendConnector {
     addConversation(ensName: string, encryptedContactName: string): void;
-    getConversations(ensName: string): Promise<string[]>;
+    getConversations(
+        ensName: string,
+        size: number,
+        offset: number,
+    ): Promise<string[]>;
     toggleHideConversation(
         ensName: string,
         encryptedContactName: string,

packages/lib/storage/src/new/cloudStorage/getCloudStorage.ts

@@ -17,9 +17,11 @@ export const getCloudStorage = (
         );
     };
 
-    const getConversationList = async (page: number) => {
+    const getConversations = async (size: number, offset: number) => {
         const encryptedConversations = await backendConnector.getConversations(
             ensName,
+            size,
+            offset,
         );
 
         return await Promise.all(
@@ -174,7 +176,7 @@ export const getCloudStorage = (
 
     return {
         addConversation: _addConversation,
-        getConversationList,
+        getConversations,
         getMessages,
         addMessage: _addMessage,
         addMessageBatch: _addMessageBatch,

packages/lib/storage/src/new/types.ts

@@ -1,7 +1,7 @@
 import { Envelop, MessageState } from '@dm3-org/dm3-lib-messaging';
 
 export interface StorageAPI {
-    getConversationList: (page: number) => Promise<Conversation[]>;
+    getConversations: (size: number, offset: number) => Promise<Conversation[]>;
     getMessages: (
         contactEnsName: string,
         page: number,

packages/messenger-widget/src/context/BackendContext.tsx

@@ -5,7 +5,11 @@ import { useBackend } from '../hooks/server-side/useBackend';
 export type BackendContextType = {
     isInitialized: boolean;
     addConversation: (ensName: string, encryptedContactName: string) => void;
-    getConversations: (ensName: string) => Promise<string[]>;
+    getConversations: (
+        ensName: string,
+        size: number,
+        offset: number,
+    ) => Promise<string[]>;
     toggleHideConversation: (
         ensName: string,
         encryptedContactName: string,

packages/messenger-widget/src/context/StorageContext.tsx

@@ -12,10 +12,7 @@ import {
     useStorage,
 } from '../hooks/storage/useStorage';
 import { AuthContext } from './AuthContext';
-import { DeliveryServiceContext } from './DeliveryServiceContext';
-import { BackendConnector } from '../hooks/server-side/BackendConnector';
-import { BackendContext, BackendContextProvider } from './BackendContext';
-import { IBackendConnector } from '@dm3-org/dm3-lib-shared';
+import { BackendContext } from './BackendContext';
 
 export type StorageContextType = {
     storeMessage: StoreMessageAsync;
@@ -42,7 +39,8 @@ export const StorageContext = React.createContext<StorageContextType>({
         contact: string,
         batch: StorageEnvelopContainer[],
     ) => {},
-    getConversations: async (page: number) => Promise.resolve([]),
+    getConversations: async (size: number, offset: number) =>
+        Promise.resolve([]),
     addConversationAsync: (contact: string) => {},
     getMessages: async (contact: string, page: number) => Promise.resolve([]),
     getNumberOfMessages: async (contact: string) => Promise.resolve(0),

packages/messenger-widget/src/context/testHelper/getMockedStorageContext.ts

@@ -9,7 +9,7 @@ import { StorageContextType } from '../StorageContext';
 export const getMockedStorageContext = (
     override?: Partial<StorageContextType>,
 ) => {
-    const defaultValues = {
+    const defaultValues: StorageContextType = {
         initialized: false,
         storeMessage: function (
             contact: string,
@@ -29,7 +29,10 @@ export const getMockedStorageContext = (
         ): void {
             throw new Error('Function not implemented.');
         },
-        getConversations: function (page: number): Promise<Conversation[]> {
+        getConversations: function (
+            size: number,
+            offset: number,
+        ): Promise<Conversation[]> {
             return Promise.resolve([
                 {
                     contactEnsName: 'max.eth',

packages/messenger-widget/src/hooks/conversation/useConversation.test.tsx

@@ -400,6 +400,7 @@ describe('useConversation hook test cases', () => {
             const storageContext: StorageContextType = getMockedStorageContext({
                 getConversations: function (
                     page: number,
+                    offset: number,
                 ): Promise<Conversation[]> {
                     return Promise.resolve([
                         {
@@ -409,6 +410,7 @@ describe('useConversation hook test cases', () => {
                         },
                     ]);
                 },
+                addConversationAsync: jest.fn(),
                 initialized: true,
             });
             const deliveryServiceContext: DeliveryServiceContextType =
@@ -480,6 +482,7 @@ describe('useConversation hook test cases', () => {
                         },
                     ]);
                 },
+                addConversationAsync: jest.fn(),
                 initialized: true,
             });
             const deliveryServiceContext: DeliveryServiceContextType =
@@ -568,6 +571,7 @@ describe('useConversation hook test cases', () => {
                         },
                     ]);
                 },
+                addConversationAsync: jest.fn(),
                 initialized: true,
             });
             const deliveryServiceContext: DeliveryServiceContextType =
@@ -619,7 +623,7 @@ describe('useConversation hook test cases', () => {
                 'mydefaultcontract.eth',
             );
         });
-        it('hidden contact should not appears as hidden in the conversation list', async () => {
+        it('hidden contact should appear as hidden in the conversation list', async () => {
             const configurationContext = getMockedDm3Configuration({
                 dm3Configuration: {
                     ...DEFAULT_DM3_CONFIGURATION,
@@ -661,6 +665,7 @@ describe('useConversation hook test cases', () => {
                         },
                     ]);
                 },
+                addConversationAsync: jest.fn(),
                 initialized: true,
             });
             const deliveryServiceContext: DeliveryServiceContextType =