testing

Author: Gilgamesh

package.json

@@ -31,7 +31,7 @@
     "gh-publish-mac": "electron-builder build --x64 --mac -p always",
     "gh-publish": "electron-builder build -mwl -p always",
     "check-types": "tsc",
-    "postinstall": "patch-package"
+    "postinstall": "NODE_OPTIONS=--no-node-snapshot patch-package"
   },
   "build": {
     "npmRebuild": false,
@@ -47,7 +47,7 @@
       "preload.js",
       "src/server/*"
     ],
-    "nodeVersion": "16.15.0",
+    "nodeVersion": "18.18.0",
     "nsis": {
       "createDesktopShortcut": "always"
     },
@@ -91,7 +91,7 @@
   "license": "MIT",
   "homepage": "http://www.getswell.io",
   "engines": {
-    "node": ">=16.15.0",
+    "node": ">=18.0.0",
     "npm": ">=7.0.0"
   },
   "dependencies": {
@@ -139,11 +139,12 @@
     "graphql-tag": "^2.12.6",
     "graphql-ws": "^5.8.1",
     "highland": "^2.13.5",
-    "isolated-vm": "^4.6.0",
+    "isolated-vm": "^5.0.3",
     "jest-environment-jsdom": "^29.7.0",
     "mali": "^0.46.1",
     "ngrok": "^4.3.1",
     "node-fetch": "^3.3.0",
+    "node-gyp": "^11.0.0",
     "npm": "^8.7.0",
     "patch-package": "^6.4.7",
     "path": "^0.12.7",
@@ -572,4 +573,3 @@
     }
   ]
 }
-

src/client/components/main/WebRTC-composer/WebRTCComposer.tsx

