core-3nweb-client-lib 0.31.2 → 0.31.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -25,7 +25,7 @@ const service_side_wrap_1 = require("../../core-ipc/json-ipc-wrapping/service-si
25
25
  const caller_side_wrap_1 = require("../../core-ipc/json-ipc-wrapping/caller-side-wrap");
26
26
  function wrapSignInCAP(cap) {
27
27
  return {
28
- completeLoginAndLocalSetup: (0, service_side_wrap_1.wrapObservingFunc)(undefined, (obs, pass) => {
28
+ completeLoginAndLocalSetup: (0, service_side_wrap_1.wrapObservingFunc)((obs, pass) => {
29
29
  cap.completeLoginAndLocalSetup(pass, p => { var _a; return (_a = obs.next) === null || _a === void 0 ? void 0 : _a.call(obs, { p }); })
30
30
  .then(decrResult => {
31
31
  var _a, _b;
@@ -36,7 +36,7 @@ function wrapSignInCAP(cap) {
36
36
  }),
37
37
  getUsersOnDisk: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'getUsersOnDisk'),
38
38
  startLoginToRemoteStorage: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'startLoginToRemoteStorage'),
39
- useExistingStorage: (0, service_side_wrap_1.wrapObservingFunc)(undefined, (obs, addr, pass) => {
39
+ useExistingStorage: (0, service_side_wrap_1.wrapObservingFunc)((obs, addr, pass) => {
40
40
  cap.useExistingStorage(addr, pass, p => { var _a; return (_a = obs.next) === null || _a === void 0 ? void 0 : _a.call(obs, { p }); })
41
41
  .then(decrResult => {
42
42
  var _a, _b;
@@ -99,7 +99,7 @@ function wrapSignUpCAP(cap) {
99
99
  getAvailableDomains: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'getAvailableDomains'),
100
100
  getAvailableAddresses: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'getAvailableAddresses'),
101
101
  addUser: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'addUser'),
102
- createUserParams: (0, service_side_wrap_1.wrapObservingFunc)(undefined, (obs, pass) => {
102
+ createUserParams: (0, service_side_wrap_1.wrapObservingFunc)((obs, pass) => {
103
103
  cap.createUserParams(pass, p => { var _a; return (_a = obs.next) === null || _a === void 0 ? void 0 : _a.call(obs, p); })
104
104
  .then(() => { var _a; return (_a = obs.complete) === null || _a === void 0 ? void 0 : _a.call(obs); }, err => { var _a; return (_a = obs.error) === null || _a === void 0 ? void 0 : _a.call(obs, err); });
105
105
  return noop;
@@ -13,5 +13,6 @@ export interface TransformOpts {
13
13
  export declare function wrapReqReplySrvMethod<T extends object, M extends keyof T>(srv: T, method: M, transforms?: TransformOpts): ExposedFn;
14
14
  export declare function wrapReqReplyFunc(srv: object, func: HandleReqReplyCall, transforms?: TransformOpts): ExposedFn;
15
15
  export declare function wrapReqReplyFunc(func: HandleReqReplyCall, transforms?: TransformOpts): ExposedFn;
16
- export declare function wrapObservingFunc<TEvent>(srv: object | undefined, func: HandleObservingCall<TEvent>, transforms?: TransformOpts): ExposedFn;
16
+ export declare function wrapObservingFunc<TEvent>(func: HandleObservingCall<TEvent>, transforms?: TransformOpts): ExposedFn;
17
+ export declare function wrapObservingFunc<TEvent>(srv: object, func: HandleObservingCall<TEvent>, transforms?: TransformOpts): ExposedFn;
17
18
  export {};
@@ -86,7 +86,18 @@ function toPassedDatum(data, pack) {
86
86
  return (0, json_n_binary_1.serializeArgs)([data]);
87
87
  }
88
88
  }
89
- function wrapObservingFunc(srv, func, transforms) {
89
+ function wrapObservingFunc(srvOrFn, funcOrTransforms, transforms) {
90
+ let srv;
91
+ let func;
92
+ if (typeof srvOrFn === 'function') {
93
+ srv = undefined;
94
+ func = srvOrFn;
95
+ transforms = funcOrTransforms;
96
+ }
97
+ else {
98
+ srv = srvOrFn;
99
+ func = funcOrTransforms;
100
+ }
90
101
  return buf => {
91
102
  const args = argsFromBuffer(buf, transforms);
92
103
  const s = new rxjs_1.Subject();
@@ -26,6 +26,7 @@ function exposeLogger(fn) {
26
26
  }
27
27
  function makeLogCaller(caller, path) {
28
28
  const log = (0, caller_side_wrap_1.makeReqRepFuncCaller)(caller, path);
29
- return (type, msg, err) => log(type, msg, (0, error_1.stringifyErr)(err));
29
+ return (type, msg, err) => log(type, msg, (0, error_1.stringifyErr)(err)).catch(noop);
30
30
  }
31
+ function noop() { }
31
32
  Object.freeze(exports);
@@ -192,12 +192,12 @@ class ClientsSideImpl {
192
192
  const fnCallNum = reqEnv.headers.fnCallNum.value;
193
193
  try {
194
194
  this.startCall(reqEnv);
195
- return deferred.promise;
196
195
  }
197
196
  catch (err) {
198
197
  this.fnCalls.delete(fnCallNum);
199
- throw err;
198
+ deferred.reject(err);
200
199
  }
200
+ return deferred.promise;
201
201
  }
202
202
  startObservableCall(path, req, obs) {
203
203
  const reqEnv = this.setupFnCall(path, req, undefined, obs);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "core-3nweb-client-lib",
3
- "version": "0.31.2",
3
+ "version": "0.31.4",
4
4
  "description": "3NWeb client core library, embeddable into different environments",
5
5
  "main": "build/lib-index.js",
6
6
  "types": "build/lib-index.d.ts",