@based/server 6.6.0 → 6.7.0

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.
@@ -22,7 +22,11 @@ const subscribeChannel = (server, id, ctx) => {
22
22
  exports.subscribeChannel = subscribeChannel;
23
23
  const subscribeChannelFunction = (server, id, update) => {
24
24
  const channel = (0, get_1.getChannelAndStopRemove)(server, id);
25
- channel.functionChannelClients.add(update);
25
+ if (channel.functionChannelClients.add(update)) {
26
+ if (server.channelEvents) {
27
+ server.channelEvents.subscribe(channel);
28
+ }
29
+ }
26
30
  if (!channel.isActive && !channel.doesNotExist) {
27
31
  (0, start_1.startChannel)(server, id);
28
32
  }
@@ -1 +1 @@
1
- {"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/channel/subscribe.ts"],"names":[],"mappings":";;;AACA,+BAA+C;AAM/C,mCAAsC;AAE/B,MAAM,gBAAgB,GAAG,CAC9B,MAAmB,EACnB,EAAU,EACV,GAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IAED,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACpC,MAAM,OAAO,GAAG,IAAA,6BAAuB,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAEnD,IAAI,MAAM,CAAC,aAAa,EAAE;QACxB,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;KAC7C;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACnB,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC/B,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;QAC9C,IAAA,oBAAY,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;KACzB;AACH,CAAC,CAAA;AAtBY,QAAA,gBAAgB,oBAsB5B;AAEM,MAAM,wBAAwB,GAAG,CACtC,MAAmB,EACnB,EAAU,EACV,MAAsC,EACtC,EAAE;IACF,MAAM,OAAO,GAAG,IAAA,6BAAuB,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACnD,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC1C,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;QAC9C,IAAA,oBAAY,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;KACzB;AACH,CAAC,CAAA;AAVY,QAAA,wBAAwB,4BAUpC"}
1
+ {"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/channel/subscribe.ts"],"names":[],"mappings":";;;AACA,+BAA+C;AAM/C,mCAAsC;AAE/B,MAAM,gBAAgB,GAAG,CAC9B,MAAmB,EACnB,EAAU,EACV,GAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IAED,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACpC,MAAM,OAAO,GAAG,IAAA,6BAAuB,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAEnD,IAAI,MAAM,CAAC,aAAa,EAAE;QACxB,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;KAC7C;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACnB,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC/B,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;QAC9C,IAAA,oBAAY,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;KACzB;AACH,CAAC,CAAA;AAtBY,QAAA,gBAAgB,oBAsB5B;AAEM,MAAM,wBAAwB,GAAG,CACtC,MAAmB,EACnB,EAAU,EACV,MAAsC,EACtC,EAAE;IACF,MAAM,OAAO,GAAG,IAAA,6BAAuB,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAEnD,IAAI,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC9C,IAAI,MAAM,CAAC,aAAa,EAAE;YACxB,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;SACxC;KACF;IACD,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;QAC9C,IAAA,oBAAY,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;KACzB;AACH,CAAC,CAAA;AAfY,QAAA,wBAAwB,4BAepC"}
@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.unsubscribeChannelIgnoreClient = exports.unsubscribeChannel = exports.unsubscribeFunction = void 0;
4
4
  const destroy_1 = require("./destroy");
