@zgfe/business-lib 1.1.29-visual.6 → 1.1.29-visual.7

package/es/constants/apis.d.ts

@@ -7,5 +7,6 @@ declare const Apis: {
     queryPanelGroup: string;
     queryDatasetList: string;
     queryDatasetDetail: string;
+    getSocketToken: string;
 };
 export default Apis;

package/es/constants/apis.js

@@ -6,6 +6,7 @@ var Apis = {
   updatePanelTarget: '/apppanel/updateElemet.jsp',
   queryPanelGroup: '/apppanel/panels.jsp',
   queryDatasetList: '/zg/web/cdp/inner/dataset/list',
-  queryDatasetDetail: '/zg/web/cdp/inner/dataset/detail'
+  queryDatasetDetail: '/zg/web/cdp/inner/dataset/detail',
+  getSocketToken: '/zg/web/v2/tracking/view/websocket/token'
 };
 export default Apis;

package/es/demoWrapper/content.d.ts

@@ -1,7 +1,8 @@
 import React, { ReactNode } from 'react';
+import { AppInfoProps } from '../context';
 declare const DemoContent: React.FC<{
     children?: ReactNode;
     needMeta?: boolean;
-    currentApp?: number;
+    currentApp?: AppInfoProps;
 }>;
 export default DemoContent;

package/es/demoWrapper/content.js

