Merge pull request #2 from stroveio/editorFocus

Editor focus

Author: AdamZaczek

README.md

@@ -4,4 +4,4 @@ Liveshare toolkit for strove.io.
 
 Note: This extension is required for liveshare to work properly inside strove.io. It will do nothing outside of the platform.
 
-Current version: 0.1.4
+Current version: 0.1.5

extension.js

@@ -10,22 +10,37 @@ const ws = require("ws");
 const {
   stroveLiveshareSubscription,
   liveshareActivity,
+  focusEditorSubscription,
 } = require("./utils/queries");
 const { websocketEndpoint } = require("./utils/endpoints");
 const { handleLiveshareResponse } = require("./utils/handleLiveshareResponse");
+const { handleFocusEditor } = require("./utils/handleFocusEditor");
 
 const environment = process.env.STROVE_ENVIRONMENT;
 
 const client = new SubscriptionClient(
   websocketEndpoint,
   {
     reconnect: true,
+    connectionParams: () => ({
+      authorization: process.env.STROVE_USER_TOKEN
+        ? `Bearer ${process.env.STROVE_USER_TOKEN}`
+        : "",
+    }),
   },
   ws
 );
 
 const link = new WebSocketLink(client);
 
+///
+// context = {
+//   headers: {
+//     Authorization: `Bearer ${user.githubToken}`,
+//     'User-Agent': 'node',
+//   },
+// }
+
 try {
   const liveshareActivityUpdate = (data) => {
     const liveshareActivityOperation = {
@@ -72,7 +87,9 @@ try {
     console.log("stroveteams extension is active");
 
     // First call to get cursor positions of other users
-    liveshareActivityInit();
+    // It doesn't seem to work - my assumption:
+    // it gets called before subscription is set up and the info gets lost, hence setTimeout
+    setTimeout(liveshareActivityInit, 1000);
 
     vscode.window.onDidChangeTextEditorSelection(
       ({ textEditor, selections }) => {
@@ -127,16 +144,42 @@ try {
 
         handleLiveshareResponse(stroveLiveshare);
       },
-      error: (error) => console.log(`received error ${error}`),
+      error: (error) =>
+        console.log(`received error in liveshareSubscriber ${error}`),
       complete: () => console.log(`complete`),
     }
   );
 
+  const focusEditorOperation = {
+    query: focusEditorSubscription,
+    variables: {
+      userId: process.env.STROVE_USER_ID || "123",
+      projectId: process.env.STROVE_PROJECT_ID || "123abc",
+    },
+  };
+
+  const focusEditorSubscriber = execute(link, focusEditorOperation).subscribe({
+    next: async (data) => {
+      const {
+        data: { focusEditor },
+      } = data;
+
+      handleFocusEditor({
+        uri: focusEditor.documentPath,
+        userPosition: focusEditor.selections,
+      });
+    },
+    error: (error) =>
+      console.log(`received error in focusEditorSubscriber ${error}`),
+    complete: () => console.log(`complete`),
+  });
+
   exports.activate = activate;
 
   // this method is called when your extension is deactivated
   function deactivate() {
     liveshareSubscriber.unsubscribe();
+    focusEditorSubscriber.unsubscribe();
   }
 
   module.exports = {

package.json

@@ -2,7 +2,7 @@
   "name": "stroveteams",
   "displayName": "stroveTeams",
   "description": "Teams support for Strove",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "engines": {
     "vscode": "^1.39.2"
   },

utils/handleFocusEditor.js

@@ -0,0 +1,25 @@
+const vscode = require("vscode");
+
+const handleFocusEditor = async ({ uri, userPosition }) => {
+  try {
+    const editorPath = vscode.Uri.file(uri);
+
+    const editor = await vscode.window.showTextDocument(editorPath);
+
+    const range = new vscode.Range(
+      new vscode.Position(
+        userPosition.start.line,
+        userPosition.start.character
+      ),
+      new vscode.Position(userPosition.end.line, userPosition.end.character)
+    );
+
+    editor.revealRange(range, 1);
+  } catch (e) {
+    console.log(`Error in handleFocusEditor: ${e}`);
+  }
+};
+
+module.exports = {
+  handleFocusEditor,
+};

utils/queries.js

@@ -38,3 +38,21 @@ mutation($userData: UserActivityInput) {
     liveshareActivity (userData: $userData)
 }
 `;
+
+exports.focusEditorSubscription = `
+subscription($userId: String!, $projectId: String!) {
+    focusEditor(userId: $userId, projectId: $projectId) {
+        documentPath
+        selections {
+            start {
+                line
+                character
+            }
+            end {
+                line
+                character
+            }
+        }
+    }
+}
+`;