Asyncified

Author: lobrien

quickstart/AzureSearchClient.js

@@ -5,25 +5,33 @@ class AzureSearchClient {
         this.searchServiceHelper = searchServiceHelper;
     }
 
-    indexExists() { 
+    async indexExistsAsync() { 
         console.log("\n Checking if index exists...");
         const endpoint = this.searchServiceHelper.getIndexExistsUrl();
-        this.searchServiceHelper.request(endpoint, "GET", null)
-        .then((response) => {
-            return response.status == 200;
-        });
+        const response = await this.searchServiceHelper.request(endpoint, "GET", null);
+        console.log(`The response was ${response}`);
+        // Success has a few likely status codes: 200 or 204 (No Content), but accept all in 200 range...
+        const exists = response.status >= 200 && response.status < 300;
+        console.log(`Index exists? ${exists}`);
+        return exists;
     }
 
-    createIndex(definition) {
+    async deleteIndexAsync() {
+        console.log("\n Deleting existing index...");
+        const endpoint = this.searchServiceHelper.getIndexExistsUrl();
+        const response = await this.searchServiceHelper.request(endpoint, "DELETE", null);
+        this.searchServiceHelper.throwOnHttpError(response.status);
+        return this;
+    }
+
+    async createIndexAsync(definition) {
         console.log("\n Creating index...");
         const endpoint = this.searchServiceHelper.getCreateIndexUrl();
 
-        this.searchServiceHelper.request(endpoint, "PUT", definition)
-        .then((response) => {
-            console.log(response);
-            this.searchServiceHelper.throwOnHttpError(response.status);
-        });
-
+        const response = await this.searchServiceHelper.request(endpoint, "PUT", definition);
+        console.log(response);
+        this.searchServiceHelper.throwOnHttpError(response.status);
+        return this;
     }
 }
 

quickstart/SearchServiceHelper.js

@@ -6,7 +6,6 @@ class SearchServiceHelper {
         this.apiKey = apiKey;
         this.indexName = indexName;
         this.apiVersion = '2019-05-06';
-        console.log(`${searchServiceName} | ${this.searchServiceName}`);
     }
 
     _indexUrl() { return `https://${this.searchServiceName}.search.windows.net/indexes/${this.indexName}?api-version=${this.apiVersion}`; }
@@ -17,13 +16,12 @@ class SearchServiceHelper {
     getSearchURL(searchTerm) { return `https://${this.searchServiceName}.search.windows.net/indexes/${this.indexName}/docs?api-version=${this.apiVersion}&search=${searchTerm}&searchMode=all`; }
 
 
-    request(url, method, bodyContent = null) {
+    request(url, method, bodyJson = null) {
         const headers = {
             'content-type' : 'application/json',
-            'api-key' : this.apiKey,
-            'proxy' : 'http://127.0.0.1:8888'
+            'api-key' : this.apiKey
         };
-        const init = bodyContent === null ?
+        const init = bodyJson === null ?
             { 
                 method : method, 
                 headers : headers
@@ -32,10 +30,9 @@ class SearchServiceHelper {
             {
                 method : method, 
                 headers : headers,
-                body : JSON.stringify(bodyContent)
+                body : JSON.stringify(bodyJson)
             };
-        console.log(url);
-        console.log(`init = ${init.body}`)
+        console.log(`\n${method} ${url}`);
         return fetch(url, init);
     }
 

quickstart/index.js

@@ -12,17 +12,20 @@ function getAzureConfiguration() {
     return config;
 }
 
-const run = () => {
+const run = async () => {
     try {
         const cfg = getAzureConfiguration();
         const helper = new SearchServiceHelper(cfg.get("serviceName"), cfg.get("apiKey"), "hotels");
         const client = new AzureSearchClient(helper);
-        if (client.indexExists()) {
-            client.deleteIndex();
-         }
-      
+        
+        const exists = await client.indexExistsAsync();
+        await exists ? client.deleteIndexAsync() : Promise.resolve();
         const indexDefinition = require('./hotels_quickstart_index.json');
-        client.createIndex(indexDefinition);
+        await client.createIndexAsync(indexDefinition);
+        queries.forEach(async (query) => { 
+            const result = await client.queryAsync(q);
+            console.log(`Query: ${q} \n ${result}`);
+        })
     } catch (x) {
         console.log(x);
     }