@ocap/client 1.13.23 → 1.13.27

package/lib/base.js

@@ -61,7 +61,7 @@ class GraphQLClientBase extends BaseClient {
       socketEndpoint = socketEndpoint.replace('ws://', 'wss://');
     }
 
-    return `${socketEndpoint.split('/api').shift()}/api`;
+    return socketEndpoint;
   }
 
   _getSchema() {

package/lib/base.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/base.js"],"names":["BaseClient","require","WsClient","jsonpack","GraphQLClientBase","constructor","endpoint","dataSource","httpEndpoint","socketEndpoint","_getSocketEndpoint","enableQuery","enableSubscription","enableMutation","maxQueryDepth","_endpoint","_socketClient","subscribe","topic","callback","client","_ensureSocketClient","on","unsubscribe","off","config","Object","assign","_getSocketOptions","heartbeatIntervalMs","isConnected","connect","replace","indexOf","split","shift","_getSchema","unpack","packedSchema","_getIgnoreFields","module","exports"],"mappings":";;wDAAA;;;;AAGA,MAAMA,aAAaC,QAAQ,oBAAR,CAAnB;AACA,MAAM,EAAEC,QAAF,KAAeD,QAAQ,cAAR,CAArB;AACA,MAAME,WAAWF,QAAQ,UAAR,CAAjB;;AAEA;;;;;;;AAOA,MAAMG,iBAAN,SAAgCJ,UAAhC,CAA2C;AACzCK,cAAYC,QAAZ,EAAsB;AACpB,UAAM;AACJC,kBAAY,OADR;AAEJC,oBAAcF,QAFV;AAGJG,sBAAgB,MAAM,KAAKC,kBAAL,CAAwBJ,QAAxB,CAHlB;AAIJK,mBAAa,IAJT;AAKJC,0BAAoB,IALhB;AAMJC,sBAAgB,IANZ;AAOJC,qBAAe;AAPX,KAAN;;AAUA,SAAKC,SAAL,GAAiBT,QAAjB;AACA,SAAKU,aAAL,GAAqB,IAArB;AACD;;AAEDC,YAAUC,KAAV,EAAiBC,QAAjB,EAA2B;AACzB,UAAMC,SAAS,KAAKC,mBAAL,EAAf;AACA,WAAOD,OAAOE,EAAP,CAAUJ,KAAV,EAAiBC,QAAjB,CAAP;AACD;;AAEDI,cAAYL,KAAZ,EAAmBC,QAAnB,EAA6B;AAC3B,UAAMC,SAAS,KAAKC,mBAAL,EAAf;AACA,WAAOD,OAAOI,GAAP,CAAWN,KAAX,EAAkBC,QAAlB,CAAP;AACD;;AAEDE,wBAAsB;AACpB,QAAI,CAAC,KAAKL,aAAV,EAAyB;AACvB,WAAKA,aAAL,GAAqB,IAAId,QAAJ,CACnB,KAAKuB,MAAL,CAAYhB,cAAZ,EADmB,EAEnBiB,OAAOC,MAAP,CAAc,KAAKC,iBAAL,EAAd,EAAwC;AACtCC,6BAAqB,KAAK;AADY,OAAxC,CAFmB,CAArB;AAMD;;AAED,QAAI,KAAKb,aAAL,CAAmBc,WAAnB,OAAqC,KAAzC,EAAgD;AAC9C,WAAKd,aAAL,CAAmBe,OAAnB;AACD;;AAED,WAAO,KAAKf,aAAZ;AACD;;AAEDN,qBAAmBJ,QAAnB,EAA6B;AAC3B,QAAIG,iBAAiBH,SAAS0B,OAAT,CAAiB,aAAjB,EAAgC,OAAhC,CAArB;AACA,QAAI1B,SAAS2B,OAAT,CAAiB,UAAjB,MAAiC,CAArC,EAAwC;AACtCxB,uBAAiBA,eAAeuB,OAAf,CAAuB,OAAvB,EAAgC,QAAhC,CAAjB;AACD;;AAED,WAAQ,GAAEvB,eAAeyB,KAAf,CAAqB,MAArB,EAA6BC,KAA7B,EAAqC,MAA/C;AACD;;AAEDC,eAAa;AACX,WAAOjC,SAASkC,MAAT,CAAgBC,YAAhB,CAAP;AACD;;AAEDC,qBAAmB;AACjB,WAAO,EAAP;AACD;AA1DwC;;AA6D3CC,OAAOC,OAAP,GAAiBrC,iBAAjB","file":"base.js","sourcesContent":["/* eslint-disable no-underscore-dangle */\nimport packedSchema from './schema/graphql.txt';\n\nconst BaseClient = require('@arcblock/sdk-util');\nconst { WsClient } = require('@arcblock/ws');\nconst jsonpack = require('jsonpack');\n\n/**\n * Provides a readonly client to forge\n * Its recommended to use this version in browser to get smaller bundle size\n *\n * @class GraphQLClientBase\n * @extends {BaseClient}\n */\nclass GraphQLClientBase extends BaseClient {\n  constructor(endpoint) {\n    super({\n      dataSource: 'forge',\n      httpEndpoint: endpoint,\n      socketEndpoint: () => this._getSocketEndpoint(endpoint),\n      enableQuery: true,\n      enableSubscription: true,\n      enableMutation: true,\n      maxQueryDepth: 6,\n    });\n\n    this._endpoint = endpoint;\n    this._socketClient = null;\n  }\n\n  subscribe(topic, callback) {\n    const client = this._ensureSocketClient();\n    return client.on(topic, callback);\n  }\n\n  unsubscribe(topic, callback) {\n    const client = this._ensureSocketClient();\n    return client.off(topic, callback);\n  }\n\n  _ensureSocketClient() {\n    if (!this._socketClient) {\n      this._socketClient = new WsClient(\n        this.config.socketEndpoint(),\n        Object.assign(this._getSocketOptions(), {\n          heartbeatIntervalMs: 10 * 1000,\n        })\n      );\n    }\n\n    if (this._socketClient.isConnected() === false) {\n      this._socketClient.connect();\n    }\n\n    return this._socketClient;\n  }\n\n  _getSocketEndpoint(endpoint) {\n    let socketEndpoint = endpoint.replace(/https?:\\/\\//, 'ws://');\n    if (endpoint.indexOf('https://') === 0) {\n      socketEndpoint = socketEndpoint.replace('ws://', 'wss://');\n    }\n\n    return `${socketEndpoint.split('/api').shift()}/api`;\n  }\n\n  _getSchema() {\n    return jsonpack.unpack(packedSchema);\n  }\n\n  _getIgnoreFields() {\n    return [];\n  }\n}\n\nmodule.exports = GraphQLClientBase;\n"]}
+{"version":3,"sources":["../src/base.js"],"names":["BaseClient","require","WsClient","jsonpack","GraphQLClientBase","constructor","endpoint","dataSource","httpEndpoint","socketEndpoint","_getSocketEndpoint","enableQuery","enableSubscription","enableMutation","maxQueryDepth","_endpoint","_socketClient","subscribe","topic","callback","client","_ensureSocketClient","on","unsubscribe","off","config","Object","assign","_getSocketOptions","heartbeatIntervalMs","isConnected","connect","replace","indexOf","_getSchema","unpack","packedSchema","_getIgnoreFields","module","exports"],"mappings":";;wDAAA;;;;AAGA,MAAMA,aAAaC,QAAQ,oBAAR,CAAnB;AACA,MAAM,EAAEC,QAAF,KAAeD,QAAQ,cAAR,CAArB;AACA,MAAME,WAAWF,QAAQ,UAAR,CAAjB;;AAEA;;;;;;;AAOA,MAAMG,iBAAN,SAAgCJ,UAAhC,CAA2C;AACzCK,cAAYC,QAAZ,EAAsB;AACpB,UAAM;AACJC,kBAAY,OADR;AAEJC,oBAAcF,QAFV;AAGJG,sBAAgB,MAAM,KAAKC,kBAAL,CAAwBJ,QAAxB,CAHlB;AAIJK,mBAAa,IAJT;AAKJC,0BAAoB,IALhB;AAMJC,sBAAgB,IANZ;AAOJC,qBAAe;AAPX,KAAN;;AAUA,SAAKC,SAAL,GAAiBT,QAAjB;AACA,SAAKU,aAAL,GAAqB,IAArB;AACD;;AAEDC,YAAUC,KAAV,EAAiBC,QAAjB,EAA2B;AACzB,UAAMC,SAAS,KAAKC,mBAAL,EAAf;AACA,WAAOD,OAAOE,EAAP,CAAUJ,KAAV,EAAiBC,QAAjB,CAAP;AACD;;AAEDI,cAAYL,KAAZ,EAAmBC,QAAnB,EAA6B;AAC3B,UAAMC,SAAS,KAAKC,mBAAL,EAAf;AACA,WAAOD,OAAOI,GAAP,CAAWN,KAAX,EAAkBC,QAAlB,CAAP;AACD;;AAEDE,wBAAsB;AACpB,QAAI,CAAC,KAAKL,aAAV,EAAyB;AACvB,WAAKA,aAAL,GAAqB,IAAId,QAAJ,CACnB,KAAKuB,MAAL,CAAYhB,cAAZ,EADmB,EAEnBiB,OAAOC,MAAP,CAAc,KAAKC,iBAAL,EAAd,EAAwC;AACtCC,6BAAqB,KAAK;AADY,OAAxC,CAFmB,CAArB;AAMD;;AAED,QAAI,KAAKb,aAAL,CAAmBc,WAAnB,OAAqC,KAAzC,EAAgD;AAC9C,WAAKd,aAAL,CAAmBe,OAAnB;AACD;;AAED,WAAO,KAAKf,aAAZ;AACD;;AAEDN,qBAAmBJ,QAAnB,EAA6B;AAC3B,QAAIG,iBAAiBH,SAAS0B,OAAT,CAAiB,aAAjB,EAAgC,OAAhC,CAArB;AACA,QAAI1B,SAAS2B,OAAT,CAAiB,UAAjB,MAAiC,CAArC,EAAwC;AACtCxB,uBAAiBA,eAAeuB,OAAf,CAAuB,OAAvB,EAAgC,QAAhC,CAAjB;AACD;;AAED,WAAOvB,cAAP;AACD;;AAEDyB,eAAa;AACX,WAAO/B,SAASgC,MAAT,CAAgBC,YAAhB,CAAP;AACD;;AAEDC,qBAAmB;AACjB,WAAO,EAAP;AACD;AA1DwC;;AA6D3CC,OAAOC,OAAP,GAAiBnC,iBAAjB","file":"base.js","sourcesContent":["/* eslint-disable no-underscore-dangle */\nimport packedSchema from './schema/graphql.txt';\n\nconst BaseClient = require('@arcblock/sdk-util');\nconst { WsClient } = require('@arcblock/ws');\nconst jsonpack = require('jsonpack');\n\n/**\n * Provides a readonly client to forge\n * Its recommended to use this version in browser to get smaller bundle size\n *\n * @class GraphQLClientBase\n * @extends {BaseClient}\n */\nclass GraphQLClientBase extends BaseClient {\n  constructor(endpoint) {\n    super({\n      dataSource: 'forge',\n      httpEndpoint: endpoint,\n      socketEndpoint: () => this._getSocketEndpoint(endpoint),\n      enableQuery: true,\n      enableSubscription: true,\n      enableMutation: true,\n      maxQueryDepth: 6,\n    });\n\n    this._endpoint = endpoint;\n    this._socketClient = null;\n  }\n\n  subscribe(topic, callback) {\n    const client = this._ensureSocketClient();\n    return client.on(topic, callback);\n  }\n\n  unsubscribe(topic, callback) {\n    const client = this._ensureSocketClient();\n    return client.off(topic, callback);\n  }\n\n  _ensureSocketClient() {\n    if (!this._socketClient) {\n      this._socketClient = new WsClient(\n        this.config.socketEndpoint(),\n        Object.assign(this._getSocketOptions(), {\n          heartbeatIntervalMs: 10 * 1000,\n        })\n      );\n    }\n\n    if (this._socketClient.isConnected() === false) {\n      this._socketClient.connect();\n    }\n\n    return this._socketClient;\n  }\n\n  _getSocketEndpoint(endpoint) {\n    let socketEndpoint = endpoint.replace(/https?:\\/\\//, 'ws://');\n    if (endpoint.indexOf('https://') === 0) {\n      socketEndpoint = socketEndpoint.replace('ws://', 'wss://');\n    }\n\n    return socketEndpoint;\n  }\n\n  _getSchema() {\n    return jsonpack.unpack(packedSchema);\n  }\n\n  _getIgnoreFields() {\n    return [];\n  }\n}\n\nmodule.exports = GraphQLClientBase;\n"]}

package/lib/node.js

@@ -1,17 +1,11 @@
 'use strict';
 
 const EventEmitter = require('events');
-const WebSocket = require('ws');
-
 const GraphQLClient = require('./client');
 
 class NativeGraphqlClient extends GraphQLClient {
-  _getSocketImplementation() {
-    return WebSocket;
-  }
-
   _getSocketOptions() {
-    return { transport: WebSocket };
+    return {};
   }
 
   _getEventImplementation() {

package/lib/node.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/node.js"],"names":["EventEmitter","require","WebSocket","GraphQLClient","NativeGraphqlClient","_getSocketImplementation","_getSocketOptions","transport","_getEventImplementation","module","exports"],"mappings":";;AAAA,MAAMA,eAAeC,QAAQ,QAAR,CAArB;AACA,MAAMC,YAAYD,QAAQ,IAAR,CAAlB;;AAEA,MAAME,gBAAgBF,QAAQ,UAAR,CAAtB;;AAEA,MAAMG,mBAAN,SAAkCD,aAAlC,CAAgD;AAC9CE,6BAA2B;AACzB,WAAOH,SAAP;AACD;;AAEDI,sBAAoB;AAClB,WAAO,EAAEC,WAAWL,SAAb,EAAP;AACD;;AAEDM,4BAA0B;AACxB,WAAOR,YAAP;AACD;AAX6C;;AAchDS,OAAOC,OAAP,GAAiBN,mBAAjB","file":"node.js","sourcesContent":["const EventEmitter = require('events');\nconst WebSocket = require('ws');\n\nconst GraphQLClient = require('./client');\n\nclass NativeGraphqlClient extends GraphQLClient {\n  _getSocketImplementation() {\n    return WebSocket;\n  }\n\n  _getSocketOptions() {\n    return { transport: WebSocket };\n  }\n\n  _getEventImplementation() {\n    return EventEmitter;\n  }\n}\n\nmodule.exports = NativeGraphqlClient;\n"]}
+{"version":3,"sources":["../src/node.js"],"names":["EventEmitter","require","GraphQLClient","NativeGraphqlClient","_getSocketOptions","_getEventImplementation","module","exports"],"mappings":";;AAAA,MAAMA,eAAeC,QAAQ,QAAR,CAArB;AACA,MAAMC,gBAAgBD,QAAQ,UAAR,CAAtB;;AAEA,MAAME,mBAAN,SAAkCD,aAAlC,CAAgD;AAC9CE,sBAAoB;AAClB,WAAO,EAAP;AACD;;AAEDC,4BAA0B;AACxB,WAAOL,YAAP;AACD;AAP6C;;AAUhDM,OAAOC,OAAP,GAAiBJ,mBAAjB","file":"node.js","sourcesContent":["const EventEmitter = require('events');\nconst GraphQLClient = require('./client');\n\nclass NativeGraphqlClient extends GraphQLClient {\n  _getSocketOptions() {\n    return {};\n  }\n\n  _getEventImplementation() {\n    return EventEmitter;\n  }\n}\n\nmodule.exports = NativeGraphqlClient;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ocap/client",
-  "version": "1.13.23",
+  "version": "1.13.27",
   "description": "graphql client to read/write data on forge powered blockchain",
   "keywords": [
     "graphql",
@@ -28,24 +28,22 @@
     "lib"
   ],
   "dependencies": {
-    "@arcblock/did": "1.13.23",
-    "@arcblock/did-util": "1.13.23",
+    "@arcblock/did": "1.13.27",
+    "@arcblock/did-util": "1.13.27",
     "@arcblock/sdk-util": "^0.30.0",
-    "@arcblock/ws": "1.13.23",
-    "@ocap/asset": "1.13.23",
-    "@ocap/mcrypto": "1.13.23",
-    "@ocap/message": "1.13.23",
-    "@ocap/proto": "1.13.23",
-    "@ocap/util": "1.13.23",
-    "@ocap/wallet": "1.13.23",
+    "@arcblock/ws": "1.13.27",
+    "@ocap/asset": "1.13.27",
+    "@ocap/mcrypto": "1.13.27",
+    "@ocap/message": "1.13.27",
+    "@ocap/proto": "1.13.27",
+    "@ocap/util": "1.13.27",
+    "@ocap/wallet": "1.13.27",
     "blueimp-md5": "^2.10.0",
     "debug": "^4.3.2",
     "jsonpack": "^1.1.5",
     "lodash": "^4.17.21",
-    "phoenix": "1.5.12",
     "react-app-polyfill": "^1.0.1",
-    "wolfy87-eventemitter": "^5.2.5",
-    "ws": "^8.2.2"
+    "wolfy87-eventemitter": "^5.2.5"
   },
   "devDependencies": {
     "axios": "^0.21.4",
@@ -107,5 +105,5 @@
   "bugs": {
     "url": "https://github.com/ArcBlock/asset-chain/issues"
   },
-  "gitHead": "ba23a721c1850909b6dd550bd6cac82c22331177"
+  "gitHead": "179c653331c7702c0db7e09b16fa7a1e3db43a48"
 }