@arcblock/bridge 2.13.69 → 3.0.0

package/lib/dsbridge.js

@@ -1,79 +1,39 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-/* eslint-disable  */
-/**
- * @copyright https://www.npmjs.com/package/dsbridge
- * @description 只添加方法劫持前的判断，其余不做任何改动，确保不会有任何影响
- */
-
-var bridge = {
-  call: function call(method, args, cb) {
-    var ret = '';
-    if (typeof args == 'function') {
-      cb = args;
-      args = {};
+var n = {
+  call: function(s, i, r) {
+    var e = "";
+    typeof i == "function" && (r = i, i = {});
+    var a = { data: i === void 0 ? null : i };
+    if (typeof r == "function") {
+      var t = "dscb" + window.dscb++;
+      window[t] = r, a._dscbstub = t;
     }
-    var arg = {
-      data: args === undefined ? null : args
-    };
-    if (typeof cb == 'function') {
-      var cbName = 'dscb' + window.dscb++;
-      window[cbName] = cb;
-      arg['_dscbstub'] = cbName;
-    }
-    arg = JSON.stringify(arg);
-
-    //if in webview that dsBridge provided, call!
-    if (window._dsbridge) {
-      ret = _dsbridge.call(method, arg);
-    } else if (window._dswk || navigator.userAgent.indexOf('_dsbridge') != -1) {
-      ret = prompt('_dsbridge=' + method, arg);
-    }
-    return JSON.parse(ret || '{}').data;
+    return a = JSON.stringify(a), window._dsbridge ? e = _dsbridge.call(s, a) : (window._dswk || navigator.userAgent.indexOf("_dsbridge") != -1) && (e = prompt("_dsbridge=" + s, a)), JSON.parse(e || "{}").data;
   },
-  register: function register(name, fun, asyn) {
-    var q = asyn ? window._dsaf : window._dsf;
-    if (!window._dsInit) {
-      window._dsInit = true;
-      //notify native that js apis register successfully on next event loop
-      setTimeout(function () {
-        bridge.call('_dsb.dsinit');
-      }, 0);
-    }
-    if (typeof fun == 'object') {
-      q._obs[name] = fun;
-    } else {
-      q[name] = fun;
-    }
+  register: function(s, i, r) {
+    var e = r ? window._dsaf : window._dsf;
+    window._dsInit || (window._dsInit = !0, setTimeout(function() {
+      n.call("_dsb.dsinit");
+    }, 0)), typeof i == "object" ? e._obs[s] = i : e[s] = i;
   },
-  registerAsyn: function registerAsyn(name, fun) {
-    this.register(name, fun, true);
+  registerAsyn: function(s, i) {
+    this.register(s, i, !0);
   },
-  hasNativeMethod: function hasNativeMethod(name, type) {
-    return this.call('_dsb.hasNativeMethod', {
-      name: name,
-      type: type || 'all'
-    });
+  hasNativeMethod: function(s, i) {
+    return this.call("_dsb.hasNativeMethod", { name: s, type: i || "all" });
   },
-  disableJavascriptDialogBlock: function disableJavascriptDialogBlock(disable) {
-    this.call('_dsb.disableJavascriptDialogBlock', {
-      disable: disable !== false
+  disableJavascriptDialogBlock: function(s) {
+    this.call("_dsb.disableJavascriptDialogBlock", {
+      disable: s !== !1
     });
   },
   canUseBridge() {
-    return !!(window._dsbridge || window._dswk || navigator.userAgent.indexOf('_dsbridge') != -1);
+    return !!(window._dsbridge || window._dswk || navigator.userAgent.indexOf("_dsbridge") != -1);
   }
 };
-!function () {
-  // 只有在 dsbridge 注入过的环境，才执行下方的代码
-  if (!bridge.canUseBridge()) return;
-  if (window._dsf) return;
-  const originClose = window.close;
-  var ob = {
+(function() {
+  if (!n.canUseBridge() || window._dsf) return;
+  const s = window.close;
+  var i = {
     _dsf: {
       _obs: {}
     },
@@ -81,72 +41,50 @@ var bridge = {
       _obs: {}
     },
     dscb: 0,
-    dsBridge: bridge,
-    close: function close() {
-      bridge.call('_dsb.closePage');
-      originClose();
+    dsBridge: n,
+    close: function() {
+      n.call("_dsb.closePage"), s();
     },
-    _handleMessageFromNative: function _handleMessageFromNative(info) {
-      var arg = JSON.parse(info.data);
-      var ret = {
-        id: info.callbackId,
-        complete: true
+    _handleMessageFromNative: function(e) {
+      var a = JSON.parse(e.data), t = {
+        id: e.callbackId,
+        complete: !0
+      }, o = this._dsf[e.method], l = this._dsaf[e.method], w = function(u, v) {
+        t.data = u.apply(v, a), n.call("_dsb.returnValue", t);
+      }, g = function(u, v) {
+        a.push(function(h, y) {
+          t.data = h, t.complete = y !== !1, n.call("_dsb.returnValue", t);
+        }), u.apply(v, a);
       };
-      var f = this._dsf[info.method];
-      var af = this._dsaf[info.method];
-      var callSyn = function callSyn(f, ob) {
-        ret.data = f.apply(ob, arg);
-        bridge.call('_dsb.returnValue', ret);
-      };
-      var callAsyn = function callAsyn(f, ob) {
-        arg.push(function (data, complete) {
-          ret.data = data;
-          ret.complete = complete !== false;
-          bridge.call('_dsb.returnValue', ret);
-        });
-        f.apply(ob, arg);
-      };
-      if (f) {
-        callSyn(f, this._dsf);
-      } else if (af) {
-        callAsyn(af, this._dsaf);
-      } else {
-        //with namespace
-        var name = info.method.split('.');
-        if (name.length < 2) return;
-        var method = name.pop();
-        var namespace = name.join('.');
-        var obs = this._dsf._obs;
-        var ob = obs[namespace] || {};
-        var m = ob[method];
-        if (m && typeof m == 'function') {
-          callSyn(m, ob);
+      if (o)
+        w(o, this._dsf);
+      else if (l)
+        g(l, this._dsaf);
+      else {
+        var c = e.method.split(".");
+        if (c.length < 2) return;
+        var p = c.pop(), b = c.join("."), _ = this._dsf._obs, f = _[b] || {}, d = f[p];
+        if (d && typeof d == "function") {
+          w(d, f);
           return;
         }
-        obs = this._dsaf._obs;
-        ob = obs[namespace] || {};
-        m = ob[method];
-        if (m && typeof m == 'function') {
-          callAsyn(m, ob);
+        if (_ = this._dsaf._obs, f = _[b] || {}, d = f[p], d && typeof d == "function") {
+          g(d, f);
           return;
         }
       }
     }
   };
-  for (var attr in ob) {
-    window[attr] = ob[attr];
-  }
-  bridge.register('_hasJavascriptMethod', function (method, tag) {
-    var name = method.split('.');
-    if (name.length < 2) {
-      return !!(_dsf[name] || _dsaf[name]);
-    } else {
-      // with namespace
-      var method = name.pop();
-      var namespace = name.join('.');
-      var ob = _dsf._obs[namespace] || _dsaf._obs[namespace];
-      return ob && !!ob[method];
-    }
+  for (var r in i)
+    window[r] = i[r];
+  n.register("_hasJavascriptMethod", function(e, a) {
+    var t = e.split(".");
+    if (t.length < 2)
+      return !!(_dsf[t] || _dsaf[t]);
+    var e = t.pop(), o = t.join("."), l = _dsf._obs[o] || _dsaf._obs[o];
+    return l && !!l[e];
   });
-}();
-var _default = exports.default = bridge;
+})();
+export {
+  n as default
+};

package/lib/index.js

@@ -1,152 +1,76 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _dsbridge = _interopRequireDefault(require("./dsbridge"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-const BRIDGE_VERSION = '1';
-var _default = exports.default = {
-  register() {
-    if (_dsbridge.default.canUseBridge()) {
-      _dsbridge.default.register(...arguments);
-    } else {
-      console.warn('dsbridge is not available');
-    }
+import o from "./dsbridge.js";
+const f = "1", g = {
+  register(...e) {
+    o.canUseBridge() ? o.register(...e) : console.warn("dsbridge is not available");
   },
-  registerAsyn() {
-    if (_dsbridge.default.canUseBridge()) {
-      _dsbridge.default.registerAsyn(...arguments);
-    } else {
-      console.warn('dsbridge is not available');
-    }
+  registerAsyn(...e) {
+    o.canUseBridge() ? o.registerAsyn(...e) : console.warn("dsbridge is not available");
   },
-  call() {
-    _dsbridge.default.call(...arguments);
+  call(...e) {
+    o.call(...e);
   },
-  asyncCall() {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    return new Promise((resolve, reject) => {
-      _dsbridge.default.call(...args, resString => {
+  asyncCall(...e) {
+    return new Promise((s, n) => {
+      o.call(...e, (a) => {
         try {
-          const result = JSON.parse(resString);
-          if (result.code === 0) {
-            const data = JSON.parse(result.data);
-            resolve(data);
-          } else {
-            reject(new Error(result.error));
-          }
-        } catch (_unused) {
-          resolve(resString);
+          const c = JSON.parse(a);
+          if (c.code === 0) {
+            const r = JSON.parse(c.data);
+            s(r);
+          } else
+            n(new Error(c.error));
+        } catch {
+          s(a);
         }
       });
     });
   },
   // 基本功能
-  shareMessage(params) {
-    const {
-      content,
-      imgUrl,
-      success,
-      fail
-    } = params;
-    if (!content && !imgUrl) {
-      fail('params error');
+  shareMessage(e) {
+    const { content: s, imgUrl: n, success: a, fail: c } = e;
+    if (!s && !n) {
+      c("params error");
       return;
     }
-    _dsbridge.default.call('arcShare', JSON.stringify({
-      content,
-      imgUrl
-    }), result => {
-      const parseResult = JSON.parse(result);
-      if (parseResult && parseResult.code === 0) {
-        if (typeof success === 'function') {
-          success(result);
-        }
-      } else if (typeof fail === 'function') {
-        fail(result);
-      }
+    o.call("arcShare", JSON.stringify({ content: s, imgUrl: n }), (r) => {
+      const t = JSON.parse(r);
+      t && t.code === 0 ? typeof a == "function" && a(r) : typeof c == "function" && c(r);
     });
   },
   showLoading() {
-    _dsbridge.default.call('arcShowLoading');
+    o.call("arcShowLoading");
   },
   hideLoading() {
-    _dsbridge.default.call('arcHideLoading');
+    o.call("arcHideLoading");
   },
-  showToast(msg) {
-    if (msg && typeof msg === 'string') {
-      _dsbridge.default.call('arcToast', msg);
-    }
+  showToast(e) {
+    e && typeof e == "string" && o.call("arcToast", e);
   },
   // 图片功能
-  chooseImgs(params) {
-    const {
-      limit,
-      success,
-      fail
-    } = params;
-    _dsbridge.default.call('arcChooseImgs', JSON.stringify({
-      limit
-    }), result => {
-      const parseResult = JSON.parse(result);
-      if (parseResult && parseResult.code === 0) {
-        if (typeof success === 'function') {
-          success(result);
-        }
-      } else if (typeof fail === 'function') {
-        fail(result);
-      }
+  chooseImgs(e) {
+    const { limit: s, success: n, fail: a } = e;
+    o.call("arcChooseImgs", JSON.stringify({ limit: s }), (c) => {
+      const r = JSON.parse(c);
+      r && r.code === 0 ? typeof n == "function" && n(c) : typeof a == "function" && a(c);
     });
   },
-  previewImgs(params) {
-    const {
-      imgs
-    } = params;
-    if (!imgs || imgs.length === 0) {
-      return;
-    }
-    _dsbridge.default.call('arcPreviewImgs', JSON.stringify(params));
+  previewImgs(e) {
+    const { imgs: s } = e;
+    !s || s.length === 0 || o.call("arcPreviewImgs", JSON.stringify(e));
   },
   // 钱包功能
-  isSetPWD(params) {
-    const {
-      success,
-      fail
-    } = params;
-    _dsbridge.default.call('arcIsSetPWD', '', result => {
-      const parseResult = JSON.parse(result);
-      if (parseResult && parseResult.code === 0) {
-        if (typeof success === 'function') {
-          success(result);
-        }
-      } else if (typeof fail === 'function') {
-        fail(result);
-      }
+  isSetPWD(e) {
+    const { success: s, fail: n } = e;
+    o.call("arcIsSetPWD", "", (a) => {
+      const c = JSON.parse(a);
+      c && c.code === 0 ? typeof s == "function" && s(a) : typeof n == "function" && n(a);
     });
   },
-  isCodeABOk(params) {
-    const {
-      success,
-      fail
-    } = params;
-    _dsbridge.default.call('arcIsCodeABOk', '', result => {
-      const parseResult = JSON.parse(result);
-      if (parseResult && parseResult.code === 0) {
-        if (typeof success === 'function') {
-          success(result);
-        }
-      } else if (typeof fail === 'function') {
-        fail(result);
-      }
+  isCodeABOk(e) {
+    const { success: s, fail: n } = e;
+    o.call("arcIsCodeABOk", "", (a) => {
+      const c = JSON.parse(a);
+      c && c.code === 0 ? typeof s == "function" && s(a) : typeof n == "function" && n(a);
     });
   },
   /**
@@ -155,60 +79,48 @@ var _default = exports.default = {
    * @param {object} [params] 调用的参数，只能为 object
    * @returns {Promise<any>}
    */
-  callArc(eventName) {
-    let params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    return new Promise((resolve, reject) => {
-      const namespace = 'arc';
-      const fnName = [namespace, eventName].join('__');
-      const mergedParams = _objectSpread(_objectSpread({}, params), {}, {
-        _version: BRIDGE_VERSION
-      });
-      _dsbridge.default.call(fnName, mergedParams, resString => {
+  callArc(e, s = {}) {
+    return new Promise((n, a) => {
+      const r = ["arc", e].join("__"), t = { ...s, _version: f };
+      o.call(r, t, (l) => {
         try {
-          const result = JSON.parse(resString);
-          if ((result === null || result === void 0 ? void 0 : result._version) === BRIDGE_VERSION) {
-            if (result.code === 0) {
+          const i = JSON.parse(l);
+          if ((i == null ? void 0 : i._version) === f)
+            if (i.code === 0)
               try {
-                const data = JSON.parse(result.data);
-                resolve(data);
-              } catch (_unused2) {
-                console.warn('Failed to parse result.data');
-                resolve(result.data);
+                const d = JSON.parse(i.data);
+                n(d);
+              } catch {
+                console.warn("Failed to parse result.data"), n(i.data);
               }
-            } else {
-              reject(new Error(result.error));
-            }
-          } else {
-            // DEPRECATED: @zhanghan 兼容旧版本的 native 响应
-            resolve(result);
-          }
-        } catch (_unused3) {
-          console.warn('Failed to parse resString');
-          resolve(resString);
+            else
+              a(new Error(i.error));
+          else
+            n(i);
+        } catch {
+          console.warn("Failed to parse resString"), n(l);
         }
       });
     });
   },
-  registerBlocklet(eventName) {
-    let cb = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => {};
-    if (_dsbridge.default.canUseBridge()) {
-      const namespace = 'blocklet';
-      const cbName = [namespace, eventName].join('__');
-      _dsbridge.default.registerAsyn(cbName, function () {
-        for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-          args[_key2] = arguments[_key2];
-        }
-        const parsedArgs = args.map(x => {
+  registerBlocklet(e, s = () => {
+  }) {
+    if (o.canUseBridge()) {
+      const a = ["blocklet", e].join("__");
+      o.registerAsyn(a, (...c) => {
+        const r = c.map((t) => {
           try {
-            return JSON.parse(x);
-          } catch (_unused4) {
-            return x;
+            return JSON.parse(t);
+          } catch {
+            return t;
           }
         });
-        cb(...parsedArgs);
+        s(...r);
       });
-    } else {
-      console.warn('dsbridge is not available');
-    }
+    } else
+      console.warn("dsbridge is not available");
   }
-};
+};
+export {
+  g as default
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/bridge",
-  "version": "2.13.69",
+  "version": "3.0.0",
   "description": "a bridge sdk support all js api from DID Wallet.",
   "keywords": [
     "bridge",
@@ -16,8 +16,8 @@
   },
   "scripts": {
     "lint": "echo 'lint'",
-    "build": "babel src --out-dir lib --copy-files --no-copy-ignored",
-    "watch": "babel src --out-dir lib -w --copy-files --no-copy-ignored",
+    "build": "vite build",
+    "watch": "vite build --watch",
     "precommit": "CI=1 npm run lint",
     "prepush": "CI=1 npm run lint",
     "prepublish": "npm run build",
@@ -31,12 +31,8 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.19.3",
-    "@babel/preset-env": "^7.19.3",
-    "@babel/preset-react": "^7.18.6",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "^29.7.0"
   },
-  "gitHead": "d8a03a6d869bf5f7be34b448463a07c435b21cea"
+  "gitHead": "b001c32ca85d40d8a0784ca581bfd54d90550b24"
 }

package/vite.config.mjs

@@ -0,0 +1,16 @@
+import { defineConfig } from 'vite';
+import fg from 'fast-glob';
+
+export default defineConfig({
+  build: {
+    lib: {
+      entry: fg.sync('src/**/*.{tsx,ts,jsx,js}', {
+        ignore: ['**/stories/**', '**/demo/**', '**/*.d.ts', '**/*.stories.*'],
+      }),
+      formats: ['es'],
+      fileName: (format, entryName) => `${entryName}.js`,
+    },
+    outDir: 'lib',
+    emptyOutDir: true,
+  },
+});