@@ -28,6 +28,7 @@ export default function WebRTCComposer() {
   const [showRTCEntryForms, setShowRTCEntryForms] = useState(false);
 
   // Builds ReqRes object from properties in NewRequest
+  
   const composeReqRes = (): ReqRes => {
     return {
       id: uuid(),
@@ -87,6 +88,7 @@ export default function WebRTCComposer() {
         style={{ overflowX: 'hidden' }}
       >
         <WebRTCSessionEntryForm setShowRTCEntryForms={setShowRTCEntryForms} />
+
         {showRTCEntryForms && (
           <>
             <WebRTCServerEntryForm />

src/client/components/main/WebRTC-composer/WebRTCServerEntryForm.tsx

@@ -34,7 +34,7 @@ const WebRTCServerEntryForm: React.FC<Props> = (props: Props) => {
         <TextCodeArea
           mode={'application/json'}
           value={newRequestWebRTC.webRTCOffer || ''}
-          height={'85px'}
+          height={'85px'} 
           onChange={(value, viewUpdate) => {
             dispatch(
               newRequestWebRTCSet({ ...newRequestWebRTC, webRTCOffer: value })
@@ -82,6 +82,7 @@ const WebRTCServerEntryForm: React.FC<Props> = (props: Props) => {
           className="button is-normal is-primary-100 add-request-button no-border-please"
           style={{ margin: '10px' }}
           onClick={() => {
+            console.log('newRequestWebRTCfromOclick:', newRequestWebRTC);
             webrtcPeerController.createOffer(newRequestWebRTC);
           }}
         >
@@ -138,16 +139,29 @@ const WebRTCServerEntryForm: React.FC<Props> = (props: Props) => {
           Paste
         </button>
         {/* ANSWER BUTTON IS WORK-IN-PROGRESS */}
-        {/* <button
+        <button
         id="webRTButton"
         className="button is-normal is-primary-100 add-request-button  no-border-please"
         style={{ margin: '10px' }}
         onClick={() => {
-          createAnswer(newRequestWebRTC);
+          console.log('newRequestWebRTCfromGAclick:', newRequestWebRTC);
+          webrtcPeerController.createAnswer(newRequestWebRTC);
         }}
       >
         Get Answer
-      </button> */}
+      </button>
+
+      <button
+        id="webRTButton"
+        className="button is-normal is-primary-100 add-request-button  no-border-please"
+        style={{ margin: '10px' }}
+        onClick={() => {
+          console.log('newRequestWebRTCfromAAclick:', newRequestWebRTC);
+         // webrtcPeerController.addAnswer(reqRes);
+        }}
+      >
+        Add Answer
+      </button>
         {/* {warningMessage ? <div>{warningMessage.body}</div> : null} */}
       </div>
     </div>

src/client/components/main/WebRTC-composer/WebRTCSessionEntryForm.tsx

@@ -131,6 +131,7 @@ const WebRTCSessionEntryForm: React.FC<Props> = (props: Props) => {
             className="ml-1 is-rest button no-border-please"
             onClick={() => {
               setShowRTCEntryForms(true);
+              console.log('newRequestWebRTCFromCclick:', newRequestWebRTC);
               webrtcPeerController.createPeerConnection(newRequestWebRTC);
             }}
           >

src/client/controllers/webrtcPeerController.ts

@@ -16,11 +16,11 @@ const webrtcPeerController = {
     newRequestWebRTC: RequestWebRTC
   ): Promise<void> => {
     let servers = {
-      iceServers: [
+      iceServers: [ 
         {
           urls: [
-            'stun:stun1.1.google.com:19302',
-            'stun:stun2.1.google.com:19302',
+            'stun:stun.l.google.com:19302',
+            'stun:stun.l.google.com:5349',
           ],
         },
       ],
@@ -73,42 +73,63 @@ const webrtcPeerController = {
       let localStream = peerConnection.createDataChannel('textChannel');
       localStream.onopen = () => console.log('data channel opened');
       localStream.onclose = () => console.log('data channel closed')
-
+      console.log('peerConnection:', peerConnection)
+      console.log('localstream:', localStream)
+      console.log('newRequestWebRTCcheck:', newRequestWebRTC)
       appDispatch(
         newRequestWebRTCSet({
           ...newRequestWebRTC,
           webRTCpeerConnection: peerConnection,
           webRTCLocalStream: localStream,
         })
       );
-
+  
       peerConnection.onicecandidate = async (
         event: RTCPeerConnectionIceEvent
       ): Promise<void> => {
+        console.log('event:', event)
         if (event.candidate) {
           appDispatch(
-            newRequestWebRTCOfferSet(
+            newRequestWebRTCOfferSet(      // newRequestWebRTCOfferSet mutates the newRequestWebRTC.webrtcOffer state 
               JSON.stringify(peerConnection.localDescription)
             )
           );
         }
+        console.log('newRequestWebRTCCheck4:', newRequestWebRTC)
       };
+
     }
   },
 
   createOffer: async (newRequestWebRTC: RequestWebRTC): Promise<void> => {
     //grab the peer connection off the state to manipulate further
+    console.log('newRequestWebRTCCheck2:', newRequestWebRTC)
     let { webRTCpeerConnection } = newRequestWebRTC;
+    console.log('webRTCPeerConnect:', webRTCpeerConnection)
     let offer = await webRTCpeerConnection!.createOffer();
-    await webRTCpeerConnection!.setLocalDescription(offer);
+    console.log('offer:', offer)
+    await webRTCpeerConnection!.setLocalDescription(offer); //what is this line doing that is not already done?
+    console.log('webRTCaftersetofLocalDes:', webRTCpeerConnection)
     appDispatch(
       newRequestWebRTCSet({
         ...newRequestWebRTC,
         webRTCOffer: JSON.stringify(offer),
       })
     );
+    console.log('newRequestWebRTCCheck3:', newRequestWebRTC)
   },
 
+  // need to include methodology to send offer to other peer
+
+  // also need to send ice candidate to other peer
+
+  // Ability to receive offer and candidate from other peer (using websockets)
+
+  // peer should be able to accept offer and candidate
+  // peer should be able to set the offer received as the remote description
+
+
+
   // work-in-progress
   createAnswer: async (newRequestWebRTC: RequestWebRTC): Promise<void> => {
     let { webRTCpeerConnection, webRTCOffer } = newRequestWebRTC;
@@ -121,12 +142,13 @@ const webrtcPeerController = {
     let answer = await webRTCpeerConnection.createAnswer();
     await webRTCpeerConnection.setLocalDescription(answer);
 
-    appDispatch(
+    appDispatch( 
       newRequestWebRTCSet({
         ...newRequestWebRTC,
         webRTCAnswer: JSON.stringify(answer),
       })
     );
+    console.log('newRequestWebRTCCheck5:', newRequestWebRTC)
   },
 
   addAnswer: async (reqRes: ReqRes): Promise<void> => {

src/server/server.js

@@ -6,7 +6,7 @@ const cookieParser = require('cookie-parser');
 const crypto = require('crypto');
 dotenv.config();
 
-const port = 3000;
+const port = 3001;
 const app = express();
 const cors = require('cors');
 app.use(express.urlencoded({ extended: true }));

webpack.config.js

@@ -129,8 +129,8 @@ module.exports = {
       'base-uri': ["'self'"],
       'default-src': [
         "'self'",
-        'http://localhost:3000',
-        'ws://localhost:3000',
+        'http://localhost:3001',
+        'ws://localhost:3001',
         'https://api.github.com',
         "'unsafe-inline'",
         "'unsafe-eval'",

webpack.development.js

@@ -13,16 +13,16 @@ module.exports = merge(base, {
     compress: true,
     proxy: {
       '/webhookServer': {
-        target: 'http://localhost:3000',
+        target: 'http://localhost:3001',
       },
       '/webhook': {
-        target: 'http://localhost:3000',
+        target: 'http://localhost:3001',
       },
       '/api': {
-        target: 'http://localhost:3000',
+        target: 'http://localhost:3001',
         /**
          * @todo Change secure option to true, and refactor code to account for
-         * change
+         * change  // https://github.com/electron/electron/issues/19775 ??? maybe this is the solution
          */
         secure: false,
       },
@@ -31,6 +31,7 @@ module.exports = merge(base, {
       if (!devServer) {
         throw new Error('webpack-dev-server is not defined');
       }
+      console.log('Setting up middlewares...:', middlewares);
       middlewares.unshift({
         // unshift does not work, ends in infinite calls to this function
         name: 'run-in-electron',