.github/workflows/cicd.yml

@@ -1,43 +0,0 @@
-name: Build and Push to Registry
-
-on:
-  push:
-    branches: [ cicd ]
-
-env:
-  REGISTRY: git.4nkweb.com
-  IMAGE_NAME: 4nk/ihm_client
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up SSH agent
-        uses: webfactory/ssh-agent@v0.9.1
-        with:
-          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.USER }}
-          password: ${{ secrets.TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          ssh: default
-          build-args: |
-            ENV_VARS=${{ secrets.ENV_VARS }}
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ gitea.sha }}

Dockerfile

@@ -1,61 +1,13 @@
-# syntax=docker/dockerfile:1.4
+FROM node:20
-FROM rust:1.82-alpine AS wasm-builder
-WORKDIR /build
 
-# Installation des dépendances nécessaires pour la compilation
+ENV TZ=Europe/Paris
-RUN apk update && apk add --no-cache \
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-    git \
-    openssh-client \
-    curl \
-    nodejs \
-    npm \
-    build-base \
-    pkgconfig \
-    clang \
-    llvm \
-    musl-dev \
-    nginx
 
-# Installation de wasm-pack
+# use this user because he have uid et gid 1000 like theradia
-RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+USER node
 
-# Configuration SSH basique
-RUN mkdir -p /root/.ssh && \
-    ssh-keyscan git.4nkweb.com >> /root/.ssh/known_hosts
-
-# On se place dans le bon répertoire parent
-WORKDIR /build
-# Copie du projet ihm_client
-COPY . ihm_client/
-
-# Clonage du sdk_client au même niveau que ihm_client en utilisant la clé SSH montée
-RUN --mount=type=ssh git clone -b cicd ssh://git@git.4nkweb.com/4nk/sdk_client.git
-
-# Build du WebAssembly avec accès SSH pour les dépendances
-WORKDIR /build/sdk_client
-RUN --mount=type=ssh wasm-pack build --out-dir ../ihm_client/pkg --target bundler --dev
-
-FROM node:20-alpine
 WORKDIR /app
 
-# Installation des dépendances nécessaires
+CMD ["npm", "start"]
-RUN apk update && apk add --no-cache git nginx
+#  "--disable-host-check", "--host", "0.0.0.0", "--ssl", "--ssl-cert", "/ssl/certs/site.crt", "--ssl-key", "/ssl/private/site.dec.key"]
-
-# Copie des fichiers du projet
-COPY --from=wasm-builder /build/ihm_client/pkg ./pkg
-COPY . .
-
-# Installation des dépendances Node.js
-RUN npm install
-
-# Copie de la configuration nginx
-COPY nginx.dev.conf /etc/nginx/http.d/default.conf
-
-# Script de démarrage
-COPY start-dev.sh /start-dev.sh
-RUN chmod +x /start-dev.sh
-
-EXPOSE 3003 80
-
-CMD ["/start-dev.sh"]
 

nginx.dev.conf

@@ -1,48 +0,0 @@
-server {
-    listen 80;
-    server_name localhost;
-
-    # Redirection des requêtes HTTP vers Vite
-    location / {
-        proxy_pass http://localhost:3003;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $host;
-    }
-
-    location /ws/ {
-        proxy_pass http://localhost:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-NginX-Proxy true;
-        proxy_read_timeout 86400;
-    }
-
-    location /storage/ {
-        rewrite ^/storage(/.*)$ $1 break;
-        proxy_pass http://localhost:8080;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $host;
-    }
-
-    location /api/ {
-        proxy_pass http://localhost:8091;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-
-        # CORS headers
-        add_header Access-Control-Allow-Origin "*" always;
-        add_header Access-Control-Allow-Methods "GET, POST, OPTIONS, PUT, DELETE" always;
-        add_header Access-Control-Allow-Headers "Authorization,Content-Type,Accept,X-Requested-With" always;
-    }
-} 

package.json

@@ -5,7 +5,7 @@
   "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build_wasm": "wasm-pack build --out-dir ../ihm_client/pkg  ../sdk_client --target bundler --dev",
+    "build_wasm": "wasm-pack build --out-dir ../ihm_client_dev3/pkg  ../sdk_client --target bundler --dev",
     "start": "vite --host 0.0.0.0",
     "build": "tsc && vite build",
     "deploy": "sudo cp -r dist/* /var/www/html/",

src/models/process.model.ts

@@ -27,8 +27,6 @@ export enum MessageType {
   LISTENING = 'LISTENING',
   REQUEST_LINK = 'REQUEST_LINK',
   LINK_ACCEPTED = 'LINK_ACCEPTED',
-  CREATE_PAIRING = 'CREATE_PAIRING',
-  PAIRING_CREATED = 'PAIRING_CREATED',
   ERROR = 'ERROR',
   VALIDATE_TOKEN = 'VALIDATE_TOKEN',
   RENEW_TOKEN = 'RENEW_TOKEN',

src/router.ts

@@ -207,8 +207,19 @@ export async function registerAllListeners() {
       cancelText: 'Annuler'
     }, true);
 
