Merge pull request #14 from bitcomposer/master

Added concurrency control to export to spare license use.

Author: daimor

api/index.ts

@@ -3,15 +3,22 @@ import * as httpsModule from 'https';
 import { outputConsole, currentWorkspaceFolder } from '../utils';
 import { config } from '../extension';
 
+const DEFAULT_API_VERSION: number = 3;
+
 export class AtelierAPI {
   private cookies: string[] = [];
   private _config: any;
   private _namespace: string;
+  private static _apiVersion: number;
 
   private get ns(): string {
     return this._namespace || this._config.ns;
   }
 
+  private get apiVersion(): number {
+    return AtelierAPI._apiVersion || DEFAULT_API_VERSION;
+  }
+
   constructor() {
     this.setConnection(currentWorkspaceFolder());
   }
@@ -20,6 +27,10 @@ export class AtelierAPI {
     this._namespace = namespace;
   }
 
+  setApiVersion(apiVersion: number) {
+    AtelierAPI._apiVersion = apiVersion;
+  }
+
   updateCookies(cookies: string[]) {
     cookies.forEach(cookie => {
       let [cookieName] = cookie.split('=');
@@ -134,7 +145,7 @@ export class AtelierAPI {
   serverInfo(): Promise<any> {
     return this.request('GET');
   }
-
+  // api v1+
   getDocNames({
     generated = false,
     category = '*',
@@ -146,63 +157,69 @@ export class AtelierAPI {
     type?: string;
     filter?: string;
   }): Promise<any> {
-    return this.request('GET', `v3/${this.ns}/docnames/${category}/${type}`, null, {
+    return this.request('GET', `v${this.apiVersion}/${this.ns}/docnames/${category}/${type}`, null, {
       filter,
       generated
     });
   }
-
+  // api v1+
   getDoc(name: string, format?: string): Promise<any> {
     let params = {};
     if (format) {
       params = {
         format
       };
     }
-    return this.request('GET', `v3/${this.ns}/doc/${name}`, params);
+    return this.request('GET', `v${this.apiVersion}/${this.ns}/doc/${name}`, params);
   }
-
+  // v1+
   putDoc(name: string, data: { enc: boolean; content: string[] }, ignoreConflict?: boolean): Promise<any> {
     let params = { ignoreConflict };
-    return this.request('PUT', `v3/${this.ns}/doc/${name}`, data, params);
+    return this.request('PUT', `v${this.apiVersion}/${this.ns}/doc/${name}`, data, params);
   }
-
+  // v1+
   actionIndex(docs: string[]): Promise<any> {
-    return this.request('POST', `v3/${this.ns}/action/index`, docs);
+    return this.request('POST', `v${this.apiVersion}/${this.ns}/action/index`, docs);
   }
-
+  // v2+
   actionSearch(params: { query: string; files?: string; sys?: boolean; gen?: boolean; max?: number }): Promise<any> {
-    return this.request('GET', `v3/${this.ns}/action/search`, null, params);
+    return this.apiVersion >= 2 ? 
+      this.request('GET', `v${this.apiVersion}/${this.ns}/action/search`, null, params) : 
+      Promise.reject(`Method 'search' not supported by API version ${this.apiVersion}`);
   }
-
+  // v1+
   actionQuery(query: string, parameters: string[]): Promise<any> {
-    return this.request('POST', `v3/${this.ns}/action/query`, {
+    return this.request('POST', `v${this.apiVersion}/${this.ns}/action/query`, {
       query,
       parameters
     });
   }
-
+  // v1+
   actionCompile(docs: string[], flags?: string, source = false): Promise<any> {
-    return this.request('POST', `v3/${this.ns}/action/compile`, docs, { flags, source });
+    return this.request('POST', `v${this.apiVersion}/${this.ns}/action/compile`, docs, { flags, source });
   }
 
   cvtXmlUdl(source: string): Promise<any> {
-    return this.request('POST', `v3/${this.ns}/cvt/xml/doc`, source, {}, { 'Content-Type': 'application/xml' });
+    return this.request('POST', `v${this.apiVersion}/${this.ns}/cvt/xml/doc`, source, {}, { 'Content-Type': 'application/xml' });
   }
-
+  // v2+
   getmacrodefinition(docname: string, macroname: string, includes: string[]) {
-    return this.request('POST', `v3/${this.ns}/action/getmacrodefinition`, {
-      docname,
-      macroname,
-      includes
-    });
-  }
-
+    return this.apiVersion >= 2 ? 
+      this.request('POST', `v${this.apiVersion}/${this.ns}/action/getmacrodefinition`, {
+        docname,
+        macroname,
+        includes
+      }) :
+      Promise.reject(`Method 'getmacrodefinition' not supported by API version ${this.apiVersion}`);
+  }
+  // v2+
   getmacrolocation(docname: string, macroname: string, includes: string[]) {
-    return this.request('POST', `v3/${this.ns}/action/getmacrolocation`, {
-      docname,
-      macroname,
-      includes
-    });
+    return this.apiVersion >= 2 ? 
+      this.request('POST', `v${this.apiVersion}/${this.ns}/action/getmacrolocation`, {
+        docname,
+        macroname,
+        includes
+      }) :
+      Promise.reject(`Method 'getmacrolocation' not supported by API version ${this.apiVersion}`);
   }
 }

commands/export.ts

@@ -7,6 +7,7 @@ import { PackageNode } from '../explorer/models/packageNode';
 import { ClassNode } from '../explorer/models/classesNode';
 import { RoutineNode } from '../explorer/models/routineNode';
 import { config } from '../extension';
+import Bottleneck from 'bottleneck';
 
 const filesFilter = (file: any) => {
   if (file.cat === 'CSP' || file.name.startsWith('%') || file.name.startsWith('INFORMATION.')) {
@@ -52,7 +53,7 @@ export async function exportFile(name: string, fileName: string): Promise<any> {
               }
               const storageContent = storageData.result.content;
 
-              if (storageContent.length>1 && storageContent[0]) {
+              if (storageContent.length > 1 && storageContent[0] && storageContent.length < content.length) {
                 const storageContentString = storageContent.join("\n");
                 const contentString = content.join("\n");
 
@@ -102,8 +103,19 @@ export async function exportList(files: string[]): Promise<any> {
   if (!files || !files.length) {
     vscode.window.showWarningMessage('Nothing to export');
   }
-  const { atelier, folder } = config().get('export');
+  const { atelier, folder, maxConcurrentConnections } = config().get('export');
 
+  if (maxConcurrentConnections > 0) {
+    const limiter = new Bottleneck({
+      maxConcurrent: maxConcurrentConnections
+    });
+    const results = [];
+    for (let i=0;i<files.length;i++) {
+      const result = await limiter.schedule(() => exportFile(files[i], getFileName(folder, files[i], atelier)));
+      results.push(result);
+    }
+    return results;
+  }
   return Promise.all(
     files.map(file => {
       exportFile(file, getFileName(folder, file, atelier));

extension.ts

@@ -29,6 +29,7 @@ import { WorkspaceSymbolProvider } from './providers/WorkspaceSymbolProvider';
 export var explorerProvider: ObjectScriptExplorerProvider;
 export var documentContentProvider: DocumentContentProvider;
 export var workspaceState: vscode.Memento;
+export var extensionContext: vscode.ExtensionContext;
 
 export const config = (config?: string, workspaceFolderName?: string): any => {
   workspaceFolderName = workspaceFolderName || currentWorkspaceFolder();
@@ -62,6 +63,7 @@ export function getXmlUri(uri: vscode.Uri): vscode.Uri {
 export async function activate(context: vscode.ExtensionContext): Promise<void> {
   const languages = require(context.asAbsolutePath('./package.json'))['contributes']['languages'].map(lang => lang.id);
   workspaceState = context.workspaceState;
+  extensionContext = context;
   workspaceState.update('workspaceFolder', '');
 
   explorerProvider = new ObjectScriptExplorerProvider();
@@ -88,6 +90,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
       .serverInfo()
       .then(info => {
         panel.text = `${conn.label}:${conn.ns} - Connected`;
+        if (info && info.result && info.result.content && info.result.content.api > 0) {
+          api.setApiVersion(info.result.content.api);
+        }
         explorerProvider.refresh();
       })
       .catch(error => {

package-lock.json

@@ -427,6 +427,11 @@
           "description": "Don't update the local file on export if the content is identical to the server code",
           "type": "boolean",
           "default": false
+        },
+        "objectscript.export.maxConcurrentConnections": {
+          "description": "Max Export Connections (0 = Unlimited)",
+          "type": "number",
+          "default": 0
         }
       }
     },
@@ -472,6 +477,7 @@
     "vscode": "^1.1.26"
   },
   "dependencies": {
+    "bottleneck": "^2.16.2",
     "glob": "^7.1.3",
     "vscode-cache": "^0.3.0"
   }