@@ -82,10 +82,16 @@ var DemoContent = function DemoContent(_ref3) {
     setStore = _useState18[1];
   useEffect(function () {
     if (!needMeta || !currentApp) return;
-    loadUserProps();
-    loadEvents();
-    loadEnvList();
-    loadUserGroup();
+    if (currentApp.appsHasData && currentApp.appsHasData.length) {
+      loadUserProps();
+      loadEvents();
+      loadEnvList();
+      loadUserGroup();
+    } else {
+      setLoadEnv(false);
+      setLoadEvent(false);
+      setLoadUsers(false);
+    }
   }, [currentApp, needMeta]);
   useEffect(function () {
     if (loadEnv || loadEvent || loadUsers || loadUserGroups) return;
@@ -157,10 +163,7 @@ var DemoContent = function DemoContent(_ref3) {
   }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
     value: {
-      currentApp: {
-        appId: currentApp,
-        platform: 0
-      },
+      currentApp: currentApp,
       eventGroupList: store === null || store === void 0 ? void 0 : store.eventGroupList,
       userPropList: store === null || store === void 0 ? void 0 : store.userPropList,
       eventEnvList: store === null || store === void 0 ? void 0 : store.envPropList,

package/es/demoWrapper/demo/index.js

@@ -1,8 +1,9 @@
-import React from 'react';
-import { DemoWrapper } from '@zgfe/business-lib';
+import React, { useContext } from 'react';
+import { DemoWrapper, BizGlobalDataContext } from '@zgfe/business-lib';
 export default (function () {
+  var ctx = useContext(BizGlobalDataContext);
   return /*#__PURE__*/React.createElement(DemoWrapper, {
-    defaultApp: 3,
+    defaultApp: 332,
     needMeta: true
-  }, "xxx");
+  }, JSON.stringify(ctx || {}));
 });

package/es/demoWrapper/head.d.ts

@@ -1,6 +1,8 @@
 import React from 'react';
+import { AppInfoProps } from '../context';
 declare const DemoHeader: React.FC<{
     defaultApp?: number;
-    onChangeApp?: (appId: number) => void;
+    onChangeApp?: (app: AppInfoProps) => void;
+    onLoading?: (loading: boolean) => void;
 }>;
 export default DemoHeader;

package/es/demoWrapper/head.js

@@ -9,7 +9,8 @@ import React, { useEffect, useState } from 'react';
 import request from '../utils/ajax';
 var DemoHeader = function DemoHeader(_ref) {
   var defaultApp = _ref.defaultApp,
-    onChangeApp = _ref.onChangeApp;
+    onChangeApp = _ref.onChangeApp,
+    onLoading = _ref.onLoading;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     appList = _useState2[0],
@@ -21,17 +22,25 @@ var DemoHeader = function DemoHeader(_ref) {
   useEffect(function () {
     queryAppList();
   }, []);
+  useEffect(function () {
+    if (onLoading) onLoading(loading);
+  }, [loading, appList]);
   function queryAppList() {
     setLoading(true);
     request('/analysis/api/common/proxy/data/v2ajaxGetDataByApp.jsp').then(function (res) {
       setAppList(res.applist);
-      if (!defaultApp && res.applist.length) onChange(res.applist[0].id);
+      if (defaultApp) {
+        _onChange(res.applist.find(function (item) {
+          return item.id === defaultApp;
+        }));
+      }
+      if (!defaultApp && res.applist.length) _onChange(res.applist[0]);
     }).finally(function () {
       setLoading(false);
     });
   }
-  function onChange(id) {
-    if (onChangeApp) onChangeApp(id);
+  function _onChange(item) {
+    if (onChangeApp) onChangeApp(item);
   }
   if (loading) return /*#__PURE__*/React.createElement(Skeleton.Input, null);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
@@ -41,7 +50,10 @@ var DemoHeader = function DemoHeader(_ref) {
       label: 'appName',
       value: 'id'
     },
-    onChange: onChange,
+    onChange: function onChange(_id, app) {
+      console.log('默认应用', app);
+      _onChange(app);
+    },
     style: {
       width: '200px'
     }

package/es/demoWrapper/index.js

@@ -20,14 +20,18 @@ var DemoWrapper = function DemoWrapper(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
-  var _useState3 = useState(false),
+  var _useState3 = useState(true),
     _useState4 = _slicedToArray(_useState3, 2),
-    notLogin = _useState4[0],
-    setNotLogin = _useState4[1];
-  var _useState5 = useState(defaultApp),
+    appListLoading = _useState4[0],
+    setAppListLoading = _useState4[1];
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    appId = _useState6[0],
-    setAppId = _useState6[1];
+    notLogin = _useState6[0],
+    setNotLogin = _useState6[1];
+  var _useState7 = useState(),
+    _useState8 = _slicedToArray(_useState7, 2),
+    app = _useState8[0],
+    setApp = _useState8[1];
   useEffect(function () {
     getCurrentUser();
   }, []);
@@ -53,15 +57,19 @@ var DemoWrapper = function DemoWrapper(_ref) {
   return /*#__PURE__*/React.createElement(Card, {
     title: /*#__PURE__*/React.createElement(DemoHeader, {
       defaultApp: defaultApp,
-      onChangeApp: setAppId
+      onChangeApp: setApp,
+      onLoading: setAppListLoading
     }),
     className: className,
     bodyStyle: {
       background: '#FAFAFB'
     }
-  }, /*#__PURE__*/React.createElement(DemoContent, {
-    currentApp: appId,
-    needMeta: needMeta
+  }, appListLoading ? /*#__PURE__*/React.createElement(Spin, {
+    tip: "\u5E94\u7528\u4FE1\u606F\u521D\u59CB\u5316\u4E2D"
+  }) : /*#__PURE__*/React.createElement(DemoContent, {
+    currentApp: app,
+    needMeta: needMeta,
+    key: app === null || app === void 0 ? void 0 : app.appId
   }, children));
 };
 export default DemoWrapper;

package/es/socket/demo/demo.js

@@ -8,10 +8,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import { SocketClient } from '@zgfe/business-lib';
 import { Button, Card, Form, Input, notification } from 'antd';
 import styles from './index.less';
+import { DemoWrapper, BizGlobalDataContext } from '@zgfe/business-lib';
 var ChatPanel = function ChatPanel(_ref) {
   var name = _ref.name,
     param = _ref.param;
@@ -29,8 +30,10 @@ var ChatPanel = function ChatPanel(_ref) {
     setOnline = _useState6[1];
   var formRef = useRef();
   var historyRef = useRef();
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
   useEffect(function () {
-    setClient(new SocketClient('wss://rt2.zhugeio.com/eventtracking/ws', param));
+    setClient(new SocketClient('wss://rt2.zhugeio.com/eventtracking/ws', currentApp === null || currentApp === void 0 ? void 0 : currentApp.appKey, param));
   }, []);
   useEffect(function () {
     var _historyRef$current;
@@ -41,7 +44,6 @@ var ChatPanel = function ChatPanel(_ref) {
     client.openLog(true);
     client.onConnected(onConnected);
     client.onError(onError);
-    client.onLogin(onLogin);
     client.on('offline', function () {
       setHistory(function (list) {
         return [].concat(_toConsumableArray(list), [{
@@ -67,17 +69,10 @@ var ChatPanel = function ChatPanel(_ref) {
       message: '连接成功'
     });
   }
-  function onError() {
+  function onError(err) {
     notification.error({
-      message: '连接失败'
-    });
-  }
-  function onLogin() {
-    setHistory(function (list) {
-      return [].concat(_toConsumableArray(list), [{
-        type: 'he',
-        message: '登录成功'
-      }]);
+      message: '连接失败',
+      description: err.message
     });
   }
   return /*#__PURE__*/React.createElement(Card, {
@@ -124,32 +119,21 @@ var ChatPanel = function ChatPanel(_ref) {
   }, online ? '下线' : '上线')))));
 };
 export default (function () {
-  return /*#__PURE__*/React.createElement("div", {
+  var ctx = useContext(BizGlobalDataContext);
+  var currentApp = ctx.currentApp;
+  return /*#__PURE__*/React.createElement(DemoWrapper, null, /*#__PURE__*/React.createElement("div", {
     className: styles.container
   }, /*#__PURE__*/React.createElement(ChatPanel, {
     name: "\u5F20\u4E09",
     param: {
-      id: 'eti8-4ilv-876r-1wr5',
-      origin: 1,
-      appId: '146',
-      programId: 'zgej-3det-9edb-dje3',
-      type: 3,
-      payload: {
-        unionid: 'hjadfhdskji884bdfd',
-        username: 'zhangsan'
-      }
+      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+      origin: 3
     }
   }), /*#__PURE__*/React.createElement(ChatPanel, {
     name: "\u674E\u56DB",
     param: {
-      id: 'ueks-d8d2-njka-8742-2mdd',
-      origin: 3,
-      appId: '146',
-      type: 3,
-      payload: {
-        unionid: 'web-unionid2132',
-        username: 'zhangsan'
-      }
+      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+      origin: 5
     }
-  }));
+  })));
 });

package/es/socket/index.d.ts

@@ -7,13 +7,13 @@ declare class SocketClient {
     private catch;
     private showLog;
     private pingTimer?;
-    constructor(url: string, params?: Record<string, any>);
+    private appkey?;
+    constructor(url: string, appkey: string, params?: Record<string, any>);
     emit(event: string, payload: SocketClientTypes.Message['data']['payload']): void;
     on(type: SocketClientTypes.EventType | string, handle: SocketClientTypes.Handler): void;
     onConnected(handle: SocketClientTypes.Handler): void;
     onDisconnected(handle: SocketClientTypes.Handler): void;
     onError(handle: SocketClientTypes.Handler): void;
-    onLogin(handle: SocketClientTypes.Handler): void;
     private _onError;
     private _onClose;
     private _onOpen;
@@ -21,7 +21,7 @@ declare class SocketClient {
     private ping;
     removeAllListeners(): void;
     removeListener(event: string, handle?: SocketClientTypes.Handler): void;
-    private login;
+    private getToken;
     open(url?: string, params?: Record<string, any>): void;
     close(): void;
     destroy(): void;

package/es/socket/index.js

@@ -1,7 +1,7 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -14,9 +14,12 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { notification } from 'antd';
+import _ from 'lodash';
+import request from 'umi-request';
+import Apis from '../constants/apis';
 import SocketClientTypes from './types';
 var SocketClient = /*#__PURE__*/function () {
-  function SocketClient(url, params) {
+  function SocketClient(url, appkey, params) {
     _classCallCheck(this, SocketClient);
     this.client = void 0;
     this.url = void 0;
@@ -25,6 +28,8 @@ var SocketClient = /*#__PURE__*/function () {
     this.catch = [];
     this.showLog = false;
     this.pingTimer = void 0;
+    this.appkey = void 0;
+    this.appkey = appkey;
     this.url = url;
     this.params = params;
     this.open();
@@ -84,18 +89,13 @@ var SocketClient = /*#__PURE__*/function () {
     value: function onError(handle) {
       this.on(SocketClientTypes.EventType.error, handle);
     }
-  }, {
-    key: "onLogin",
-    value: function onLogin(handle) {
-      this.on(SocketClientTypes.EventType.login, handle);
-    }
   }, {
     key: "_onError",
-    value: function _onError(_event) {
+    value: function _onError(error) {
       var _this$listeners$error;
-      this.log('error', 'socket连接异常');
+      this.log('error', 'socket连接异常', error);
       (_this$listeners$error = this.listeners['error']) === null || _this$listeners$error === void 0 ? void 0 : _this$listeners$error.forEach(function (handle) {
-        handle.call(undefined);
+        handle.call(undefined, error);
       });
     }
   }, {
@@ -114,7 +114,6 @@ var SocketClient = /*#__PURE__*/function () {
       var _this$listeners$conne,
         _this = this;
       this.log('info', 'socket连接成功', event);
-      this.login();
       (_this$listeners$conne = this.listeners['connected']) === null || _this$listeners$conne === void 0 ? void 0 : _this$listeners$conne.forEach(function (handle) {
         handle.call(undefined);
       });
@@ -130,38 +129,30 @@ var SocketClient = /*#__PURE__*/function () {
   }, {
     key: "onMessage",
     value: function onMessage(event) {
-      var res_ = JSON.parse(event.data);
-      if (res_.code) {
-        var data = res_.data;
-        if (res_.code === SocketClientTypes.ResponseCode.offline) {
-          var _this$listeners$Socke;
-          (_this$listeners$Socke = this.listeners[SocketClientTypes.EventType.offline]) === null || _this$listeners$Socke === void 0 ? void 0 : _this$listeners$Socke.forEach(function (handle) {
-            handle.call(undefined, res_);
-          });
-          return;
+      var _this$listeners$Socke, _this$listeners$Socke2;
+      var res = JSON.parse(event.data);
+      if (res.code) {
+        switch (Number(res.code)) {
+          case SocketClientTypes.ResponseCode.offline:
+            (_this$listeners$Socke = this.listeners[SocketClientTypes.EventType.offline]) === null || _this$listeners$Socke === void 0 ? void 0 : _this$listeners$Socke.forEach(function (handle) {
+              handle.call(undefined, res);
+            });
+            break;
+          case SocketClientTypes.ResponseCode.exist:
+            (_this$listeners$Socke2 = this.listeners[SocketClientTypes.EventType.exist]) === null || _this$listeners$Socke2 === void 0 ? void 0 : _this$listeners$Socke2.forEach(function (handle) {
+              handle.call(undefined, res);
+            });
+            break;
+          case SocketClientTypes.ResponseCode.paramError:
+            this._onError(new Error('参数缺失或错误'));
         }
-        if (res_.code === SocketClientTypes.ResponseCode.exist) {
-          var _this$listeners$Socke2;
-          (_this$listeners$Socke2 = this.listeners[SocketClientTypes.EventType.exist]) === null || _this$listeners$Socke2 === void 0 ? void 0 : _this$listeners$Socke2.forEach(function (handle) {
-            handle.call(undefined, res_);
-          });
-          return;
-        }
-        if (data.type === SocketClientTypes.RequestType.login) {
-          var _this$listeners$Socke3;
-          this.log('info', '登录成功');
-          (_this$listeners$Socke3 = this.listeners[SocketClientTypes.EventType.login]) === null || _this$listeners$Socke3 === void 0 ? void 0 : _this$listeners$Socke3.forEach(function (handle) {
-            handle.call(undefined, res_);
-          });
-          return;
-        }
-      } else if (res_.type === SocketClientTypes.RequestType.pong) {
+      } else if (res.type === SocketClientTypes.RequestType.pong) {
         return;
       } else {
-        var _data = res_.data;
-        if (this.listeners[_data.event]) {
-          this.listeners[_data.event].forEach(function (handle) {
-            handle.call(undefined, _data.payload);
+        var data = res.data;
+        if (this.listeners[data.event]) {
+          this.listeners[data.event].forEach(function (handle) {
+            handle.call(undefined, data.payload);
           });
         }
       }
@@ -197,31 +188,70 @@ var SocketClient = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "login",
-    value: function login() {
-      var _this$client3;
-      this.log('info', '开始登录', this.params);
-      (_this$client3 = this.client) === null || _this$client3 === void 0 ? void 0 : _this$client3.send(JSON.stringify(_objectSpread({
-        type: SocketClientTypes.RequestType.normal
-      }, this.params)));
-    }
+    key: "getToken",
+    value: function () {
+      var _getToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var res;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return request(Apis.getSocketToken, {
+                method: 'get',
+                params: {
+                  appKey: this.appkey
+                }
+              });
+            case 2:
+              res = _context.sent;
+              return _context.abrupt("return", res);
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function getToken() {
+        return _getToken.apply(this, arguments);
+      }
+      return getToken;
+    }()
   }, {
     key: "open",
     value: function open(url, params) {
-      this.params = params || this.params;
-      if (this.client) this.close();
-      var client = new WebSocket(url || this.url);
-      this.client = client;
-      client.onmessage = this.onMessage.bind(this);
-      client.onerror = this._onError.bind(this);
-      client.onclose = this._onClose.bind(this);
-      client.onopen = this._onOpen.bind(this);
+      var _this4 = this;
+      this.getToken().then(function (res) {
+        if (!res) {
+          throw new Error('获取socket授权失败');
+        }
+        _this4.params = params || _this4.params;
+        if (_this4.client) _this4.close();
+        var paramUrl = [];
+        if (_this4.params) {
+          Object.keys(_this4.params || {}).forEach(function (key) {
+            if (_.isObject(_this4.params[key]) || _.isArray(_this4.params[key])) {
+              paramUrl.push("".concat(key, "=").concat(JSON.stringify(_this4.params[key])));
+            } else {
+              paramUrl.push("".concat(key, "=").concat(_this4.params[key]));
+            }
+          });
+        }
+        var client = new WebSocket("".concat(url || _this4.url, "?").concat(paramUrl.join('&')));
+        _this4.client = client;
+        client.onmessage = _this4.onMessage.bind(_this4);
+        client.onerror = _this4._onError.bind(_this4);
+        client.onclose = _this4._onClose.bind(_this4);
+        client.onopen = _this4._onOpen.bind(_this4);
+      }).catch(function (err) {
+        _this4.log('error', 'socket获取token信息异常');
+        _this4._onError(err);
+      });
     }
   }, {
     key: "close",
     value: function close() {
-      var _this$client4;
-      (_this$client4 = this.client) === null || _this$client4 === void 0 ? void 0 : _this$client4.close();
+      var _this$client3;
+      (_this$client3 = this.client) === null || _this$client3 === void 0 ? void 0 : _this$client3.close();
       this.log('info', '关闭socket连接');
     }
   }, {

package/es/socket/types.d.ts

@@ -3,7 +3,6 @@ declare namespace SocketClientTypes {
         connected = "connected",
         disconnected = "disconnected",
         error = "error",
-        login = "login",
         offline = "offline",
         exist = "exist"
     }
@@ -11,13 +10,13 @@ declare namespace SocketClientTypes {
         common = 0,
         ping = 1,
         pong = 2,
-        login = 3,
         normal = 5,
         img = 6
     }
     enum ResponseCode {
-        offline = "109001",
-        exist = "109002"
+        offline = 109001,
+        exist = 109002,
+        paramError = 109005
     }
     type Message = {
         type: RequestType;

package/es/socket/types.js

@@ -5,7 +5,6 @@ var SocketClientTypes;
     EventType["connected"] = "connected";
     EventType["disconnected"] = "disconnected";
     EventType["error"] = "error";
-    EventType["login"] = "login";
     EventType["offline"] = "offline";
     EventType["exist"] = "exist";
   })(EventType = SocketClientTypes.EventType || (SocketClientTypes.EventType = {}));
@@ -14,14 +13,14 @@ var SocketClientTypes;
     RequestType[RequestType["common"] = 0] = "common";
     RequestType[RequestType["ping"] = 1] = "ping";
     RequestType[RequestType["pong"] = 2] = "pong";
-    RequestType[RequestType["login"] = 3] = "login";
     RequestType[RequestType["normal"] = 5] = "normal";
     RequestType[RequestType["img"] = 6] = "img";
   })(RequestType = SocketClientTypes.RequestType || (SocketClientTypes.RequestType = {}));
   var ResponseCode;
   (function (ResponseCode) {
-    ResponseCode["offline"] = "109001";
-    ResponseCode["exist"] = "109002";
+    ResponseCode[ResponseCode["offline"] = 109001] = "offline";
+    ResponseCode[ResponseCode["exist"] = 109002] = "exist";
+    ResponseCode[ResponseCode["paramError"] = 109005] = "paramError";
   })(ResponseCode = SocketClientTypes.ResponseCode || (SocketClientTypes.ResponseCode = {}));
 })(SocketClientTypes || (SocketClientTypes = {}));
 export default SocketClientTypes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.29-visual.6",
+  "version": "1.1.29-visual.7",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "afdafe3bb289a223ac879876d120c9493a83fe3f"
+  "gitHead": "0d22608428c02690fec4f51be172d62b7b979cb6"
 }