@based/react 2.4.0 → 2.5.2

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Query, BasedOpts } from '@based/client';
+import { Query, BasedOpts, AnalyticsHistoryOpts, AnalyticsOpts, AnalyticsTypesOpts } from '@based/client';
 import { Loading, Data } from './types';
 export * from './meta';
 export * from './clients';
@@ -32,6 +32,18 @@ export declare function useData(name: string): {
     loading: Loading;
     checksum: number;
 };
+export declare function useData(query: null): {
+    data: Data;
+    error?: Error;
+    loading: Loading;
+    checksum: number;
+};
+export declare function useData(): {
+    data: Data;
+    error?: Error;
+    loading: Loading;
+    checksum: number;
+};
 export declare function useData(name: string, payload: any, clientSelector?: string | (BasedOpts & {
     key?: string;
 })): {
@@ -40,3 +52,10 @@ export declare function useData(name: string, payload: any, clientSelector?: str
     loading: Loading;
     checksum: number;
 };
+export declare function useAnalytics(params?: AnalyticsHistoryOpts | AnalyticsTypesOpts | AnalyticsOpts, clientSelector?: string | (BasedOpts & {
+    key?: string;
+})): {
+    data: Data;
+    error?: Error;
+    loading: Loading;
+};

package/dist/index.js

@@ -1 +1 @@
-var te=Object.create;var S=Object.defineProperty;var ne=Object.getOwnPropertyDescriptor;var oe=Object.getOwnPropertyNames,H=Object.getOwnPropertySymbols,se=Object.getPrototypeOf,V=Object.prototype.hasOwnProperty,ie=Object.prototype.propertyIsEnumerable;var K=(e,r,t)=>r in e?S(e,r,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[r]=t,W=(e,r)=>{for(var t in r||(r={}))V.call(r,t)&&K(e,t,r[t]);if(H)for(var t of H(r))ie.call(r,t)&&K(e,t,r[t]);return e};var ae=(e,r)=>{for(var t in r)S(e,t,{get:r[t],enumerable:!0})},J=(e,r,t,i)=>{if(r&&typeof r=="object"||typeof r=="function")for(let n of oe(r))!V.call(e,n)&&n!==t&&S(e,n,{get:()=>r[n],enumerable:!(i=ne(r,n))||i.enumerable});return e};var X=(e,r,t)=>(t=e!=null?te(se(e)):{},J(r||!e||!e.__esModule?S(t,"default",{value:e,enumerable:!0}):t,e)),ue=e=>J(S({},"__esModule",{value:!0}),e);var ke={};ae(ke,{BasedContext:()=>Q,Provider:()=>le,defaultCreateClient:()=>Y,updateMeta:()=>g,useAuth:()=>pe,useBasedContext:()=>Z,useClient:()=>C,useClients:()=>fe,useData:()=>re,useError:()=>ge,useLoading:()=>de,useQuery:()=>me,useSchema:()=>be,useTrack:()=>he});module.exports=ue(ke);var f=require("react"),O=require("@based/client");function j(e,r){return r.error&&(e.error=r.error),r.data&&(e.checksum=r.checksum||0,e.data=r.data,e.loading=!1,e.error&&delete e.error),r.merge&&(e.checksum=r.checksum||0,e.data?Object.assign(e.data,r.merge):e.data=r.merge,e.loading=!1,e.error&&delete e.error),r.loading&&(e.loading=r.loading),W({},e)}var B=e=>{if(!!e)return e.key?e.key:`${e.env}_${e.project}_${e.org}_${e.cluster||""}_${e.name||""}`};var k=X(require("react")),w=X(require("@based/client"));var $=new Set,Q=(0,k.createContext)({clients:{},removeClient:(...e)=>{}}),Y=e=>{if(typeof e=="object")return process.env.CLUSTER&&process.env.CLUSTER.startsWith("local")&&!e.cluster&&(e.cluster=process.env.CLUSTER),(0,w.default)(e);console.error("Cannot create client from "+e)},le=({client:e,children:r,clients:t,createClient:i})=>(!t&&e?t={default:e}:t&&e&&(t.default=e),k.default.createElement(Q.Provider,{value:{clients:t,createClient:i||Y,removeClient:o=>{if(o instanceof w.Based){for(let h in t)if(t[h]===o){o=h;break}if(typeof o!="string"){console.error("Cannot find client to remove from ctx",o);return}}else typeof o!="string"&&(o=B(o));t[o]&&(t[o].disconnect(),delete t[o],$.forEach(h=>h()))}}},r)),Z=()=>(0,k.useContext)(Q);function ce(e){return e+1}var fe=()=>{let e=Z(),[,r]=(0,k.useReducer)(ce,0);return(0,k.useEffect)(()=>{let t,i=()=>{t=setTimeout(r,0)};return $.add(i),()=>{$.delete(i),clearTimeout(t)}},[]),Object.values(e.clients)},C=(e="default")=>{let r=(0,k.useContext)(Q);if(typeof e=="object"&&!(e.env&&e.project&&e.org))return;let t;typeof e=="string"?t=e:t=e.key||B(e);let i=r.clients[t];return!i&&r.createClient&&(i=r.createClient(e),i&&(r.clients[t]=i,$.forEach(n=>n()))),i};var v=require("react"),E={},P=new Set,N=new Set,q=new Set,D=!1,F="",I=0,_=I+F;function g(e,r,t){t?(F=t,e in E?E[e]=t:(E[e]=t,I++)):e in E&&(I--,delete E[e]);let i=I+F;i!==_&&(_=i,P.forEach(o=>o(_))),r?N.add(e):N.delete(e);let n=!!N.size;n!==D&&(D=n,q.forEach(o=>o(D)))}function de(){let[,e]=(0,v.useState)(D);return q.add(e),(0,v.useEffect)(()=>()=>{q.delete(e)},[]),{loading:D}}function ge(){let[,e]=(0,v.useState)(_);return P.add(e),(0,v.useEffect)(()=>()=>{P.delete(e)},[]),{error:I?F:null,errors:Object.values(E)}}var s=require("react"),b=require("@based/client");var M=require("@saulx/hash"),ee=(0,b.generateSubscriptionId)({$subscribe_schema:"default"});function me(e,r={},t){let[i,n]=(0,s.useReducer)(j,{loading:!0,data:{},checksum:0}),o=(0,s.useRef)({checksum:0,fns:{}}),h=t||"default",c=C(h);if(e){let[x,R]=(0,s.useState)(0);if((0,s.useEffect)(()=>{let[,u]=(0,b.addSubscriber)(c.client,{$subscribe_schema:"default"},(d,l)=>{c.client.configuration||(c.client.configuration={dbs:[],schema:{},functions:{}}),c.client.configuration.schema.default=d,R(l)},d=>{d&&console.error(d)},d=>{console.error(d)},ee);return()=>{(0,b.removeSubscriber)(c.client,ee,u)}},[]),x){let u;typeof e=="string"?u=c.gql(e):u=e,u=(0,b.handleGraphqlVariables)(u,u,r);let d={},l={};for(let m in u.ops){if(u.ops[m].fnObserve){let{name:L,payload:a}=u.ops[m].fnObserve;d[m]={name:L,payload:a,key:m};continue}l[m]=u.ops[m].get}let U=(0,s.useMemo)(()=>(0,M.hashObjectIgnoreKeyOrder)(d),[d]),T=(0,s.useMemo)(()=>(0,b.generateSubscriptionId)(l),[l]),z=typeof h=="string"?h:B(h);if(c){let m=z+T;(0,s.useEffect)(()=>{let L=[];for(let a in d)L.push((0,b.addSubscriber)(c.client,d[a].payload,(p,A)=>{g(m,!1,!1),o.current.fns[a]!==A&&(o.current.fns[a]=A,n({merge:{[a]:p},checksum:(0,M.hashObjectIgnoreKeyOrder)(o.current)}))},p=>{p&&(console.error(p),n({error:p,loading:!1}))},p=>{console.error(p),g(m,!1,p),n({error:p})},void 0,d[a].name));return()=>{for(let[a,p]of L)(0,b.removeSubscriber)(c.client,a,p)}},[U]),(0,s.useEffect)(()=>{if(!x)return;g(m,!0,!1);let[,L]=(0,b.addSubscriber)(c.client,l,(a,p)=>{g(m,!1,!1),o.current.checksum!==p&&(o.current.checksum=p,n({merge:a,checksum:(0,M.hashObjectIgnoreKeyOrder)(o.current)}))},a=>{a&&(console.error(a),g(m,!1,a),n({error:a,loading:!1}))},a=>{console.error(a),g(m,!1,a),n({error:a})},T);return()=>{g(m,!1,!1),(0,b.removeSubscriber)(c.client,T,L)}},[T,z,x])}else(0,s.useEffect)(y,[null,null])}else(0,s.useMemo)(y,[null]),(0,s.useMemo)(y,[null]),(0,s.useEffect)(y,[null]),(0,s.useEffect)(y,[null,null,null])}else(0,s.useState)(null),(0,s.useEffect)(y,[null]),(0,s.useMemo)(y,[null]),(0,s.useMemo)(y,[null]),(0,s.useEffect)(y,[null]),(0,s.useEffect)(y,[null,null,null]);return i}function y(){}function pe(e){let r=C(e),[t,i]=(0,f.useState)(!1);return(0,f.useEffect)(()=>{let n=()=>i(r.getToken());return r.on("auth",n),()=>{r.removeListener("auth",n)}},[]),t}function be(e="default",r){let t=re(e?{$subscribe_schema:e}:null,r);return{loading:t.loading,error:t.error,schema:t.data}}function he(e,r,t){if(e){let n=C(t||"default"),o=(0,f.useMemo)(()=>(0,O.generateSubscriptionId)(r,e),[e,r]);(0,f.useEffect)(()=>(n.track(e,r),()=>{n.untrack(e,r)}),[o])}else C(t),(0,f.useMemo)(()=>{},[]),(0,f.useEffect)(G,[null,null])}function re(e,r,t){let[i,n]=(0,f.useReducer)(j,{loading:!0,data:{},checksum:0});if(e){let o=(0,f.useMemo)(()=>(0,O.generateSubscriptionId)(typeof e=="string"?[e,r]:e),[r,e]),h=typeof e=="string",c=t||(h?"default":r),x=C(c),R=typeof c=="string"?c:B(c);if(x){let u=R+o;(0,f.useEffect)(()=>{g(u,!0,!1),n({error:null,loading:!0,data:{}});let[,d]=(0,O.addSubscriber)(x.client,h?r:e,(l,U)=>{g(u,!1,!1),n({data:l,checksum:U})},l=>{l&&(console.error(l),g(u,!1,l),n({error:l,loading:!1}))},l=>{console.error(l),g(u,!1,l),n({error:l})},o,typeof e=="string"?e:void 0);return()=>{g(u,!1,!1),(0,O.removeSubscriber)(x.client,o,d)}},[o,R])}else(0,f.useEffect)(G,[null,null])}else(0,f.useMemo)(G,[r,e]),C(t),(0,f.useEffect)(G,[null,null]);return i}function G(){}0&&(module.exports={BasedContext,Provider,defaultCreateClient,updateMeta,useAuth,useBasedContext,useClient,useClients,useData,useError,useLoading,useQuery,useSchema,useTrack});
+var te=Object.create;var S=Object.defineProperty;var ne=Object.getOwnPropertyDescriptor;var oe=Object.getOwnPropertyNames,z=Object.getOwnPropertySymbols,se=Object.getPrototypeOf,V=Object.prototype.hasOwnProperty,ie=Object.prototype.propertyIsEnumerable;var K=(e,r,t)=>r in e?S(e,r,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[r]=t,W=(e,r)=>{for(var t in r||(r={}))V.call(r,t)&&K(e,t,r[t]);if(z)for(var t of z(r))ie.call(r,t)&&K(e,t,r[t]);return e};var ae=(e,r)=>{for(var t in r)S(e,t,{get:r[t],enumerable:!0})},J=(e,r,t,s)=>{if(r&&typeof r=="object"||typeof r=="function")for(let n of oe(r))!V.call(e,n)&&n!==t&&S(e,n,{get:()=>r[n],enumerable:!(s=ne(r,n))||s.enumerable});return e};var X=(e,r,t)=>(t=e!=null?te(se(e)):{},J(r||!e||!e.__esModule?S(t,"default",{value:e,enumerable:!0}):t,e)),ue=e=>J(S({},"__esModule",{value:!0}),e);var ke={};ae(ke,{BasedContext:()=>w,Provider:()=>le,defaultCreateClient:()=>Y,updateMeta:()=>m,useAnalytics:()=>he,useAuth:()=>pe,useBasedContext:()=>Z,useClient:()=>C,useClients:()=>de,useData:()=>re,useError:()=>ge,useLoading:()=>fe,useQuery:()=>me,useSchema:()=>ye,useTrack:()=>be});module.exports=ue(ke);var d=require("react"),O=require("@based/client");function I(e,r){return r.error&&(e.error=r.error),r.data&&(e.checksum=r.checksum||0,e.data=r.data,e.loading=!1,e.error&&delete e.error),r.merge&&(e.checksum=r.checksum||0,e.data?Object.assign(e.data,r.merge):e.data=r.merge,e.loading=!1,e.error&&delete e.error),r.loading&&(e.loading=r.loading),W({},e)}var L=e=>{if(!!e)return e.key?e.key:`${e.env}_${e.project}_${e.org}_${e.cluster||""}_${e.name||""}`};var k=X(require("react")),$=X(require("@based/client"));var _=new Set,w=(0,k.createContext)({clients:{},removeClient:(...e)=>{}}),Y=e=>{if(typeof e=="object")return process.env.CLUSTER&&process.env.CLUSTER.startsWith("local")&&!e.cluster&&(e.cluster=process.env.CLUSTER),(0,$.default)(e);console.error("Cannot create client from "+e)},le=({client:e,children:r,clients:t,createClient:s})=>(!t&&e?t={default:e}:t&&e&&(t.default=e),k.default.createElement(w.Provider,{value:{clients:t,createClient:s||Y,removeClient:o=>{if(o instanceof $.Based){for(let b in t)if(t[b]===o){o=b;break}if(typeof o!="string"){console.error("Cannot find client to remove from ctx",o);return}}else typeof o!="string"&&(o=L(o));t[o]&&(t[o].disconnect(),delete t[o],_.forEach(b=>b()))}}},r)),Z=()=>(0,k.useContext)(w);function ce(e){return e+1}var de=()=>{let e=Z(),[,r]=(0,k.useReducer)(ce,0);return(0,k.useEffect)(()=>{let t,s=()=>{t=setTimeout(r,0)};return _.add(s),()=>{_.delete(s),clearTimeout(t)}},[]),Object.values(e.clients)},C=(e="default")=>{let r=(0,k.useContext)(w);if(typeof e=="object"&&!(e.env&&e.project&&e.org))return;let t;typeof e=="string"?t=e:t=e.key||L(e);let s=r.clients[t];return!s&&r.createClient&&(s=r.createClient(e),s&&(r.clients[t]=s,_.forEach(n=>n()))),s};var D=require("react"),v={},H=new Set,U=new Set,N=new Set,R=!1,F="",T=0,Q=T+F;function m(e,r,t){t?(F=t,e in v?v[e]=t:(v[e]=t,T++)):e in v&&(T--,delete v[e]);let s=T+F;s!==Q&&(Q=s,H.forEach(o=>o(Q))),r?U.add(e):U.delete(e);let n=!!U.size;n!==R&&(R=n,N.forEach(o=>o(R)))}function fe(){let[,e]=(0,D.useState)(R);return N.add(e),(0,D.useEffect)(()=>()=>{N.delete(e)},[]),{loading:R}}function ge(){let[,e]=(0,D.useState)(Q);return H.add(e),(0,D.useEffect)(()=>()=>{H.delete(e)},[]),{error:T?F:null,errors:Object.values(v)}}var i=require("react"),h=require("@based/client");var M=require("@saulx/hash"),ee=(0,h.generateSubscriptionId)({$subscribe_schema:"default"});function me(e,r={},t){let[s,n]=(0,i.useReducer)(I,{loading:!0,data:{},checksum:0}),o=(0,i.useRef)({checksum:0,fns:{}}),b=t||"default",a=C(b);if(e){let[f,B]=(0,i.useState)(0);if((0,i.useEffect)(()=>{let[,l]=(0,h.addSubscriber)(a.client,{$subscribe_schema:"default"},(g,c)=>{a.client.configuration||(a.client.configuration={dbs:[],schema:{},functions:{}}),a.client.configuration.schema.default=g,B(c)},g=>{g&&console.error(g)},g=>{console.error(g)},ee);return()=>{(0,h.removeSubscriber)(a.client,ee,l)}},[]),f){let l;typeof e=="string"?l=a.gql(e):l=e,l=(0,h.handleGraphqlVariables)(l,l,r);let g={},c={};for(let p in l.ops){if(l.ops[p].fnObserve){let{name:E,payload:u}=l.ops[p].fnObserve;g[p]={name:E,payload:u,key:p};continue}c[p]=l.ops[p].get}let G=(0,i.useMemo)(()=>(0,M.hashObjectIgnoreKeyOrder)(g),[g]),A=(0,i.useMemo)(()=>(0,h.generateSubscriptionId)(c),[c]),q=typeof b=="string"?b:L(b);if(a){let p=q+A;(0,i.useEffect)(()=>{let E=[];for(let u in g)E.push((0,h.addSubscriber)(a.client,g[u].payload,(y,P)=>{m(p,!1,!1),o.current.fns[u]!==P&&(o.current.fns[u]=P,n({merge:{[u]:y},checksum:(0,M.hashObjectIgnoreKeyOrder)(o.current)}))},y=>{y&&(console.error(y),n({error:y,loading:!1}))},y=>{console.error(y),m(p,!1,y),n({error:y})},void 0,g[u].name));return()=>{for(let[u,y]of E)(0,h.removeSubscriber)(a.client,u,y)}},[G]),(0,i.useEffect)(()=>{if(!f)return;m(p,!0,!1);let[,E]=(0,h.addSubscriber)(a.client,c,(u,y)=>{m(p,!1,!1),o.current.checksum!==y&&(o.current.checksum=y,n({merge:u,checksum:(0,M.hashObjectIgnoreKeyOrder)(o.current)}))},u=>{u&&(console.error(u),m(p,!1,u),n({error:u,loading:!1}))},u=>{console.error(u),m(p,!1,u),n({error:u})},A);return()=>{m(p,!1,!1),(0,h.removeSubscriber)(a.client,A,E)}},[A,q,f])}else(0,i.useEffect)(x,[null,null])}else(0,i.useMemo)(x,[null]),(0,i.useMemo)(x,[null]),(0,i.useEffect)(x,[null]),(0,i.useEffect)(x,[null,null,null])}else(0,i.useState)(null),(0,i.useEffect)(x,[null]),(0,i.useMemo)(x,[null]),(0,i.useMemo)(x,[null]),(0,i.useEffect)(x,[null]),(0,i.useEffect)(x,[null,null,null]);return s}function x(){}function pe(e){let r=C(e),[t,s]=(0,d.useState)(!1);return(0,d.useEffect)(()=>{let n=()=>s(r.getToken());return r.on("auth",n),()=>{r.removeListener("auth",n)}},[]),t}function ye(e="default",r){let t=re(e?{$subscribe_schema:e}:null,r);return{loading:t.loading,error:t.error,schema:t.data}}function be(e,r,t){if(e){let n=C(t||"default"),o=(0,d.useMemo)(()=>(0,O.generateSubscriptionId)(r,e),[e,r]);(0,d.useEffect)(()=>(n.track(e,r),()=>{n.untrack(e,r)}),[o])}else C(t),(0,d.useMemo)(()=>{},[]),(0,d.useEffect)(j,[null,null])}function re(e,r,t){let[s,n]=(0,d.useReducer)(I,{loading:!0,data:{},checksum:0});if(e){let o=(0,d.useMemo)(()=>(0,O.generateSubscriptionId)(typeof e=="string"?[e,r]:e),[r,e]),b=typeof e=="string",a=t||(b?"default":r),f=C(a),B=typeof a=="string"?a:L(a);if(f){let l=B+o;(0,d.useEffect)(()=>{m(l,!0,!1),n({error:null,loading:!0,data:{}});let[,g]=(0,O.addSubscriber)(f.client,b?r:e,(c,G)=>{m(l,!1,!1),n({data:c,checksum:G})},c=>{c&&(console.error(c),m(l,!1,c),n({error:c,loading:!1}))},c=>{console.error(c),m(l,!1,c),n({error:c})},o,typeof e=="string"?e:void 0);return()=>{m(l,!1,!1),(0,O.removeSubscriber)(f.client,o,g)}},[o,B])}else(0,d.useEffect)(j,[null,null])}else(0,d.useMemo)(j,[r,e]),C(t),(0,d.useEffect)(j,[null,null]);return s}function he(e,r){let[t,s]=(0,d.useReducer)(I,{loading:!0,data:{},checksum:0}),n,o,a=C(r||"default");return a&&e?(0,d.useEffect)(()=>(s({error:null,loading:!0,data:{}}),(0,O.addSubscriber)(a.client,e,(f,B)=>{s({data:f,checksum:B})},(f,B,l,g,c)=>{n=B,o=l,(f||c)&&(console.error(f),s({error:f,loading:!1}))},f=>{console.error(f),s({error:f})},void 0,"analytics"),()=>{(0,O.removeSubscriber)(a.client,n,o)}),[]):(0,d.useEffect)(j,[]),t}function j(){}0&&(module.exports={BasedContext,Provider,defaultCreateClient,updateMeta,useAnalytics,useAuth,useBasedContext,useClient,useClients,useData,useError,useLoading,useQuery,useSchema,useTrack});

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/react",
-  "version": "2.4.0",
+  "version": "2.5.2",
   "license": "MIT",
   "source": "src/index.tsx",
   "main": "dist/index.js",
@@ -12,11 +12,10 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "react": "16||17||18",
+    "react": "17||18||16",
     "@based/client": "^2.3.3"
   },
   "dependencies": {
-    "@based/client": "2.3.5",
     "@saulx/hash": "^1.1.0"
   },
   "devDependencies": {

package/src/index.ts

@@ -6,6 +6,9 @@ import {
   removeSubscriber,
   generateSubscriptionId,
   BasedOpts,
+  AnalyticsHistoryOpts,
+  AnalyticsOpts,
+  AnalyticsTypesOpts,
 } from '@based/client'
 
 import { resultReducer } from './reducer'
@@ -102,6 +105,20 @@ export function useData(name: string): {
   checksum: number
 }
 
+export function useData(query: null): {
+  data: Data
+  error?: Error
+  loading: Loading
+  checksum: number
+}
+
+export function useData(): {
+  data: Data
+  error?: Error
+  loading: Loading
+  checksum: number
+}
+
 export function useData(
   name: string,
   payload: any,
@@ -109,7 +126,7 @@ export function useData(
 ): { data: Data; error?: Error; loading: Loading; checksum: number }
 
 export function useData(
-  a: string | Query,
+  a?: string | Query,
   payload?: any,
   clientSelector?: string | (BasedOpts & { key?: string })
 ): {
@@ -182,4 +199,60 @@ export function useData(
   return result
 }
 
+export function useAnalytics(
+  params?: AnalyticsHistoryOpts | AnalyticsTypesOpts | AnalyticsOpts,
+  clientSelector?: string | (BasedOpts & { key?: string })
+): { data: Data; error?: Error; loading: Loading } {
+  const [result, dispatch] = useReducer(resultReducer, {
+    loading: true,
+    data: {},
+    checksum: 0,
+  })
+
+  let subId, subscriberId
+
+  const selector = clientSelector || 'default'
+  const client = useClient(selector)
+
+  if (client && params) {
+    useEffect(() => {
+      dispatch({ error: null, loading: true, data: {} })
+      addSubscriber(
+        client.client,
+        params,
+        // onData:
+        (d, checksum) => {
+          // updateMeta(subKey, false, false) ??
+          dispatch({ data: d, checksum })
+        },
+        // onInitial:
+        (err, subscriptionId, subscriberIdInner, _data, isAuthError) => {
+          subId = subscriptionId
+          subscriberId = subscriberIdInner
+          if (err || isAuthError) {
+            console.error(err)
+            // updateMeta(subKey, false, err)
+            dispatch({ error: err, loading: false })
+          }
+        },
+        // onError:
+        (err) => {
+          console.error(err)
+          // updateMeta(subKey, false, err)
+          dispatch({ error: err })
+        },
+        undefined,
+        'analytics'
+      )
+      return () => {
+        removeSubscriber(client.client, subId, subscriberId)
+      }
+    }, [])
+  } else {
+    useEffect(stubFn, [])
+  }
+
+  return result
+}
+
 function stubFn() {}