Compare commits
4 Commits
16383491b4
...
0ef94ef5e6
| Author | SHA1 | Date | |
|---|---|---|---|
| 0ef94ef5e6 | |||
| 41883b0356 | |||
| 0ca6fd6e6d | |||
| bbcc5000cd |
108
.gitignore
vendored
108
.gitignore
vendored
@ -1,19 +1,11 @@
|
||||
# ============================
|
||||
# 4NK Environment - Git Ignore
|
||||
# ============================
|
||||
|
||||
# ----------------------------
|
||||
# Configuration
|
||||
# ----------------------------
|
||||
confs/
|
||||
# Dossiers de sauvegarde des scripts
|
||||
**/backup/
|
||||
**/*backup*
|
||||
|
||||
**/.cargo/
|
||||
|
||||
# Fichiers temporaires
|
||||
**/*.tmp*
|
||||
**/*.temp*
|
||||
**/*.log*
|
||||
**/*.pid*
|
||||
|
||||
# Fichiers de configuration locale
|
||||
**/*.env*
|
||||
**/*.conf*
|
||||
**/*.yaml*
|
||||
@ -23,57 +15,71 @@ confs/
|
||||
**/*.toml*
|
||||
**/*.lock*
|
||||
|
||||
# Données et logs
|
||||
# ----------------------------
|
||||
# Backups
|
||||
# ----------------------------
|
||||
**/backup/
|
||||
**/*backup*
|
||||
**/*wallet*
|
||||
**/*keys*
|
||||
|
||||
# ----------------------------
|
||||
# Temporary files & logs
|
||||
# ----------------------------
|
||||
**/*.tmp*
|
||||
**/*.temp*
|
||||
**/*.log*
|
||||
**/*.logs*
|
||||
**/*.data
|
||||
**/*.pid*
|
||||
*.db
|
||||
*.sqlite
|
||||
**/*.data
|
||||
|
||||
# Certificats et clés
|
||||
# ----------------------------
|
||||
# Certificates & keys
|
||||
# ----------------------------
|
||||
ssl/
|
||||
certs/
|
||||
**/*.key
|
||||
**/*.pem
|
||||
**/*.crt
|
||||
**/*.p12
|
||||
**/*.pfx
|
||||
ssl/
|
||||
certs/
|
||||
|
||||
# Docker
|
||||
**/*.docker*
|
||||
|
||||
# Cache et build
|
||||
**/*.node_modules/
|
||||
**/*.dist/
|
||||
**/*build/
|
||||
**/*target/
|
||||
**/*.*.o
|
||||
# ----------------------------
|
||||
# Build / Cache
|
||||
# ----------------------------
|
||||
**/node_modules/
|
||||
**/dist/
|
||||
**/build/
|
||||
**/target/
|
||||
package-lock.json
|
||||
**/*.o
|
||||
**/*.so
|
||||
**/*.dylib
|
||||
|
||||
# IDE et éditeurs
|
||||
**/*.vscode/
|
||||
**/*.idea/
|
||||
**/*.swp
|
||||
**/*.swo
|
||||
**/*~
|
||||
# ----------------------------
|
||||
# IDE / Editors
|
||||
# ----------------------------
|
||||
.vscode/
|
||||
.idea/
|
||||
*.swp
|
||||
*.swo
|
||||
*~
|
||||
|
||||
# OS
|
||||
**/*.DS_Store
|
||||
**/*Thumbs.db
|
||||
**/*tmp*
|
||||
# ----------------------------
|
||||
# OS files
|
||||
# ----------------------------
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
*tmp*
|
||||
|
||||
# Git
|
||||
**/*.git/
|
||||
**/*.orig*
|
||||
# ----------------------------
|
||||
# Docker
|
||||
# ----------------------------
|
||||
**/*.docker*
|
||||
|
||||
# Backup des projets existants
|
||||
**/*backup*
|
||||
|
||||
|
||||
**/*wallet*
|
||||
**/*keys*
|
||||
|
||||
**/*node_modules*
|
||||
**/*cursor*
|
||||
**/*pid*
|
||||
**/*next*
|
||||
# ----------------------------
|
||||
# Git internals
|
||||
# ----------------------------
|
||||
*.orig
|
||||
|
||||
3155
package-lock.json
generated
3155
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
76
src/App.tsx
76
src/App.tsx
@ -7,7 +7,7 @@ import ProfileModal from './components/ProfileModal'
|
||||
import AuthModal from './sdk/AuthModal';
|
||||
import MessageBus from './sdk/MessageBus';
|
||||
import EventBus from './sdk/EventBus';
|
||||
import UserStore from './sdk/UserStrore';
|
||||
import UserStore from './sdk/UserStore';
|
||||
import Iframe from './sdk/Iframe'
|
||||
import BlockchainViewer from './components/ProcessesViewer';
|
||||
import FolderModal from './components/FolderModal';
|
||||
@ -27,47 +27,55 @@ function App() {
|
||||
const [userPairingId, setUserPairingId] = useState<string | null>(null)
|
||||
|
||||
useEffect(() => {
|
||||
// Met à jour la connexion au montage
|
||||
setIsConnected(UserStore.getInstance().isConnected());
|
||||
});
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
// Charge le pairingId s’il existe déjà
|
||||
setUserPairingId(UserStore.getInstance().getUserPairingId());
|
||||
});
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (isConnected) {
|
||||
const handleConnectionFlow = async () => {
|
||||
if (!isConnected) return;
|
||||
|
||||
const userStore = UserStore.getInstance();
|
||||
const messageBus = MessageBus.getInstance(iframeUrl);
|
||||
messageBus.isReady().then(() => {
|
||||
messageBus.getProcesses().then((processes: any) => {
|
||||
setProcesses(processes);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
try {
|
||||
await messageBus.isReady();
|
||||
|
||||
let pairingId = userStore.getUserPairingId();
|
||||
|
||||
// 1️⃣ Créer le pairing si non existant
|
||||
if (!pairingId) {
|
||||
console.log("🚀 No pairing found — creating new pairing...");
|
||||
pairingId = await messageBus.createUserPairing();
|
||||
console.log("✅ Pairing created:", pairingId);
|
||||
|
||||
userStore.pair(pairingId);
|
||||
setUserPairingId(pairingId);
|
||||
} else {
|
||||
console.log("🔗 Already paired with ID:", pairingId);
|
||||
}
|
||||
|
||||
// 2️⃣ Charger les processes
|
||||
const processes = await messageBus.getProcesses();
|
||||
setProcesses(processes);
|
||||
|
||||
// 3️⃣ Charger les myProcesses
|
||||
const myProcesses = await messageBus.getMyProcesses();
|
||||
setMyProcesses(myProcesses);
|
||||
|
||||
} catch (err) {
|
||||
console.error("❌ Error during pairing or process loading:", err);
|
||||
}
|
||||
};
|
||||
|
||||
handleConnectionFlow();
|
||||
}, [isConnected, iframeUrl]);
|
||||
|
||||
useEffect(() => {
|
||||
if (isConnected && processes !== null) {
|
||||
const messageBus = MessageBus.getInstance(iframeUrl);
|
||||
messageBus.isReady().then(() => {
|
||||
messageBus.getMyProcesses().then((res: string[]) => {
|
||||
setMyProcesses(res);
|
||||
})
|
||||
});
|
||||
}
|
||||
}, [isConnected, processes]);
|
||||
|
||||
useEffect(() => {
|
||||
if (isConnected && userPairingId === null) {
|
||||
const messageBus = MessageBus.getInstance(iframeUrl);
|
||||
messageBus.isReady().then(() => {
|
||||
messageBus.getUserPairingId().then((userPairingId: string) => {
|
||||
UserStore.getInstance().pair(userPairingId);
|
||||
setUserPairingId(UserStore.getInstance().getUserPairingId());
|
||||
})
|
||||
});
|
||||
}
|
||||
}, [isConnected, userPairingId, processes]);
|
||||
|
||||
// Gestionnaire pour afficher la modale de connexion
|
||||
const handleLogin = useCallback(() => {
|
||||
// Afficher la modale de connexion
|
||||
@ -189,7 +197,7 @@ function App() {
|
||||
{/* Espace pour contenu supplémentaire à droite */}
|
||||
<div className="content-area">
|
||||
{/* Affichage des blocs de la blockchain */}
|
||||
<BlockchainViewer processes={processes} myProcesses={myProcesses} onProcessesUpdate={setProcesses}/>
|
||||
<BlockchainViewer processes={processes} myProcesses={myProcesses} onProcessesUpdate={setProcesses} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import IframeReference from './IframeReference';
|
||||
import EventBus from './EventBus';
|
||||
import UserStore from './UserStrore';
|
||||
import UserStore from './UserStore';
|
||||
import { isProfileData, type ProfileCreated, type ProfileData } from './models/ProfileData';
|
||||
import { isFolderData, type FolderCreated, type FolderData } from './models/FolderData';
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
@ -80,6 +80,48 @@ export default class MessageBus {
|
||||
});
|
||||
}
|
||||
|
||||
public createUserPairing(): Promise<string> {
|
||||
return new Promise<string>((resolve, reject) => {
|
||||
this.checkToken().then(async () => {
|
||||
const userStore = UserStore.getInstance();
|
||||
const accessToken = userStore.getAccessToken();
|
||||
if (!accessToken) {
|
||||
return reject('No access token found');
|
||||
}
|
||||
|
||||
const correlationId = uuidv4();
|
||||
this.initMessageListener(correlationId);
|
||||
|
||||
// ✅ Success listener
|
||||
const unsubscribeSuccess = EventBus.getInstance().on('PAIRING_CREATED', (responseId: string, pairingId: string) => {
|
||||
if (responseId !== correlationId) return;
|
||||
unsubscribeSuccess();
|
||||
unsubscribeError();
|
||||
this.destroyMessageListener();
|
||||
resolve(pairingId);
|
||||
});
|
||||
|
||||
// ❌ Error listener
|
||||
const unsubscribeError = EventBus.getInstance().on('ERROR_CREATE_PAIRING', (responseId: string, error: string) => {
|
||||
if (responseId !== correlationId) return;
|
||||
unsubscribeError();
|
||||
unsubscribeSuccess();
|
||||
this.destroyMessageListener();
|
||||
reject(error);
|
||||
});
|
||||
|
||||
// 📨 Send CREATE_PAIRING message to iframe
|
||||
this.sendMessage({
|
||||
type: 'CREATE_PAIRING',
|
||||
accessToken,
|
||||
messageId: correlationId,
|
||||
});
|
||||
}).catch((err) => {
|
||||
reject(`Failed to validate token before pairing: ${err}`);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
public getUserPairingId(): Promise<string> {
|
||||
return new Promise<string>((resolve: (userPairingId: string) => void, reject: (error: string) => void) => {
|
||||
this.checkToken().then(() => {
|
||||
@ -663,7 +705,7 @@ export default class MessageBus {
|
||||
EventBus.getInstance().emit('PROCESSES_RETRIEVED', correlationId, message.processes);
|
||||
break;
|
||||
|
||||
case 'GET_MY_PROCESSES':
|
||||
case 'GET_MY_PROCESSES':
|
||||
if (this.errors[correlationId]) {
|
||||
const error = this.errors[correlationId];
|
||||
delete this.errors[correlationId];
|
||||
@ -705,7 +747,7 @@ export default class MessageBus {
|
||||
EventBus.getInstance().emit('MESSAGE_RECEIVED', message);
|
||||
EventBus.getInstance().emit('UPDATE_NOTIFIED', correlationId);
|
||||
break;
|
||||
|
||||
|
||||
case 'STATE_VALIDATED':
|
||||
if (this.errors[correlationId]) {
|
||||
const error = this.errors[correlationId];
|
||||
@ -739,7 +781,18 @@ export default class MessageBus {
|
||||
EventBus.getInstance().emit('MESSAGE_RECEIVED', message);
|
||||
EventBus.getInstance().emit('PUBLIC_DATA_DECODED', correlationId, message.decodedData);
|
||||
break;
|
||||
|
||||
|
||||
case 'PAIRING_CREATED':
|
||||
if (this.errors[correlationId]) {
|
||||
const error = this.errors[correlationId];
|
||||
delete this.errors[correlationId];
|
||||
EventBus.getInstance().emit('ERROR_PAIRING_CREATED', correlationId, error);
|
||||
return;
|
||||
}
|
||||
EventBus.getInstance().emit('MESSAGE_RECEIVED', message);
|
||||
EventBus.getInstance().emit('PAIRING_CREATED', correlationId, message.decodedData);
|
||||
break;
|
||||
|
||||
case 'ERROR':
|
||||
console.error('Error:', message);
|
||||
this.errors[correlationId] = message.error;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user