From d9845d3450ccf6e7db99a5a4ee3e85554b1cd74d Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle <cjd@cjdns.fr>
Date: Mon, 25 Sep 2017 15:44:03 +0200
Subject: [PATCH] Refactor sframe-cpnf-inner to export chainpad

---
 www/common/sframe-chainpad-netflux-inner.js | 42 +++++++++++----------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/www/common/sframe-chainpad-netflux-inner.js b/www/common/sframe-chainpad-netflux-inner.js
index 787da1ca3..7e0eb2a57 100644
--- a/www/common/sframe-chainpad-netflux-inner.js
+++ b/www/common/sframe-chainpad-netflux-inner.js
@@ -46,7 +46,21 @@ define([
         var metadataMgr = config.metadataMgr;
         config = undefined;
 
-        var chainpad;
+        var chainpad = ChainPad.create({
+            userName: userName,
+            initialState: initialState,
+            transformFunction: transformFunction,
+            validateContent: validateContent,
+            avgSyncMilliseconds: avgSyncMilliseconds,
+            logLevel: logLevel
+        });
+        chainpad.onMessage(function(message, cb) {
+            sframeChan.query('Q_RT_MESSAGE', message, cb);
+        });
+        chainpad.onPatch(function () {
+            onRemote({ realtime: chainpad });
+        });
+
         var myID;
         var isReady = false;
         var evConnected = Util.mkEvent(true);
@@ -67,33 +81,20 @@ define([
 
         sframeChan.on('EV_RT_DISCONNECT', function () {
             isReady = false;
-            if (chainpad) { chainpad.abort(); }
+            chainpad.abort();
             onConnectionChange({ state: false });
         });
         sframeChan.on('EV_RT_CONNECT', function (content) {
             //content.members.forEach(userList.onJoin);
-            myID = content.myID;
             isReady = false;
-            if (chainpad) {
+            if (myID) {
                 // it's a reconnect
-                if (chainpad) { chainpad.start(); }
+                myID = content.myID;
+                chainpad.start();
                 onConnectionChange({ state: true, myId: myID });
                 return;
             }
-            chainpad = ChainPad.create({
-                userName: userName,
-                initialState: initialState,
-                transformFunction: transformFunction,
-                validateContent: validateContent,
-                avgSyncMilliseconds: avgSyncMilliseconds,
-                logLevel: logLevel
-            });
-            chainpad.onMessage(function(message, cb) {
-                sframeChan.query('Q_RT_MESSAGE', message, cb);
-            });
-            chainpad.onPatch(function () {
-                onRemote({ realtime: chainpad });
-            });
+            myID = content.myID;
             onInit({
                 myID: myID,
                 realtime: chainpad,
@@ -130,7 +131,8 @@ define([
             getMyID: function () { return myID; },
             metadataMgr: metadataMgr,
             whenRealtimeSyncs: whenRealtimeSyncs,
-            onInfiniteSpinner: evInfiniteSpinner.reg
+            onInfiniteSpinner: evInfiniteSpinner.reg,
+            chainpad: chainpad,
         });
     };
     return Object.freeze(module.exports);