@electron-forge/publisher-nucleus 6.0.0 → 6.0.2

package/LICENSE

@@ -0,0 +1,19 @@
+The MIT License (MIT)
+Copyright (c) 2016 Samuel Attard
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electron-forge/publisher-nucleus",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "description": "Nucleus publisher for Electron Forge",
   "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
@@ -15,11 +15,14 @@
     "node": ">= 14.17.5"
   },
   "dependencies": {
-    "@electron-forge/async-ora": "6.0.0",
-    "@electron-forge/publisher-base": "6.0.0",
-    "@electron-forge/shared-types": "6.0.0",
+    "@electron-forge/publisher-base": "^6.0.2",
+    "@electron-forge/shared-types": "^6.0.2",
     "debug": "^4.3.1",
     "form-data": "^4.0.0",
     "node-fetch": "^2.6.7"
-  }
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "11cf4b58359c9881c05c06e0d62be575a0ed70d1"
 }

package/src/Config.ts

@@ -0,0 +1,18 @@
+export interface PublisherNucleusConfig {
+  /**
+   * Hostname (with https?://) of your instance of Nucleus
+   */
+  host: string;
+  /**
+   * App ID of your target application in Nucleus
+   */
+  appId: number;
+  /**
+   * Channel ID of your target application in Nucleus
+   */
+  channelId: string;
+  /**
+   * Authentication token for your app, you can find this on the Nucleus web UI
+   */
+  token: string;
+}

package/src/PublisherNucleus.ts

@@ -0,0 +1,69 @@
+import fs from 'fs';
+import path from 'path';
+
+import { PublisherBase, PublisherOptions } from '@electron-forge/publisher-base';
+import debug from 'debug';
+import FormData from 'form-data';
+import fetch from 'node-fetch';
+
+import { PublisherNucleusConfig } from './Config';
+
+const d = debug('electron-forge:publish:nucleus');
+
+export default class PublisherNucleus extends PublisherBase<PublisherNucleusConfig> {
+  name = 'nucleus';
+
+  private collapseMakeResults = (makeResults: PublisherOptions['makeResults']) => {
+    const newMakeResults: typeof makeResults = [];
+    for (const result of makeResults) {
+      const existingResult = newMakeResults.find(
+        (nResult) => nResult.arch === result.arch && nResult.platform === result.platform && nResult.packageJSON.version === result.packageJSON.version
+      );
+      if (existingResult) {
+        existingResult.artifacts.push(...result.artifacts);
+      } else {
+        newMakeResults.push({ ...result });
+      }
+    }
+    return newMakeResults;
+  };
+
+  async publish({ makeResults, setStatusLine }: PublisherOptions): Promise<void> {
+    const { config } = this;
+
+    const collapsedResults = this.collapseMakeResults(makeResults);
+
+    for (const [resultIdx, makeResult] of collapsedResults.entries()) {
+      const msg = `Uploading distributable (${resultIdx + 1}/${collapsedResults.length})`;
+      d(msg);
+
+      setStatusLine(msg);
+      const data = new FormData();
+      data.append('platform', makeResult.platform);
+      data.append('arch', makeResult.arch);
+      data.append('version', makeResult.packageJSON.version);
+
+      let artifactIdx = 0;
+      for (const artifactPath of makeResult.artifacts) {
+        // Skip the RELEASES file, it is automatically generated on the server
+        if (path.basename(artifactPath).toLowerCase() === 'releases') continue;
+        data.append(`file${artifactIdx}`, fs.createReadStream(artifactPath));
+        artifactIdx += 1;
+      }
+
+      const response = await fetch(`${config.host}/rest/app/${config.appId}/channel/${config.channelId}/upload`, {
+        headers: {
+          Authorization: config.token,
+        },
+        method: 'POST',
+        body: data,
+      });
+
+      if (response.status !== 200) {
+        throw new Error(`Unexpected response code from Nucleus: ${response.status}\n\nBody:\n${await response.text()}`);
+      }
+    }
+  }
+}
+
+export { PublisherNucleus, PublisherNucleusConfig };

package/tsconfig.json

