@miso.ai/client-sdk-core 1.7.0-beta.3 → 1.7.1-beta.0

package/dist/cjs/api/{answers.js → ask.js}

@@ -10,20 +10,20 @@ const _excluded = ["iterable"],
   _excluded2 = ["pollingInternal"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-class Answers extends _base.default {
+class Ask extends _base.default {
   constructor(api) {
-    super(api, 'answers');
+    super(api, 'ask');
   }
-  async answer(payload) {
+  questions(payload) {
     let _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     let {
         iterable = false
       } = _ref,
       options = _objectWithoutPropertiesLoose(_ref, _excluded);
-    // TODO: it's possible to merge _iterable and _answer
-    return typeof payload === 'string' ? this._get(payload, options) : iterable ? this._iterable(payload, options) : this._answer(payload, options);
+    // TODO: it's possible to merge _iterator and _answer
+    return typeof payload === 'string' ? this._get(payload, options) : iterable ? this._iterator(payload, options) : this._questions(payload, options);
   }
-  async _answer(payload, options) {
+  async _questions(payload, options) {
     return this._run('questions', payload, options);
   }
   async _get(answerId, options) {
@@ -31,7 +31,7 @@ class Answers extends _base.default {
       method: 'GET'
     }));
   }
-  _iterable(payload) {
+  _iterator(payload) {
     try {
       var _this = this;
       let _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -40,7 +40,7 @@ class Answers extends _base.default {
             pollingInternal = 500
           } = _ref2,
           options = _objectWithoutPropertiesLoose(_ref2, _excluded2);
-        const response = await _this._answer(payload, options);
+        const response = await _this._questions(payload, options);
         yield response;
         const {
           question_id,
@@ -49,9 +49,22 @@ class Answers extends _base.default {
         if (finished) {
           return;
         }
+        let apiErrorCount = 0;
         const buffer = new _commons.ValueBuffer();
         const intervalId = setInterval(async () => {
-          const response = await _this._get(question_id, options);
+          let response;
+          try {
+            response = await _this._get(question_id, options);
+          } catch (error) {
+            apiErrorCount++;
+            if (apiErrorCount > 10) {
+              clearInterval(intervalId);
+              // TODO: cascade to buffer and user
+            }
+
+            console.error(error); // TODO
+            return;
+          }
           const {
             finished
           } = response;
@@ -67,4 +80,4 @@ class Answers extends _base.default {
     }
   }
 }
-exports.default = Answers;
+exports.default = Ask;

package/dist/cjs/api/index.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 var _commons = require("@miso.ai/commons");
 var _helpers = _interopRequireDefault(require("./helpers"));
 var _interactions = _interopRequireDefault(require("./interactions"));
-var _answers = _interopRequireDefault(require("./answers"));
+var _ask = _interopRequireDefault(require("./ask"));
 var _search = _interopRequireDefault(require("./search"));
 var _recommendation = _interopRequireDefault(require("./recommendation"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -17,7 +17,7 @@ class Api extends _commons.Component {
     this._client = client;
     this.helpers = new _helpers.default(client, root);
     this.interactions = new _interactions.default(this);
-    this.answers = new _answers.default(this);
+    this.ask = new _ask.default(this);
     this.search = new _search.default(this);
     this.recommendation = new _recommendation.default(this);
   }

package/dist/cjs/plugin/plugin-root.js

@@ -15,8 +15,10 @@ class PluginRoot extends _commons.Registry {
       keyName: 'id'
     });
     this._root = root;
+    this._currentScript = document.currentScript;
     this._events._replays.add('install').add('subtree');
     this._installed = {};
+    this._installedResolutions = {};
     this._useRequests = {};
     this._subtrees = [];
     this.context = new PluginContext(this, _classes.default);
@@ -60,9 +62,22 @@ class PluginRoot extends _commons.Registry {
     instance = this._instantiate(plugin, options);
     this._install(instance);
   }
-
-  // TODO: unuse()
-
+  async install(plugin, options) {
+    this.use(plugin, options);
+    if (typeof plugin === 'string' && !this.isRegistered(plugin)) {
+      await this._tryRegisterRemotely(plugin);
+    }
+    return this.whenInstalled(plugin);
+  }
+  async whenInstalled(id) {
+    if (this.isInstalled(id)) {
+      return this.get(id);
+    }
+    const {
+      promise
+    } = this._installedResolutions[id] || (this._installedResolutions[id] = new _commons.Resolution());
+    return promise;
+  }
   addSubtree(component) {
     this._subtrees.push(component);
     this._events.emit('subtree', component);
@@ -124,6 +139,10 @@ class PluginRoot extends _commons.Registry {
     if (instance.id) {
       // we don't track anonymous plugins
       this._installed[instance.id] = instance;
+      if (this._installedResolutions[instance.id]) {
+        this._installedResolutions[instance.id].resolve(instance);
+        delete this._installedResolutions[instance.id];
+      }
     }
     this._events.emit('install', instance);
   }
@@ -144,6 +163,33 @@ class PluginRoot extends _commons.Registry {
       delete this._useRequests[id];
     }
   }
+  async _tryRegisterRemotely(id) {
+    if (id.startsWith('std:')) {
+      try {
+        await this._registerStdRemotely(id);
+        return;
+      } catch (e) {
+        console.error(e);
+      }
+    }
+    // TODO: try as URL
+    throw new Error(`Cannot register plugin remotely: ${id}`);
+  }
+  async _registerStdRemotely(id) {
+    // TODO: look up by manifest
+    const pkgName = id.slice(4);
+    const src = this._currentScript.src;
+    const searchIndex = src.indexOf('?');
+    const k = searchIndex < 0 ? src.length : searchIndex;
+    const i = src.lastIndexOf('/', k) + 1;
+    const j = src.indexOf('.', i);
+    const ext = j < 0 ? '' : src.slice(j, k);
+    const script = document.createElement('script');
+    script.async = true;
+    script.src = `${src.slice(0, i)}plugins/${pkgName}${ext}`;
+    document.head.appendChild(script);
+    await this.whenRegistered(id);
+  }
 }
 
 /**
@@ -152,7 +198,7 @@ class PluginRoot extends _commons.Registry {
 exports.default = PluginRoot;
 class PluginContext {
   constructor(root, classes) {
-    (0, _commons.delegateGetters)(this, root, ['getPluginClass', 'addSubtree', 'addPayloadPass', 'addUrlPass']);
+    (0, _commons.delegateGetters)(this, root, ['getPluginClass', 'addSubtree', 'addPayloadPass', 'addUrlPass', 'whenInstalled', 'whenRegistered']);
     (0, _commons.defineValues)(this, {
       classes
     });
@@ -164,6 +210,6 @@ class PluginContext {
  */
 class Plugins {
   constructor(root) {
-    (0, _commons.delegateGetters)(this, root, ['installed', 'registered', 'isInstalled', 'isRegistered', 'get', 'register', 'use']);
+    (0, _commons.delegateGetters)(this, root, ['installed', 'registered', 'isInstalled', 'isRegistered', 'whenInstalled', 'whenRegistered', 'get', 'register', 'use', 'install']);
   }
 }

package/dist/cjs/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = '1.7.0-beta.3';
+var _default = '1.7.1-beta.0';
 exports.default = _default;

package/dist/es/api/{answers.js → ask.js}

@@ -3,20 +3,20 @@ const _excluded = ["iterable"],
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { ValueBuffer } from '@miso.ai/commons';
 import ApiBase from './base';
-export default class Answers extends ApiBase {
+export default class Ask extends ApiBase {
   constructor(api) {
-    super(api, 'answers');
+    super(api, 'ask');
   }
-  async answer(payload) {
+  questions(payload) {
     let _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     let {
         iterable = false
       } = _ref,
       options = _objectWithoutPropertiesLoose(_ref, _excluded);
-    // TODO: it's possible to merge _iterable and _answer
-    return typeof payload === 'string' ? this._get(payload, options) : iterable ? this._iterable(payload, options) : this._answer(payload, options);
+    // TODO: it's possible to merge _iterator and _answer
+    return typeof payload === 'string' ? this._get(payload, options) : iterable ? this._iterator(payload, options) : this._questions(payload, options);
   }
-  async _answer(payload, options) {
+  async _questions(payload, options) {
     return this._run('questions', payload, options);
   }
   async _get(answerId, options) {
@@ -24,7 +24,7 @@ export default class Answers extends ApiBase {
       method: 'GET'
     }));
   }
-  _iterable(payload) {
+  _iterator(payload) {
     try {
       var _this = this;
       let _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -33,7 +33,7 @@ export default class Answers extends ApiBase {
             pollingInternal = 500
           } = _ref2,
           options = _objectWithoutPropertiesLoose(_ref2, _excluded2);
-        const response = await _this._answer(payload, options);
+        const response = await _this._questions(payload, options);
         yield response;
         const {
           question_id,
@@ -42,9 +42,22 @@ export default class Answers extends ApiBase {
         if (finished) {
           return;
         }
+        let apiErrorCount = 0;
         const buffer = new ValueBuffer();
         const intervalId = setInterval(async () => {
-          const response = await _this._get(question_id, options);
+          let response;
+          try {
+            response = await _this._get(question_id, options);
+          } catch (error) {
+            apiErrorCount++;
+            if (apiErrorCount > 10) {
+              clearInterval(intervalId);
+              // TODO: cascade to buffer and user
+            }
+
+            console.error(error); // TODO
+            return;
+          }
           const {
             finished
           } = response;

package/dist/es/api/index.js

@@ -1,7 +1,7 @@
 import { Component } from '@miso.ai/commons';
 import ApiHelpers from './helpers';
 import Interactions from './interactions';
-import Answers from './answers';
+import Ask from './ask';
 import Search from './search';
 import Recommendation from './recommendation';
 export default class Api extends Component {
@@ -10,7 +10,7 @@ export default class Api extends Component {
     this._client = client;
     this.helpers = new ApiHelpers(client, root);
     this.interactions = new Interactions(this);
-    this.answers = new Answers(this);
+    this.ask = new Ask(this);
     this.search = new Search(this);
     this.recommendation = new Recommendation(this);
   }

package/dist/es/plugin/plugin-root.js

@@ -1,4 +1,4 @@
-import { delegateGetters, defineValues, Registry } from '@miso.ai/commons';
+import { delegateGetters, defineValues, Registry, Resolution } from '@miso.ai/commons';
 import classes from '../classes';
 import AnonymousPlugin from './anonymous';
 export default class PluginRoot extends Registry {
@@ -8,8 +8,10 @@ export default class PluginRoot extends Registry {
       keyName: 'id'
     });
     this._root = root;
+    this._currentScript = document.currentScript;
     this._events._replays.add('install').add('subtree');
     this._installed = {};
+    this._installedResolutions = {};
     this._useRequests = {};
     this._subtrees = [];
     this.context = new PluginContext(this, classes);
@@ -53,9 +55,22 @@ export default class PluginRoot extends Registry {
     instance = this._instantiate(plugin, options);
     this._install(instance);
   }
-
-  // TODO: unuse()
-
+  async install(plugin, options) {
+    this.use(plugin, options);
+    if (typeof plugin === 'string' && !this.isRegistered(plugin)) {
+      await this._tryRegisterRemotely(plugin);
+    }
+    return this.whenInstalled(plugin);
+  }
+  async whenInstalled(id) {
+    if (this.isInstalled(id)) {
+      return this.get(id);
+    }
+    const {
+      promise
+    } = this._installedResolutions[id] || (this._installedResolutions[id] = new Resolution());
+    return promise;
+  }
   addSubtree(component) {
     this._subtrees.push(component);
     this._events.emit('subtree', component);
@@ -117,6 +132,10 @@ export default class PluginRoot extends Registry {
     if (instance.id) {
       // we don't track anonymous plugins
       this._installed[instance.id] = instance;
+      if (this._installedResolutions[instance.id]) {
+        this._installedResolutions[instance.id].resolve(instance);
+        delete this._installedResolutions[instance.id];
+      }
     }
     this._events.emit('install', instance);
   }
@@ -137,6 +156,33 @@ export default class PluginRoot extends Registry {
       delete this._useRequests[id];
     }
   }
+  async _tryRegisterRemotely(id) {
+    if (id.startsWith('std:')) {
+      try {
+        await this._registerStdRemotely(id);
+        return;
+      } catch (e) {
+        console.error(e);
+      }
+    }
+    // TODO: try as URL
+    throw new Error(`Cannot register plugin remotely: ${id}`);
+  }
+  async _registerStdRemotely(id) {
+    // TODO: look up by manifest
+    const pkgName = id.slice(4);
+    const src = this._currentScript.src;
+    const searchIndex = src.indexOf('?');
+    const k = searchIndex < 0 ? src.length : searchIndex;
+    const i = src.lastIndexOf('/', k) + 1;
+    const j = src.indexOf('.', i);
+    const ext = j < 0 ? '' : src.slice(j, k);
+    const script = document.createElement('script');
+    script.async = true;
+    script.src = `${src.slice(0, i)}plugins/${pkgName}${ext}`;
+    document.head.appendChild(script);
+    await this.whenRegistered(id);
+  }
 }
 
 /**
@@ -144,7 +190,7 @@ export default class PluginRoot extends Registry {
  */
 class PluginContext {
   constructor(root, classes) {
-    delegateGetters(this, root, ['getPluginClass', 'addSubtree', 'addPayloadPass', 'addUrlPass']);
+    delegateGetters(this, root, ['getPluginClass', 'addSubtree', 'addPayloadPass', 'addUrlPass', 'whenInstalled', 'whenRegistered']);
     defineValues(this, {
       classes
     });
@@ -156,6 +202,6 @@ class PluginContext {
  */
 class Plugins {
   constructor(root) {
-    delegateGetters(this, root, ['installed', 'registered', 'isInstalled', 'isRegistered', 'get', 'register', 'use']);
+    delegateGetters(this, root, ['installed', 'registered', 'isInstalled', 'isRegistered', 'whenInstalled', 'whenRegistered', 'get', 'register', 'use', 'install']);
   }
 }

package/dist/es/version.js

@@ -1 +1 @@
-export default '1.7.0-beta.3';
+export default '1.7.1-beta.0';

package/package.json

@@ -29,7 +29,7 @@
     "url": "https://github.com/MisoAI/miso-client-js-sdk/issues"
   },
   "dependencies": {
-    "@miso.ai/commons": "1.7.0-beta.3"
+    "@miso.ai/commons": "1.7.1-beta.0"
   },
-  "version": "1.7.0-beta.3"
+  "version": "1.7.1-beta.0"
 }