5
5
  const unsubscribeFunction = (server, id, update) => {
6
- const obs = server.activeChannelsById.get(id);
7
- if (!obs) {
6
+ const channel = server.activeChannelsById.get(id);
7
+ if (!channel) {
8
8
  return;
9
9
  }
10
- if (obs.functionChannelClients.delete(update)) {
10
+ if (channel.functionChannelClients.delete(update)) {
11
+ if (server.channelEvents) {
12
+ server.channelEvents.unsubscribe(channel);
13
+ }
11
14
  (0, destroy_1.destroyChannel)(server, id);
12
15
  return true;
13
16
  }
@@ -1 +1 @@
1
- {"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/channel/unsub.ts"],"names":[],"mappings":";;;AAMA,uCAA0C;AAEnC,MAAM,mBAAmB,GAAG,CACjC,MAAmB,EACnB,EAAU,EACV,MAA8B,EACjB,EAAE;IACf,MAAM,GAAG,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAC7C,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC7C,IAAA,wBAAc,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAbY,QAAA,mBAAmB,uBAa/B;AAEM,MAAM,kBAAkB,GAAG,CAChC,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QACxB,OAAM;KACP;IACD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACtC,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACtB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACtC,IAAI,MAAM,CAAC,aAAa,EAAE;YACxB,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;SAC/C;QACD,IAAA,wBAAc,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAzBY,QAAA,kBAAkB,sBAyB9B;AAEM,MAAM,8BAA8B,GAAG,CAC5C,MAAmB,EACnB,EAAU,EACV,GAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,aAAa,EAAE;QAC9D,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;KAC/C;IAED,IAAA,wBAAc,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAC5B,CAAC,CAAA;AAnBY,QAAA,8BAA8B,kCAmB1C"}
1
+ {"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/channel/unsub.ts"],"names":[],"mappings":";;;AAMA,uCAA0C;AAEnC,MAAM,mBAAmB,GAAG,CACjC,MAAmB,EACnB,EAAU,EACV,MAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,IAAI,OAAO,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QACjD,IAAI,MAAM,CAAC,aAAa,EAAE;YACxB,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;SAC1C;QACD,IAAA,wBAAc,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAhBY,QAAA,mBAAmB,uBAgB/B;AAEM,MAAM,kBAAkB,GAAG,CAChC,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QACxB,OAAM;KACP;IACD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACtC,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACtB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACtC,IAAI,MAAM,CAAC,aAAa,EAAE;YACxB,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;SAC/C;QACD,IAAA,wBAAc,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAzBY,QAAA,kBAAkB,sBAyB9B;AAEM,MAAM,8BAA8B,GAAG,CAC5C,MAAmB,EACnB,EAAU,EACV,GAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,aAAa,EAAE;QAC9D,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;KAC/C;IAED,IAAA,wBAAc,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAC5B,CAAC,CAAA;AAnBY,QAAA,8BAA8B,kCAmB1C"}
@@ -7,6 +7,9 @@ const verifyRoute_1 = require("../verifyRoute");
7
7
  const installFn_1 = require("../installFn");
8
8
  const getObsData = (resolve, reject, server, id, ctx, route) => {
9
9
  const obs = (0, query_1.getObsAndStopRemove)(server, id);
10
+ if (server.queryEvents) {
11
+ server.queryEvents.get(obs);
12
+ }
10
13
  if (obs.error) {
11
14
  reject((0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionError, {
12
15
  route,
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/functionApi/get.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/functionApi/get.ts"],"names":[],"mappings":"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"}
@@ -34,6 +34,9 @@ exports.subscribeWs = subscribeWs;
34
34
  const subscribeFunction = (server, id, update) => {
35
35
  const obs = (0, get_1.getObsAndStopRemove)(server, id);
36
36
  if (obs.functionObserveClients.add(update)) {
37
+ if (server.queryEvents) {
38
+ server.queryEvents.subscribe(obs);
39
+ }
37
40
  if (obs.cache) {
38
41
  update(obs.rawData, obs.checksum, null, obs.cache, obs.diffCache, obs.previousChecksum, obs.isDeflate);
39
42
  }
@@ -1 +1 @@
1
- {"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/query/subscribe.ts"],"names":[],"mappings":";;;AAEA,+CAA2C;AAE3C,iCAAkC;AAClC,+BAA2C;AAC3C,4CAA4C;AAGrC,MAAM,WAAW,GAAG,CACzB,MAAmB,EACnB,EAAU,EACV,QAAgB,EAChB,GAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAE3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IAED,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACpC,MAAM,GAAG,GAAG,IAAA,yBAAmB,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAE3C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACnB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAE3B,IAAI,GAAG,CAAC,KAAK,EAAE;QACb,IAAA,yBAAa,EAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAM;KACP;IAED,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;KACvC;IAED,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE;QAC1C,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,gBAAgB,KAAK,QAAQ,EAAE;YACtD,IAAA,gBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;SACnC;aAAM;YACL,IAAA,gBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;SAC/B;KACF;AACH,CAAC,CAAA;AAlCY,QAAA,WAAW,eAkCvB;AAEM,MAAM,iBAAiB,GAAG,CAC/B,MAAmB,EACnB,EAAU,EACV,MAAgC,EAChC,EAAE;IACF,MAAM,GAAG,GAAG,IAAA,yBAAmB,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAC3C,IAAI,GAAG,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC1C,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,MAAM,CACJ,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,QAAQ,EACZ,IAAI,EACJ,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,CACd,CAAA;SACF;KACF;AACH,CAAC,CAAA;AAnBY,QAAA,iBAAiB,qBAmB7B;AAEM,MAAM,aAAa,GAAG,CAC3B,GAAqB,EACrB,MAAoE,EACpE,EAAE;IACF,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAA;IAChB,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE;QACnB,GAAG,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAA;KAC3B;IACD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC5B,CAAC,CAAA;AATY,QAAA,aAAa,iBASzB"}
1
+ {"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/query/subscribe.ts"],"names":[],"mappings":";;;AAEA,+CAA2C;AAE3C,iCAAkC;AAClC,+BAA2C;AAC3C,4CAA4C;AAGrC,MAAM,WAAW,GAAG,CACzB,MAAmB,EACnB,EAAU,EACV,QAAgB,EAChB,GAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAE3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IAED,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACpC,MAAM,GAAG,GAAG,IAAA,yBAAmB,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAE3C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACnB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAE3B,IAAI,GAAG,CAAC,KAAK,EAAE;QACb,IAAA,yBAAa,EAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAM;KACP;IAED,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;KACvC;IAED,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE;QAC1C,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,gBAAgB,KAAK,QAAQ,EAAE;YACtD,IAAA,gBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;SACnC;aAAM;YACL,IAAA,gBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;SAC/B;KACF;AACH,CAAC,CAAA;AAlCY,QAAA,WAAW,eAkCvB;AAEM,MAAM,iBAAiB,GAAG,CAC/B,MAAmB,EACnB,EAAU,EACV,MAAgC,EAChC,EAAE;IACF,MAAM,GAAG,GAAG,IAAA,yBAAmB,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAE3C,IAAI,GAAG,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC1C,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;SAClC;QAED,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,MAAM,CACJ,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,QAAQ,EACZ,IAAI,EACJ,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,CACd,CAAA;SACF;KACF;AACH,CAAC,CAAA;AAxBY,QAAA,iBAAiB,qBAwB7B;AAEM,MAAM,aAAa,GAAG,CAC3B,GAAqB,EACrB,MAAoE,EACpE,EAAE;IACF,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAA;IAChB,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE;QACnB,GAAG,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAA;KAC3B;IACD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC5B,CAAC,CAAA;AATY,QAAA,aAAa,iBASzB"}
@@ -8,6 +8,9 @@ const unsubscribeFunction = (server, id, update) => {
8
8
  return;
9
9
  }
10
10
  if (obs.functionObserveClients.delete(update)) {
11
+ if (server.queryEvents) {
12
+ server.queryEvents.unsubscribe(obs);
13
+ }
11
14
  (0, destroy_1.destroyObs)(server, id);
12
15
  return true;
13
16
  }
@@ -1 +1 @@
1
- {"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/query/unsub.ts"],"names":[],"mappings":";;;AAEA,uCAAsC;AAG/B,MAAM,mBAAmB,GAAG,CACjC,MAAmB,EACnB,EAAU,EACV,MAAgC,EACnB,EAAE;IACf,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC7C,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAbY,QAAA,mBAAmB,uBAa/B;AAEM,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QACpC,OAAM;KACP;IACD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACtB,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QAClC,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SACzC;QACD,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAtBY,QAAA,aAAa,iBAsBzB;AAEM,MAAM,yBAAyB,GAAG,CACvC,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,IAAI,CAAA;KACZ;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE;QACxD,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;KACzC;IACD,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AAjBY,QAAA,yBAAyB,6BAiBrC"}
1
+ {"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/query/unsub.ts"],"names":[],"mappings":";;;AAEA,uCAAsC;AAG/B,MAAM,mBAAmB,GAAG,CACjC,MAAmB,EACnB,EAAU,EACV,MAAgC,EACnB,EAAE;IACf,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC7C,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;SACpC;QACD,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAhBY,QAAA,mBAAmB,uBAgB/B;AAEM,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QACpC,OAAM;KACP;IACD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACtB,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QAClC,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SACzC;QACD,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAtBY,QAAA,aAAa,iBAsBzB;AAEM,MAAM,yBAAyB,GAAG,CACvC,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,IAAI,CAAA;KACZ;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE;QACxD,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;KACzC;IACD,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AAjBY,QAAA,yBAAyB,6BAiBrC"}
package/dist/server.d.ts CHANGED
@@ -23,13 +23,13 @@ type RateLimit = {
23
23
  };
24
24
  type GetIp = (res: uws.HttpResponse, req: uws.HttpRequest) => string;
25
25
  type QueryEvents = {
26
- subscribe: (obs: ActiveObservable, ctx: Context<WebSocketSession>) => void;
27
- unsubscribe: (obs: ActiveObservable, ctx: Context<WebSocketSession>) => void;
28
- get: (obs: ActiveObservable, ctx: Context<WebSocketSession | HttpSession>) => void;
26
+ subscribe: (obs: ActiveObservable, ctx?: Context<WebSocketSession>) => void;
27
+ unsubscribe: (obs: ActiveObservable, ctx?: Context<WebSocketSession>) => void;
28
+ get: (obs: ActiveObservable, ctx?: Context<WebSocketSession | HttpSession>) => void;
29
29
  };
30
30
  type ChannelEvents = {
31
- subscribe: (obs: ActiveChannel, ctx: Context<WebSocketSession>) => void;
32
- unsubscribe: (obs: ActiveChannel, ctx: Context<WebSocketSession>) => void;
31
+ subscribe: (obs: ActiveChannel, ctx?: Context<WebSocketSession>) => void;
32
+ unsubscribe: (obs: ActiveChannel, ctx?: Context<WebSocketSession>) => void;
33
33
  };
34
34
  export type ServerOptions = {
35
35
  clients?: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@based/server",
3
- "version": "6.6.0",
3
+ "version": "6.7.0",
4
4
  "license": "MIT",
5
5
  "main": "./dist/index.js",
6
6
  "files": [