Merge pull request #200 from intersystems-community/respect_server_changes

rajrsingh · web-flow · commit 810ceed3dbd6 · 2020-07-21T11:55:09.000-04:00
Respect changes on server
diff --git a/src/api/atelier.d.ts b/src/api/atelier.d.ts
@@ -31,7 +31,7 @@ export interface Document {
   status: string;
   enc: boolean;
   flags: number;
-  content: string[];
+  content: string[] | Buffer;
   ext: string;
 }
 
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -365,7 +365,7 @@ export class AtelierAPI {
   }
 
   // api v1+
-  public getDoc(name: string, format?: string): Promise<Atelier.Response> {
+  public getDoc(name: string, format?: string): Promise<Atelier.Response<Atelier.Document>> {
     let params = {};
     if (format) {
       params = {
@@ -384,12 +384,16 @@ export class AtelierAPI {
   // v1+
   public putDoc(
     name: string,
-    data: { enc: boolean; content: string[] },
+    data: { enc: boolean; content: string[]; mtime: number },
     ignoreConflict?: boolean
   ): Promise<Atelier.Response> {
     const params = { ignoreConflict };
     name = this.transformNameIfCsp(name);
-    return this.request(1, "PUT", `${this.ns}/doc/${name}`, data, params);
+    const headers = {};
+    if (!ignoreConflict && data.mtime && data.mtime > 0) {
+      headers["IF_NONE_MATCH"] = new Date(data.mtime).toISOString().replace(/T|Z/g, " ").trim();
+    }
+    return this.request(1, "PUT", `${this.ns}/doc/${name}`, data, params, headers);
   }
 
   // v1+
diff --git a/src/commands/compile.ts b/src/commands/compile.ts
@@ -8,7 +8,10 @@ import {
   documentContentProvider,
   FILESYSTEM_SCHEMA,
   FILESYSTEM_READONLY_SCHEMA,
+  OBJECTSCRIPT_FILE_SCHEMA,
   fileSystemProvider,
+  workspaceState,
+  schemas,
 } from "../extension";
 import { DocumentContentProvider } from "../providers/DocumentContentProvider";
 import { currentFile, CurrentFile, outputChannel } from "../utils";
@@ -25,18 +28,91 @@ async function compileFlags(): Promise<string> {
   });
 }
 
-async function importFile(file: CurrentFile): Promise<any> {
+export async function checkChangedOnServer(file: CurrentFile): Promise<number> {
+  if (!file || !file.uri || schemas.includes(file.uri.scheme)) {
+    return -1;
+  }
+  const api = new AtelierAPI(file.uri);
+  const mtime =
+    workspaceState.get(`${file.uniqueId}:mtime`, null) ||
+    (await api
+      .getDoc(file.name)
+      .then((data) => data.result)
+      .then(({ ts, content }) => {
+        const fileContent = file.content.split(/\r?\n/);
+        const serverTime = Number(new Date(ts + "Z"));
+        const sameContent = content.every((line, index) => line.trim() == (fileContent[index] || "").trim());
+        const mtime = sameContent ? serverTime : Math.max(Number(fs.statSync(file.fileName).mtime), serverTime);
+        return mtime;
+      })
+      .catch(() => -1));
+  workspaceState.update(`${file.uniqueId}:mtime`, mtime > 0 ? mtime : undefined);
+  return mtime;
+}
+
+async function importFile(file: CurrentFile, ignoreConflict?: boolean): Promise<any> {
   const api = new AtelierAPI(file.uri);
+  const content = file.content.split(/\r?\n/);
+  const mtime = await checkChangedOnServer(file);
+  ignoreConflict = ignoreConflict || mtime < 0;
   return api
     .putDoc(
       file.name,
       {
-        content: file.content.split(/\r?\n/),
+        content,
         enc: false,
+        mtime,
       },
-      true
+      ignoreConflict
     )
-    .catch((error) => vscode.window.showErrorMessage(error.message));
+    .catch((error) => {
+      if (error.statusCode == 400) {
+        outputChannel.appendLine(error.error.result.status);
+        vscode.window.showErrorMessage(error.error.result.status);
+        return Promise.reject();
+      }
+      if (error.statusCode == 409) {
+        return vscode.window
+          .showErrorMessage(
+            `Failed to import '${file.name}': The version of the file on the server is newer.
+What do you want to do?`,
+            "Compare",
+            "Overwrite on Server",
+            "Pull Server Changes",
+            "Cancel"
+          )
+          .then((action) => {
+            switch (action) {
+              case "Compare":
+                return vscode.commands
+                  .executeCommand(
+                    "vscode.diff",
+                    file.uri,
+                    vscode.Uri.file(file.name).with({
+                      scheme: OBJECTSCRIPT_FILE_SCHEMA,
+                      authority: file.workspaceFolder,
+                    }),
+                    `Local • ${file.fileName} ↔ Server • ${file.name}`
+                  )
+                  .then(() => Promise.reject());
+              case "Overwrite on Server":
+                return importFile(file, true);
+              case "Pull Server Changes":
+                outputChannel.appendLine(`${file.name}: Loading changes from server`);
+                outputChannel.show(true);
+                loadChanges([file]);
+                return Promise.reject();
+              case "Cancel":
+                outputChannel.appendLine(`${file.name}: Import and Compile canceled by user`);
+                outputChannel.show(true);
+                return Promise.reject();
+            }
+            return Promise.reject();
+          });
+      }
+      vscode.window.showErrorMessage(error.message);
+      return Promise.reject();
+    });
 }
 
 function updateOthers(others: string[]) {
@@ -57,6 +133,8 @@ export async function loadChanges(files: CurrentFile[]): Promise<any> {
         .getDoc(file.name)
         .then((data) => {
           const content = (data.result.content || []).join(file.eol === vscode.EndOfLine.LF ? "\n" : "\r\n");
+          const mtime = Number(new Date(data.result.ts + "Z"));
+          workspaceState.update(`${file.uniqueId}:mtime`, mtime > 0 ? mtime : undefined);
           if (file.uri.scheme === "file") {
             fs.writeFileSync(file.fileName, content);
           } else if (file.uri.scheme === FILESYSTEM_SCHEMA || file.uri.scheme === FILESYSTEM_READONLY_SCHEMA) {
diff --git a/src/commands/export.ts b/src/commands/export.ts
@@ -98,7 +98,7 @@ export async function exportFile(
 
         return promise
           .then((res: any) => {
-            let joinedContent = (content || []).join("\n").toString("utf8");
+            let joinedContent = content instanceof Buffer ? content.toString("utf-8") : (content || []).join("\n");
             let isSkipped = "";
 
             if (res.found) {
diff --git a/src/commands/studio.ts b/src/commands/studio.ts
@@ -352,7 +352,7 @@ class StudioActions {
       const query = "select * from %Atelier_v1_Utils.Extension_GetStatus(?)";
       this.api.actionQuery(query, [this.name]).then((statusObj) => {
         const docStatus = statusObj.result.content.pop();
-        if (!docStatus.editable) {
+        if (docStatus && !docStatus.editable) {
           vscode.commands.executeCommand("undo");
           this.userAction(actionObject, false, "", "", 1);
         }
diff --git a/src/extension.ts b/src/extension.ts
@@ -22,6 +22,7 @@ import {
   importFolder as importFileOrFolder,
   namespaceCompile,
   compileExplorerItem,
+  checkChangedOnServer,
 } from "./commands/compile";
 import { deleteItem } from "./commands/delete";
 import { exportAll, exportExplorerItem } from "./commands/export";
@@ -62,7 +63,14 @@ import { ObjectScriptExplorerProvider } from "./explorer/explorer";
 import { WorkspaceNode } from "./explorer/models/workspaceNode";
 import { FileSystemProvider } from "./providers/FileSystemPovider/FileSystemProvider";
 import { WorkspaceSymbolProvider } from "./providers/WorkspaceSymbolProvider";
-import { currentWorkspaceFolder, outputChannel, portFromDockerCompose, terminalWithDocker, notNull } from "./utils";
+import {
+  currentWorkspaceFolder,
+  outputChannel,
+  portFromDockerCompose,
+  terminalWithDocker,
+  notNull,
+  currentFile,
+} from "./utils";
 import { ObjectScriptDiagnosticProvider } from "./providers/ObjectScriptDiagnosticProvider";
 import { DocumentRangeFormattingEditProvider } from "./providers/DocumentRangeFormattingEditProvider";
 
@@ -338,7 +346,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
   workspace.onDidSaveTextDocument((file) => {
     if (schemas.includes(file.uri.scheme) || languages.includes(file.languageId)) {
       if (documentBeingProcessed !== file) {
-        // return vscode.commands.executeCommand("vscode-objectscript.compile");
         return importAndCompile(false, file);
       }
     }
@@ -408,6 +415,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
       ) {
         fireOtherStudioAction(OtherStudioAction.AttemptedEdit, event.document.uri);
       }
+      if (!event.document.isDirty) {
+        checkChangedOnServer(currentFile(event.document));
+      }
     }),
     window.onDidChangeActiveTextEditor((editor) => {
       if (editor) {
diff --git a/src/providers/FileSystemPovider/FileSystemProvider.ts b/src/providers/FileSystemPovider/FileSystemProvider.ts
@@ -122,6 +122,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
               {
                 content: [content.toString("base64")],
                 enc: true,
+                mtime: Date.now(),
               },
               false
             );
@@ -134,6 +135,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
               {
                 content: [`Class ${className} {}`],
                 enc: false,
+                mtime: Date.now(),
               },
               false
             );
@@ -146,6 +148,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
               {
                 content: [`ROUTINE ${routineName} ${routineType}`],
                 enc: false,
+                mtime: Date.now(),
               },
               false
             );
@@ -249,8 +252,8 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
             name,
             fileName,
             ts,
-            Array.isArray(content) ? content.join("\n").length : content.length,
-            Array.isArray(content) ? content.join("\n") : content
+            Array.isArray(content) ? content.join("\n").length : String(content).length,
+            Array.isArray(content) ? content.join("\n") : String(content)
           )
       )
       .then((entry) =>
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -20,6 +20,8 @@ export interface CurrentFile {
   content: string;
   uri: vscode.Uri;
   eol: vscode.EndOfLine;
+  workspaceFolder: string;
+  uniqueId: string;
 }
 
 export function currentFile(document?: vscode.TextDocument): CurrentFile {
@@ -67,13 +69,17 @@ export function currentFile(document?: vscode.TextDocument): CurrentFile {
     return null;
   }
   name += ext ? "." + ext.toLowerCase() : "";
+  const workspaceFolder = currentWorkspaceFolder(document);
+  const uniqueId = `${workspaceFolder}:${name}`;
 
   return {
     content,
     fileName,
     name,
     uri,
     eol,
+    workspaceFolder,
+    uniqueId,
   };
 }
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ export interface Document {`
`31`	`31`	`status: string;`
`32`	`32`	`enc: boolean;`
`33`	`33`	`flags: number;`
`34`		`- content: string[];`
	`34`	`+ content: string[] \| Buffer;`
`35`	`35`	`ext: string;`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ class StudioActions {`
`352`	`352`	`const query = "select * from %Atelier_v1_Utils.Extension_GetStatus(?)";`
`353`	`353`	`this.api.actionQuery(query, [this.name]).then((statusObj) => {`
`354`	`354`	`const docStatus = statusObj.result.content.pop();`
`355`		`- if (!docStatus.editable) {`
	`355`	`+ if (docStatus && !docStatus.editable) {`
`356`	`356`	`vscode.commands.executeCommand("undo");`
`357`	`357`	`this.userAction(actionObject, false, "", "", 1);`
`358`	`358`	`}`