-    if (!result) {
+    try {
-      const errorMsg = 'Failed to pair device: User refused to link';
+      if (!result) {
+        throw new Error('User refused to link');
+      }
+
+      if (!services.isPaired()) {
+        // New device - do pairing process
+        console.log('🚀 The device is not paired');
+        await prepareAndSendPairingTx();
+        await services.confirmPairing(); 
+      }
+    } catch (error) {
+      const errorMsg = `Failed to pair device: ${error}`;
       errorResponse(errorMsg, event.origin, event.data.messageId);
     }
 
@@ -230,47 +241,6 @@ export async function registerAllListeners() {
     }
   }
 
-  const handleCreatePairing = async (event: MessageEvent) => {
-    if (event.data.type !== MessageType.CREATE_PAIRING) {
-      return;
-    }
-
-    if (services.isPaired()) {
-      const errorMsg = 'Device already paired';
-      errorResponse(errorMsg, event.origin, event.data.messageId);
-      return;
-    }
-
-    try {
-      const { accessToken } = event.data;
-
-      if (!accessToken || !(await tokenService.validateToken(accessToken, event.origin))) {
-        throw new Error('Invalid or expired session token');
-      }
-
-      console.log('🚀 Starting pairing process');
-      await prepareAndSendPairingTx();
-      await services.confirmPairing();
-
-      const pairingId = services.getPairingProcessId();
-
-      if (!pairingId) {
-        throw new Error('Failed to get pairing process id');
-      }
-      
-      // Send success response
-      const successMsg = {
-        type: MessageType.PAIRING_CREATED,
-        pairingId,
-        messageId: event.data.messageId
-      };
-      window.parent.postMessage(successMsg, event.origin);
-    } catch (e) {
-      const errorMsg = `Failed to create pairing process: ${e}`;
-      errorResponse(errorMsg, event.origin, event.data.messageId);
-    }
-  }
-
   const handleGetMyProcesses = async (event: MessageEvent) => {
     if (event.data.type !== MessageType.GET_MY_PROCESSES) {
       return;
@@ -844,9 +814,6 @@ export async function registerAllListeners() {
         case MessageType.REQUEST_LINK:
           await handleRequestLink(event);
           break;
-        case MessageType.CREATE_PAIRING:
-          await handleCreatePairing(event);
-          break;
         case MessageType.GET_MY_PROCESSES:
           await handleGetMyProcesses(event);
           break;

src/services/service.ts

@@ -541,40 +541,10 @@ export default class Services {
     // await this.saveCipherTxToDb(parsedTx)
   }
 
-  async parseNewTx(newTxMsg: string) {
+  async parseNewTx(tx: string) {
-    const parsedMsg: NewTxMessage = JSON.parse(newTxMsg); 
-    if (parsedMsg.error !== null) {
-      console.error('Received error in new tx message:', parsedMsg.error);
-      return;
-    }
-
     const membersList = this.getAllMembers();
     try {
-      // Does the transaction spend the tip of a process?
+      const parsedTx = this.sdkClient.parse_new_tx(tx, 0, membersList);
-      const prevouts = this.sdkClient.get_prevouts(parsedMsg.transaction);
-      console.log('prevouts:', prevouts);
-      for (const process of Object.values(this.processesCache)) {
-        const tip = process.states[process.states.length - 1].commited_in;
-        if (prevouts.includes(tip)) {
-          const processId = process.states[0].commited_in;
-          const newTip = this.sdkClient.get_txid(parsedMsg.transaction);
-          console.log('Transaction', newTip, 'spends the tip of process', processId);
-          // We take the data out of the output
-          const newStateId = this.sdkClient.get_new_state_id(parsedMsg.transaction);
-          console.log('newStateId:', newStateId);
-          // We update the relevant process
-          const updatedProcess = this.sdkClient.process_commit_new_state(process, newStateId, newTip);
-          this.processesCache[processId] = updatedProcess;
-          console.log('updatedProcess:', updatedProcess);
-          break;
-        }
-      }
-    } catch (e) {
-      console.error('Failed to parse new tx for commitments:', e);
-    }
-
-    try {
-      const parsedTx = this.sdkClient.parse_new_tx(parsedMsg.transaction, 0, membersList);
       if (parsedTx) {
         try {
           await this.handleApiReturn(parsedTx);
@@ -585,7 +555,7 @@ export default class Services {
         }
       }
     } catch (e) {
-      console.debug(e);
+      console.trace(e);
     }
   }
 
@@ -1090,7 +1060,7 @@ export default class Services {
     await this.restoreProcessesFromDB();
   }
 
-  // Restore processes cache from persistent storage
+  // Restore process in wasm with persistent storage
   public async restoreProcessesFromDB() {
     const db = await Database.getInstance();
     try {
@@ -1098,6 +1068,7 @@ export default class Services {
       if (processes && Object.keys(processes).length != 0) {
         console.log(`Restoring ${Object.keys(processes).length} processes`);
         this.processesCache = processes;
+        this.sdkClient.set_process_cache(processes);
       } else {
         console.log('No processes to restore!');
       }

start-dev.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Démarrer nginx en arrière-plan
-nginx
-
-# Démarrer le serveur de développement Vite
-npm run start 

vite.config.ts

@@ -57,7 +57,7 @@ export default defineConfig({
     fs: {
       cachedChecks: false,
     },
-    port: 3003,
+    port: 3004,
     proxy: {
       '/storage': {
         target: 'https://demo.4nkweb.com',