@@ -29,9 +29,6 @@
     "tmpl"
   ],
   "references": [
-    {
-      "path": "../../utils/async-ora"
-    },
     {
       "path": "../base"
     },

package/dist/Config.d.ts

@@ -1,19 +0,0 @@
-export interface PublisherNucleusConfig {
-    /**
-     * Hostname (with https?://) of your instance of Nucleus
-     */
-    host: string;
-    /**
-     * App ID of your target application in Nucleus
-     */
-    appId: number;
-    /**
-     * Channel ID of your target application in Nucleus
-     */
-    channelId: string;
-    /**
-     * Authentication token for your app, you can find this on the Nucleus web UI
-     */
-    token: string;
-}
-//# sourceMappingURL=Config.d.ts.map

package/dist/Config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../src/Config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf"}

package/dist/Config.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dist/PublisherNucleus.d.ts

@@ -1,9 +0,0 @@
-import { PublisherBase, PublisherOptions } from '@electron-forge/publisher-base';
-import { PublisherNucleusConfig } from './Config';
-export default class PublisherNucleus extends PublisherBase<PublisherNucleusConfig> {
-    name: string;
-    private collapseMakeResults;
-    publish({ makeResults }: PublisherOptions): Promise<void>;
-}
-export { PublisherNucleus, PublisherNucleusConfig };
-//# sourceMappingURL=PublisherNucleus.d.ts.map

package/dist/PublisherNucleus.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PublisherNucleus.d.ts","sourceRoot":"","sources":["../src/PublisherNucleus.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAKjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAIlD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,aAAa,CAAC,sBAAsB,CAAC;IACjF,IAAI,SAAa;IAEjB,OAAO,CAAC,mBAAmB,CAazB;IAEI,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAqChE;AAED,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/PublisherNucleus.js

@@ -1,81 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "PublisherNucleusConfig", {
-    enumerable: true,
-    get: function() {
-        return _config.PublisherNucleusConfig;
-    }
-});
-exports.PublisherNucleus = exports.default = void 0;
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
-var _asyncOra = require("@electron-forge/async-ora");
-var _publisherBase = require("@electron-forge/publisher-base");
-var _debug = _interopRequireDefault(require("debug"));
-var _formData = _interopRequireDefault(require("form-data"));
-var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-var _config = require("./Config");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-const d = (0, _debug).default('electron-forge:publish:nucleus');
-class PublisherNucleus extends _publisherBase.PublisherBase {
-    async publish({ makeResults  }) {
-        const { config  } = this;
-        const collapsedResults = this.collapseMakeResults(makeResults);
-        for (const [resultIdx, makeResult] of collapsedResults.entries()){
-            const msg = `Uploading result (${resultIdx + 1}/${collapsedResults.length})`;
-            d(msg);
-            await (0, _asyncOra).asyncOra(msg, async ()=>{
-                const data = new _formData.default();
-                data.append('platform', makeResult.platform);
-                data.append('arch', makeResult.arch);
-                data.append('version', makeResult.packageJSON.version);
-                let artifactIdx = 0;
-                for (const artifactPath of makeResult.artifacts){
-                    // Skip the RELEASES file, it is automatically generated on the server
-                    if (_path.default.basename(artifactPath).toLowerCase() === 'releases') continue;
-                    data.append(`file${artifactIdx}`, _fs.default.createReadStream(artifactPath));
-                    artifactIdx += 1;
-                }
-                const response = await (0, _nodeFetch).default(`${config.host}/rest/app/${config.appId}/channel/${config.channelId}/upload`, {
-                    headers: {
-                        Authorization: config.token
-                    },
-                    method: 'POST',
-                    body: data
-                });
-                if (response.status !== 200) {
-                    throw new Error(`Unexpected response code from Nucleus: ${response.status}\n\nBody:\n${await response.text()}`);
-                }
-            });
-        }
-    }
-    constructor(...args){
-        super(...args);
-        this.name = 'nucleus';
-        this.collapseMakeResults = (makeResults)=>{
-            const newMakeResults = [];
-            for (const result of makeResults){
-                const existingResult = newMakeResults.find((nResult)=>nResult.arch === result.arch && nResult.platform === result.platform && nResult.packageJSON.version === result.packageJSON.version
-                );
-                if (existingResult) {
-                    existingResult.artifacts.push(...result.artifacts);
-                } else {
-                    newMakeResults.push({
-                        ...result
-                    });
-                }
-            }
-            return newMakeResults;
-        };
-    }
-}
-exports.default = PublisherNucleus;
-exports.PublisherNucleus = PublisherNucleus;
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9QdWJsaXNoZXJOdWNsZXVzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBmcyBmcm9tICdmcyc7XG5pbXBvcnQgcGF0aCBmcm9tICdwYXRoJztcblxuaW1wb3J0IHsgYXN5bmNPcmEgfSBmcm9tICdAZWxlY3Ryb24tZm9yZ2UvYXN5bmMtb3JhJztcbmltcG9ydCB7IFB1Ymxpc2hlckJhc2UsIFB1Ymxpc2hlck9wdGlvbnMgfSBmcm9tICdAZWxlY3Ryb24tZm9yZ2UvcHVibGlzaGVyLWJhc2UnO1xuaW1wb3J0IGRlYnVnIGZyb20gJ2RlYnVnJztcbmltcG9ydCBGb3JtRGF0YSBmcm9tICdmb3JtLWRhdGEnO1xuaW1wb3J0IGZldGNoIGZyb20gJ25vZGUtZmV0Y2gnO1xuXG5pbXBvcnQgeyBQdWJsaXNoZXJOdWNsZXVzQ29uZmlnIH0gZnJvbSAnLi9Db25maWcnO1xuXG5jb25zdCBkID0gZGVidWcoJ2VsZWN0cm9uLWZvcmdlOnB1Ymxpc2g6bnVjbGV1cycpO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBQdWJsaXNoZXJOdWNsZXVzIGV4dGVuZHMgUHVibGlzaGVyQmFzZTxQdWJsaXNoZXJOdWNsZXVzQ29uZmlnPiB7XG4gIG5hbWUgPSAnbnVjbGV1cyc7XG5cbiAgcHJpdmF0ZSBjb2xsYXBzZU1ha2VSZXN1bHRzID0gKG1ha2VSZXN1bHRzOiBQdWJsaXNoZXJPcHRpb25zWydtYWtlUmVzdWx0cyddKSA9PiB7XG4gICAgY29uc3QgbmV3TWFrZVJlc3VsdHM6IHR5cGVvZiBtYWtlUmVzdWx0cyA9IFtdO1xuICAgIGZvciAoY29uc3QgcmVzdWx0IG9mIG1ha2VSZXN1bHRzKSB7XG4gICAgICBjb25zdCBleGlzdGluZ1Jlc3VsdCA9IG5ld01ha2VSZXN1bHRzLmZpbmQoXG4gICAgICAgIChuUmVzdWx0KSA9PiBuUmVzdWx0LmFyY2ggPT09IHJlc3VsdC5hcmNoICYmIG5SZXN1bHQucGxhdGZvcm0gPT09IHJlc3VsdC5wbGF0Zm9ybSAmJiBuUmVzdWx0LnBhY2thZ2VKU09OLnZlcnNpb24gPT09IHJlc3VsdC5wYWNrYWdlSlNPTi52ZXJzaW9uXG4gICAgICApO1xuICAgICAgaWYgKGV4aXN0aW5nUmVzdWx0KSB7XG4gICAgICAgIGV4aXN0aW5nUmVzdWx0LmFydGlmYWN0cy5wdXNoKC4uLnJlc3VsdC5hcnRpZmFjdHMpO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgbmV3TWFrZVJlc3VsdHMucHVzaCh7IC4uLnJlc3VsdCB9KTtcbiAgICAgIH1cbiAgICB9XG4gICAgcmV0dXJuIG5ld01ha2VSZXN1bHRzO1xuICB9O1xuXG4gIGFzeW5jIHB1Ymxpc2goeyBtYWtlUmVzdWx0cyB9OiBQdWJsaXNoZXJPcHRpb25zKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgY29uc3QgeyBjb25maWcgfSA9IHRoaXM7XG5cbiAgICBjb25zdCBjb2xsYXBzZWRSZXN1bHRzID0gdGhpcy5jb2xsYXBzZU1ha2VSZXN1bHRzKG1ha2VSZXN1bHRzKTtcblxuICAgIGZvciAoY29uc3QgW3Jlc3VsdElkeCwgbWFrZVJlc3VsdF0gb2YgY29sbGFwc2VkUmVzdWx0cy5lbnRyaWVzKCkpIHtcbiAgICAgIGNvbnN0IG1zZyA9IGBVcGxvYWRpbmcgcmVzdWx0ICgke3Jlc3VsdElkeCArIDF9LyR7Y29sbGFwc2VkUmVzdWx0cy5sZW5ndGh9KWA7XG4gICAgICBkKG1zZyk7XG5cbiAgICAgIGF3YWl0IGFzeW5jT3JhKG1zZywgYXN5bmMgKCkgPT4ge1xuICAgICAgICBjb25zdCBkYXRhID0gbmV3IEZvcm1EYXRhKCk7XG4gICAgICAgIGRhdGEuYXBwZW5kKCdwbGF0Zm9ybScsIG1ha2VSZXN1bHQucGxhdGZvcm0pO1xuICAgICAgICBkYXRhLmFwcGVuZCgnYXJjaCcsIG1ha2VSZXN1bHQuYXJjaCk7XG4gICAgICAgIGRhdGEuYXBwZW5kKCd2ZXJzaW9uJywgbWFrZVJlc3VsdC5wYWNrYWdlSlNPTi52ZXJzaW9uKTtcblxuICAgICAgICBsZXQgYXJ0aWZhY3RJZHggPSAwO1xuICAgICAgICBmb3IgKGNvbnN0IGFydGlmYWN0UGF0aCBvZiBtYWtlUmVzdWx0LmFydGlmYWN0cykge1xuICAgICAgICAgIC8vIFNraXAgdGhlIFJFTEVBU0VTIGZpbGUsIGl0IGlzIGF1dG9tYXRpY2FsbHkgZ2VuZXJhdGVkIG9uIHRoZSBzZXJ2ZXJcbiAgICAgICAgICBpZiAocGF0aC5iYXNlbmFtZShhcnRpZmFjdFBhdGgpLnRvTG93ZXJDYXNlKCkgPT09ICdyZWxlYXNlcycpIGNvbnRpbnVlO1xuICAgICAgICAgIGRhdGEuYXBwZW5kKGBmaWxlJHthcnRpZmFjdElkeH1gLCBmcy5jcmVhdGVSZWFkU3RyZWFtKGFydGlmYWN0UGF0aCkpO1xuICAgICAgICAgIGFydGlmYWN0SWR4ICs9IDE7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCByZXNwb25zZSA9IGF3YWl0IGZldGNoKGAke2NvbmZpZy5ob3N0fS9yZXN0L2FwcC8ke2NvbmZpZy5hcHBJZH0vY2hhbm5lbC8ke2NvbmZpZy5jaGFubmVsSWR9L3VwbG9hZGAsIHtcbiAgICAgICAgICBoZWFkZXJzOiB7XG4gICAgICAgICAgICBBdXRob3JpemF0aW9uOiBjb25maWcudG9rZW4sXG4gICAgICAgICAgfSxcbiAgICAgICAgICBtZXRob2Q6ICdQT1NUJyxcbiAgICAgICAgICBib2R5OiBkYXRhLFxuICAgICAgICB9KTtcblxuICAgICAgICBpZiAocmVzcG9uc2Uuc3RhdHVzICE9PSAyMDApIHtcbiAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYFVuZXhwZWN0ZWQgcmVzcG9uc2UgY29kZSBmcm9tIE51Y2xldXM6ICR7cmVzcG9uc2Uuc3RhdHVzfVxcblxcbkJvZHk6XFxuJHthd2FpdCByZXNwb25zZS50ZXh0KCl9YCk7XG4gICAgICAgIH1cbiAgICAgIH0pO1xuICAgIH1cbiAgfVxufVxuXG5leHBvcnQgeyBQdWJsaXNoZXJOdWNsZXVzLCBQdWJsaXNoZXJOdWNsZXVzQ29uZmlnIH07XG4iXSwibmFtZXMiOlsiUHVibGlzaGVyTnVjbGV1c0NvbmZpZyIsImQiLCJkZWJ1ZyIsIlB1Ymxpc2hlck51Y2xldXMiLCJQdWJsaXNoZXJCYXNlIiwicHVibGlzaCIsIm1ha2VSZXN1bHRzIiwiY29uZmlnIiwiY29sbGFwc2VkUmVzdWx0cyIsImNvbGxhcHNlTWFrZVJlc3VsdHMiLCJyZXN1bHRJZHgiLCJtYWtlUmVzdWx0IiwiZW50cmllcyIsIm1zZyIsImxlbmd0aCIsImFzeW5jT3JhIiwiZGF0YSIsIkZvcm1EYXRhIiwiYXBwZW5kIiwicGxhdGZvcm0iLCJhcmNoIiwicGFja2FnZUpTT04iLCJ2ZXJzaW9uIiwiYXJ0aWZhY3RJZHgiLCJhcnRpZmFjdFBhdGgiLCJhcnRpZmFjdHMiLCJwYXRoIiwiYmFzZW5hbWUiLCJ0b0xvd2VyQ2FzZSIsImZzIiwiY3JlYXRlUmVhZFN0cmVhbSIsInJlc3BvbnNlIiwiZmV0Y2giLCJob3N0IiwiYXBwSWQiLCJjaGFubmVsSWQiLCJoZWFkZXJzIiwiQXV0aG9yaXphdGlvbiIsInRva2VuIiwibWV0aG9kIiwiYm9keSIsInN0YXR1cyIsIkVycm9yIiwidGV4dCIsIm5hbWUiLCJuZXdNYWtlUmVzdWx0cyIsInJlc3VsdCIsImV4aXN0aW5nUmVzdWx0IiwiZmluZCIsIm5SZXN1bHQiLCJwdXNoIl0sIm1hcHBpbmdzIjoiOzs7OytCQXNFMkJBLENBQXNCOzs7ZUFBdEJBLE9BQXNCOzs7O0FBdEVsQyxHQUFJLENBQUosR0FBSTtBQUNGLEdBQU0sQ0FBTixLQUFNO0FBRUUsR0FBMkIsQ0FBM0IsU0FBMkI7QUFDSixHQUFnQyxDQUFoQyxjQUFnQztBQUM5RCxHQUFPLENBQVAsTUFBTztBQUNKLEdBQVcsQ0FBWCxTQUFXO0FBQ2QsR0FBWSxDQUFaLFVBQVk7QUFFUyxHQUFVLENBQVYsT0FBVTs7Ozs7O0FBRWpELEtBQUssQ0FBQ0MsQ0FBQyxPQUFHQyxNQUFLLFVBQUMsQ0FBZ0M7TUFFM0JDLGdCQUFnQixTQUFTQyxjQUFhO1VBa0JuREMsT0FBTyxDQUFDLENBQUMsQ0FBQ0MsV0FBVyxFQUFtQixDQUFDLEVBQWlCLENBQUM7UUFDL0QsS0FBSyxDQUFDLENBQUMsQ0FBQ0MsTUFBTSxFQUFDLENBQUMsR0FBRyxJQUFJO1FBRXZCLEtBQUssQ0FBQ0MsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDQyxtQkFBbUIsQ0FBQ0gsV0FBVztRQUU3RCxHQUFHLEVBQUUsS0FBSyxFQUFFSSxTQUFTLEVBQUVDLFVBQVUsS0FBS0gsZ0JBQWdCLENBQUNJLE9BQU8sR0FBSSxDQUFDO1lBQ2pFLEtBQUssQ0FBQ0MsR0FBRyxJQUFJLGtCQUFrQixFQUFFSCxTQUFTLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRUYsZ0JBQWdCLENBQUNNLE1BQU0sQ0FBQyxDQUFDO1lBQzNFYixDQUFDLENBQUNZLEdBQUc7WUFFTCxLQUFLLEtBQUNFLFNBQVEsV0FBQ0YsR0FBRyxZQUFjLENBQUM7Z0JBQy9CLEtBQUssQ0FBQ0csSUFBSSxHQUFHLEdBQUcsQ0FBQ0MsU0FBUTtnQkFDekJELElBQUksQ0FBQ0UsTUFBTSxDQUFDLENBQVUsV0FBRVAsVUFBVSxDQUFDUSxRQUFRO2dCQUMzQ0gsSUFBSSxDQUFDRSxNQUFNLENBQUMsQ0FBTSxPQUFFUCxVQUFVLENBQUNTLElBQUk7Z0JBQ25DSixJQUFJLENBQUNFLE1BQU0sQ0FBQyxDQUFTLFVBQUVQLFVBQVUsQ0FBQ1UsV0FBVyxDQUFDQyxPQUFPO2dCQUVyRCxHQUFHLENBQUNDLFdBQVcsR0FBRyxDQUFDO2dCQUNuQixHQUFHLEVBQUUsS0FBSyxDQUFDQyxZQUFZLElBQUliLFVBQVUsQ0FBQ2MsU0FBUyxDQUFFLENBQUM7b0JBQ2hELEVBQXNFLEFBQXRFLG9FQUFzRTtvQkFDdEUsRUFBRSxFQUFFQyxLQUFJLFNBQUNDLFFBQVEsQ0FBQ0gsWUFBWSxFQUFFSSxXQUFXLE9BQU8sQ0FBVSxXQUFFLFFBQVE7b0JBQ3RFWixJQUFJLENBQUNFLE1BQU0sRUFBRSxJQUFJLEVBQUVLLFdBQVcsSUFBSU0sR0FBRSxTQUFDQyxnQkFBZ0IsQ0FBQ04sWUFBWTtvQkFDbEVELFdBQVcsSUFBSSxDQUFDO2dCQUNsQixDQUFDO2dCQUVELEtBQUssQ0FBQ1EsUUFBUSxHQUFHLEtBQUssS0FBQ0MsVUFBSyxhQUFJekIsTUFBTSxDQUFDMEIsSUFBSSxDQUFDLFVBQVUsRUFBRTFCLE1BQU0sQ0FBQzJCLEtBQUssQ0FBQyxTQUFTLEVBQUUzQixNQUFNLENBQUM0QixTQUFTLENBQUMsT0FBTyxHQUFHLENBQUM7b0JBQzFHQyxPQUFPLEVBQUUsQ0FBQzt3QkFDUkMsYUFBYSxFQUFFOUIsTUFBTSxDQUFDK0IsS0FBSztvQkFDN0IsQ0FBQztvQkFDREMsTUFBTSxFQUFFLENBQU07b0JBQ2RDLElBQUksRUFBRXhCLElBQUk7Z0JBQ1osQ0FBQztnQkFFRCxFQUFFLEVBQUVlLFFBQVEsQ0FBQ1UsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDO29CQUM1QixLQUFLLENBQUMsR0FBRyxDQUFDQyxLQUFLLEVBQUUsdUNBQXVDLEVBQUVYLFFBQVEsQ0FBQ1UsTUFBTSxDQUFDLFdBQVcsRUFBRSxLQUFLLENBQUNWLFFBQVEsQ0FBQ1ksSUFBSTtnQkFDNUcsQ0FBQztZQUNILENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQzs7O1FBdERZLElBdURkLENBdERDQyxJQUFJLEdBQUcsQ0FBUztRQURILElBdURkLENBcERTbkMsbUJBQW1CLElBQUlILFdBQTRDLEdBQUssQ0FBQztZQUMvRSxLQUFLLENBQUN1QyxjQUFjLEdBQXVCLENBQUMsQ0FBQztZQUM3QyxHQUFHLEVBQUUsS0FBSyxDQUFDQyxNQUFNLElBQUl4QyxXQUFXLENBQUUsQ0FBQztnQkFDakMsS0FBSyxDQUFDeUMsY0FBYyxHQUFHRixjQUFjLENBQUNHLElBQUksRUFDdkNDLE9BQU8sR0FBS0EsT0FBTyxDQUFDN0IsSUFBSSxLQUFLMEIsTUFBTSxDQUFDMUIsSUFBSSxJQUFJNkIsT0FBTyxDQUFDOUIsUUFBUSxLQUFLMkIsTUFBTSxDQUFDM0IsUUFBUSxJQUFJOEIsT0FBTyxDQUFDNUIsV0FBVyxDQUFDQyxPQUFPLEtBQUt3QixNQUFNLENBQUN6QixXQUFXLENBQUNDLE9BQU87O2dCQUVqSixFQUFFLEVBQUV5QixjQUFjLEVBQUUsQ0FBQztvQkFDbkJBLGNBQWMsQ0FBQ3RCLFNBQVMsQ0FBQ3lCLElBQUksSUFBSUosTUFBTSxDQUFDckIsU0FBUztnQkFDbkQsQ0FBQyxNQUFNLENBQUM7b0JBQ05vQixjQUFjLENBQUNLLElBQUksQ0FBQyxDQUFDOzJCQUFJSixNQUFNO29CQUFDLENBQUM7Z0JBQ25DLENBQUM7WUFDSCxDQUFDO1lBQ0QsTUFBTSxDQUFDRCxjQUFjO1FBQ3ZCLENBQUM7OztrQkFoQmtCMUMsZ0JBQWdCO1FBeUQ1QkEsZ0JBQWdCLEdBQWhCQSxnQkFBZ0IifQ==