Merge branch 'master' into outline

Author: doublefint

api/index.ts

@@ -0,0 +1,104 @@
+import httpModule = require('http');
+import httpsModule = require('https');
+
+import { ClientResponse } from 'http';
+
+export class AtelierAPI {
+  private http;
+  private url;
+  private agent;
+  private cookies: string[] = [];
+  constructor(
+    private host: string,
+    private port: number,
+    private username: string,
+    private password: string,
+    private ns: string,
+    private secure: boolean
+  ) {
+    this.http = secure ? httpsModule : httpModule;
+    this.agent = new this.http.Agent({ keepAlive: true, maxSockets: 10 });
+  }
+
+  updateCookies(cookies: string[]) {
+    cookies.forEach(cookie => {
+      let [cookieName] = cookie.split('=');
+      let index = this.cookies.findIndex(el => el.startsWith(cookieName));
+      if (index) {
+        this.cookies[index] = cookie;
+      } else {
+        this.cookies.push(cookie);
+      }
+    });
+  }
+
+  request(method: string, path?: string, body?: any): Promise<any> {
+    const headers = {
+      Accept: 'application/json',
+      Cookie: this.cookies
+    };
+    method = method.toUpperCase();
+    if (['PUT', 'POST'].includes(method)) {
+      headers['Content-Type'] = 'application/json';
+    }
+    return new Promise((resolve, reject) => {
+      const req: httpModule.ClientRequest = this.http
+        .request(
+          {
+            method,
+            host: this.host,
+            port: this.port,
+            path: encodeURI(`/api/atelier/${path || ''}`),
+            agent: this.agent,
+            headers,
+            body
+          },
+          (response: ClientResponse) => {
+            if (response.statusCode < 200 || response.statusCode > 299) {
+              reject(new Error('Failed to load page "' + path + '", status code: ' + response.statusCode));
+            }
+            this.updateCookies(response.headers['set-cookie']);
+            // temporary data holder
+            let body: string = '';
+            response.on('data', chunk => {
+              body += chunk;
+            });
+            response.on('end', () => {
+              if (response.headers['content-type'].includes('json')) {
+                body = JSON.parse(body);
+              }
+              resolve(body);
+            });
+          }
+        )
+        .on('error', reject);
+      if (['PUT', 'POST'].includes(method)) {
+        req.write(JSON.stringify(body));
+      }
+      req.end();
+    });
+  }
+
+  serverInfo(): Promise<any> {
+    return this.request('GET');
+  }
+
+  getDocNames({
+    generated = false,
+    category = '*',
+    filter = ''
+  }: {
+    generated: boolean;
+    category: string;
+    filter: string;
+  }): Promise<any> {
+    return this.request(
+      'GET',
+      `v2/${this.ns}/docnames/${category}?generated=${generated ? '1' : '0'}&filter=${filter}`
+    );
+  }
+
+  actionIndex(docs: string[]): Promise<any> {
+    return this.request('POST', `v2/${this.ns}/action/index`, docs);
+  }
+}

extension.ts

@@ -10,6 +10,7 @@ const { CurrentDoc } = require('./commands/currentdoc');
 const IsApiError = require('./is-api-error');
 
 import { ObjectScriptSymbolProvider } from './providers/ObjectScriptSymbolProvider';
+import { AtelierAPI } from './api';
 
 import { COSExplorerProvider } from './explorer/explorer';
 export var cosExplorerProvider: COSExplorerProvider;
@@ -45,8 +46,14 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
   };
 
   let api;
+  let atelierApi: AtelierAPI;
   const Connect = conn => {
     api = API(conn);
+    atelierApi = new AtelierAPI(conn.host, conn.port, conn.username, conn.password, conn.ns, conn.https);
+    atelierApi
+      .serverInfo()
+      .then(info => {})
+      .catch(err => {});
     api.headServer(err => {
       const conn = config.conn();
       if (err) return log('Connection FAILED: ' + conn, err);
@@ -136,9 +143,38 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     api.putDoc(name, { enc: false, content }, { ignoreConflict: true }, compile);
   };
 
+  const viewOther = () => {
+    const { name, error } = currentDoc();
+    if (error) return log(error);
+
+    const getOthers = info => {
+      return info.result.content[0].others;
+    };
+
+    atelierApi
+      .actionIndex([name])
+      .then(info => {
+        const listOthers = getOthers(info) || [];
+        if (!listOthers.length) {
+          return;
+        }
+        if (listOthers.length === 1) {
+          window.showTextDocument(vscode.Uri.parse(encodeURI(`cos:///${listOthers[0]}`)));
+        } else {
+          window.showQuickPick(listOthers).then(item => {
+            window.showTextDocument(vscode.Uri.parse(encodeURI(`cos:///${item}`)));
+          });
+        }
+      })
+      .catch(err => {
+        log('error' + err);
+      });
+  };
+
   context.subscriptions.push(
     vscode.commands.registerCommand('cos.compile', importCompileExport),
     vscode.commands.registerCommand('cos.export', exportAll),
+    vscode.commands.registerCommand('vscode-cos.viewother', viewOther),
     vscode.commands.registerCommand('vscode-cos.explorer.refresh', () => cosExplorerProvider.refresh()),
     vscode.commands.registerCommand('vscode-cos.explorer.openClass', vscode.window.showTextDocument),
     vscode.commands.registerCommand('vscode-cos.explorer.openRoutine', vscode.window.showTextDocument),
@@ -150,7 +186,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
       vscode.commands.executeCommand('setContext', 'vscode-cos.explorer.showSystem', false);
       cosExplorerProvider.showSystem = false;
     }),
-
     vscode.workspace.registerTextDocumentContentProvider('cos', cosExplorerProvider),
     vscode.languages.registerDocumentSymbolProvider(
       {

package.json

@@ -56,7 +56,8 @@
         ],
         "extensions": [
           ".cls",
-          ".mac"
+          ".mac",
+          ".int"
         ],
         "configuration": "./language-configuration.json"
       },
@@ -118,13 +119,24 @@
       {
         "command": "vscode-cos.explorer.openRoutine",
         "title": "Open routine"
+      },
+      {
+        "category": "COS",
+        "command": "vscode-cos.viewother",
+        "title": "View other"
       }
     ],
     "keybindings": [
       {
         "command": "cos.compile",
         "key": "Ctrl+F7",
         "mac": "Cmd+F7"
+      },
+      {
+        "command": "vscode-cos.viewother",
+        "key": "Ctrl+Shift+V",
+        "mac": "Cmd+Shift+V",
+        "when": "editorLangId == 'cacheobjectscript'"
       }
     ],
     "configuration": {