@based/server 4.0.3 → 4.0.5

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.
Files changed (193) hide show
  1. package/dist/auth/defaultConfig.js +1 -1
  2. package/dist/auth/defaultConfig.js.map +1 -1
  3. package/dist/auth/index.d.ts +14 -2
  4. package/dist/auth/index.js +12 -5
  5. package/dist/auth/index.js.map +1 -1
  6. package/dist/auth/parseJSONAuthState.d.ts +3 -0
  7. package/dist/auth/parseJSONAuthState.js +10 -0
  8. package/dist/auth/parseJSONAuthState.js.map +1 -0
  9. package/dist/authorize copy.d.ts +9 -0
  10. package/dist/authorize copy.js +69 -0
  11. package/dist/authorize copy.js.map +1 -0
  12. package/dist/authorize.d.ts +5 -5
  13. package/dist/authorize.js +33 -17
  14. package/dist/authorize.js.map +1 -1
  15. package/dist/authorizeAndInstall.d.ts +9 -0
  16. package/dist/authorizeAndInstall.js +69 -0
  17. package/dist/authorizeAndInstall.js.map +1 -0
  18. package/dist/channel/cleanup.d.ts +2 -0
  19. package/dist/channel/cleanup.js +53 -0
  20. package/dist/channel/cleanup.js.map +1 -0
  21. package/dist/channel/create.d.ts +3 -0
  22. package/dist/channel/create.js +33 -0
  23. package/dist/channel/create.js.map +1 -0
  24. package/dist/channel/destroy.d.ts +4 -0
  25. package/dist/channel/destroy.js +48 -0
  26. package/dist/channel/destroy.js.map +1 -0
  27. package/dist/channel/extend.d.ts +4 -0
  28. package/dist/channel/extend.js +16 -0
  29. package/dist/channel/extend.js.map +1 -0
  30. package/dist/channel/get.d.ts +4 -0
  31. package/dist/channel/get.js +15 -0
  32. package/dist/channel/get.js.map +1 -0
  33. package/dist/channel/index.d.ts +8 -0
  34. package/dist/channel/index.js +25 -0
  35. package/dist/channel/index.js.map +1 -0
  36. package/dist/channel/start.d.ts +2 -0
  37. package/dist/channel/start.js +76 -0
  38. package/dist/channel/start.js.map +1 -0
  39. package/dist/channel/subscribe.d.ts +4 -0
  40. package/dist/channel/subscribe.js +28 -0
  41. package/dist/channel/subscribe.js.map +1 -0
  42. package/dist/channel/types.d.ts +14 -0
  43. package/dist/channel/types.js +4 -0
  44. package/dist/channel/types.js.map +1 -0
  45. package/dist/channel/unsub.d.ts +5 -0
  46. package/dist/channel/unsub.js +49 -0
  47. package/dist/channel/unsub.js.map +1 -0
  48. package/dist/createSimpleServer.d.ts +18 -16
  49. package/dist/createSimpleServer.js +92 -26
  50. package/dist/createSimpleServer.js.map +1 -1
  51. package/dist/error/errorTypeHandlers.d.ts +1 -1
  52. package/dist/error/errorTypeHandlers.js +16 -46
  53. package/dist/error/errorTypeHandlers.js.map +1 -1
  54. package/dist/error/index.js +3 -0
  55. package/dist/error/index.js.map +1 -1
  56. package/dist/error/types.d.ts +22 -27
  57. package/dist/error/types.js +2 -6
  58. package/dist/error/types.js.map +1 -1
  59. package/dist/functionApi/channelSubscribe.d.ts +3 -0
  60. package/dist/functionApi/channelSubscribe.js +43 -0
  61. package/dist/functionApi/channelSubscribe.js.map +1 -0
  62. package/dist/functionApi/client/channel.d.ts +10 -0
  63. package/dist/functionApi/client/channel.js +33 -0
  64. package/dist/functionApi/client/channel.js.map +1 -0
  65. package/dist/functionApi/client/index.d.ts +5 -3
  66. package/dist/functionApi/client/index.js +10 -5
  67. package/dist/functionApi/client/index.js.map +1 -1
  68. package/dist/functionApi/get.js +2 -2
  69. package/dist/functionApi/get.js.map +1 -1
  70. package/dist/functionApi/index.d.ts +3 -0
  71. package/dist/functionApi/index.js +3 -1
  72. package/dist/functionApi/index.js.map +1 -1
  73. package/dist/functionApi/observe.js +2 -2
  74. package/dist/functionApi/observe.js.map +1 -1
  75. package/dist/functionApi/publish.d.ts +3 -0
  76. package/dist/functionApi/publish.js +29 -0
  77. package/dist/functionApi/publish.js.map +1 -0
  78. package/dist/functionApi/stream.d.ts +2 -2
  79. package/dist/functionApi/stream.js +44 -6
  80. package/dist/functionApi/stream.js.map +1 -1
  81. package/dist/functions/index.d.ts +3 -2
  82. package/dist/functions/index.js +55 -34
  83. package/dist/functions/index.js.map +1 -1
  84. package/dist/functions/timeout.js +4 -2
  85. package/dist/functions/timeout.js.map +1 -1
  86. package/dist/functions/types.d.ts +100 -56
  87. package/dist/functions/types.js +16 -5
  88. package/dist/functions/types.js.map +1 -1
  89. package/dist/incoming/http/function.js +26 -28
  90. package/dist/incoming/http/function.js.map +1 -1
  91. package/dist/incoming/http/index.js +33 -7
  92. package/dist/incoming/http/index.js.map +1 -1
  93. package/dist/incoming/http/publish.d.ts +3 -0
  94. package/dist/incoming/http/publish.js +82 -0
  95. package/dist/incoming/http/publish.js.map +1 -0
  96. package/dist/incoming/http/query.js +13 -23
  97. package/dist/incoming/http/query.js.map +1 -1
  98. package/dist/incoming/http/streamFunction/multiPart/index.js +9 -9
  99. package/dist/incoming/http/streamFunction/multiPart/index.js.map +1 -1
  100. package/dist/incoming/http/streamFunction/multiPart/readFormData.d.ts +1 -1
  101. package/dist/incoming/http/streamFunction/multiPart/readFormData.js +2 -2
  102. package/dist/incoming/http/streamFunction/multiPart/readFormData.js.map +1 -1
  103. package/dist/incoming/http/streamFunction/stream/createStream.d.ts +2 -3
  104. package/dist/incoming/http/streamFunction/stream/createStream.js +2 -2
  105. package/dist/incoming/http/streamFunction/stream/createStream.js.map +1 -1
  106. package/dist/incoming/http/streamFunction/stream/index.js +4 -3
  107. package/dist/incoming/http/streamFunction/stream/index.js.map +1 -1
  108. package/dist/incoming/index.d.ts +1 -1
  109. package/dist/incoming/index.js +66 -54
  110. package/dist/incoming/index.js.map +1 -1
  111. package/dist/incoming/upgrade.js +19 -12
  112. package/dist/incoming/upgrade.js.map +1 -1
  113. package/dist/incoming/ws/auth.d.ts +1 -1
  114. package/dist/incoming/ws/auth.js +70 -22
  115. package/dist/incoming/ws/auth.js.map +1 -1
  116. package/dist/incoming/ws/channelPublish.d.ts +2 -0
  117. package/dist/incoming/ws/channelPublish.js +60 -0
  118. package/dist/incoming/ws/channelPublish.js.map +1 -0
  119. package/dist/incoming/ws/channelSubscribe.d.ts +7 -0
  120. package/dist/incoming/ws/channelSubscribe.js +128 -0
  121. package/dist/incoming/ws/channelSubscribe.js.map +1 -0
  122. package/dist/incoming/ws/function.js +14 -7
  123. package/dist/incoming/ws/function.js.map +1 -1
  124. package/dist/incoming/ws/get.js +33 -29
  125. package/dist/incoming/ws/get.js.map +1 -1
  126. package/dist/incoming/ws/index.js +22 -2
  127. package/dist/incoming/ws/index.js.map +1 -1
  128. package/dist/incoming/ws/observable.js +24 -21
  129. package/dist/incoming/ws/observable.js.map +1 -1
  130. package/dist/incoming/ws/types.d.ts +1 -1
  131. package/dist/index.d.ts +2 -1
  132. package/dist/index.js +3 -3
  133. package/dist/index.js.map +1 -1
  134. package/dist/installFn.js +32 -34
  135. package/dist/installFn.js.map +1 -1
  136. package/dist/observable/cleanup.d.ts +2 -0
  137. package/dist/observable/cleanup.js +66 -0
  138. package/dist/observable/cleanup.js.map +1 -0
  139. package/dist/observable/create.js +1 -0
  140. package/dist/observable/create.js.map +1 -1
  141. package/dist/observable/destroy.d.ts +2 -0
  142. package/dist/observable/destroy.js +26 -30
  143. package/dist/observable/destroy.js.map +1 -1
  144. package/dist/observable/extendCache.js +2 -3
  145. package/dist/observable/extendCache.js.map +1 -1
  146. package/dist/observable/genObservableId.js +3 -0
  147. package/dist/observable/genObservableId.js.map +1 -1
  148. package/dist/observable/get.d.ts +1 -1
  149. package/dist/observable/get.js +3 -3
  150. package/dist/observable/get.js.map +1 -1
  151. package/dist/observable/send.d.ts +1 -1
  152. package/dist/observable/send.js +2 -2
  153. package/dist/observable/send.js.map +1 -1
  154. package/dist/observable/start/error.d.ts +1 -1
  155. package/dist/observable/start/error.js +7 -2
  156. package/dist/observable/start/error.js.map +1 -1
  157. package/dist/observable/start/index.js +3 -1
  158. package/dist/observable/start/index.js.map +1 -1
  159. package/dist/observable/start/update.d.ts +1 -4
  160. package/dist/observable/start/update.js +0 -1
  161. package/dist/observable/start/update.js.map +1 -1
  162. package/dist/observable/subscribe.d.ts +1 -1
  163. package/dist/observable/subscribe.js +7 -8
  164. package/dist/observable/subscribe.js.map +1 -1
  165. package/dist/observable/types.d.ts +9 -9
  166. package/dist/observable/unsub.d.ts +1 -1
  167. package/dist/observable/unsub.js +9 -6
  168. package/dist/observable/unsub.js.map +1 -1
  169. package/dist/protocol.d.ts +1 -0
  170. package/dist/protocol.js +60 -48
  171. package/dist/protocol.js.map +1 -1
  172. package/dist/security.js +1 -0
  173. package/dist/security.js.map +1 -1
  174. package/dist/sendError.js +2 -4
  175. package/dist/sendError.js.map +1 -1
  176. package/dist/sendHttpResponse.js +16 -3
  177. package/dist/sendHttpResponse.js.map +1 -1
  178. package/dist/server.d.ts +24 -12
  179. package/dist/server.js +14 -8
  180. package/dist/server.js.map +1 -1
  181. package/dist/verifyRoute.d.ts +4 -3
  182. package/dist/verifyRoute.js +31 -20
  183. package/dist/verifyRoute.js.map +1 -1
  184. package/package.json +7 -7
  185. package/dist/functionApi/callFunction copy.d.ts +0 -3
  186. package/dist/functionApi/callFunction copy.js +0 -29
  187. package/dist/functionApi/callFunction copy.js.map +0 -1
  188. package/dist/incoming/http/get.d.ts +0 -4
  189. package/dist/incoming/http/get.js +0 -156
  190. package/dist/incoming/http/get.js.map +0 -1
  191. package/dist/incoming/http/streamFunction/DataStream.d.ts +0 -15
  192. package/dist/incoming/http/streamFunction/DataStream.js +0 -58
  193. package/dist/incoming/http/streamFunction/DataStream.js.map +0 -1
@@ -10,11 +10,11 @@ const sendObsWs = (ctx, buffer, obs) => {
10
10
  }
11
11
  if (obs.reusedCache) {
12
12
  const prevId = (0, protocol_1.updateId)(buffer, obs.id);
13
- ctx.session.send(buffer, true, false);
13
+ ctx.session.ws.send(buffer, true, false);
14
14
  buffer.set(prevId, 4);
15
15
  }
16
16
  else {
17
- ctx.session.send(buffer, true, false);
17
+ ctx.session.ws.send(buffer, true, false);
18
18
  }
19
19
  };
20
20
  exports.sendObsWs = sendObsWs;
@@ -1 +1 @@
1
- {"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/observable/send.ts"],"names":[],"mappings":";;;AACA,0CAAsC;AAEtC,uCAAsC;AAEtC,4CAA4C;AAGrC,MAAM,SAAS,GAAG,CACvB,GAA8B,EAC9B,MAAkB,EAClB,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,GAAG,CAAC,WAAW,EAAE;QACnB,MAAM,MAAM,GAAG,IAAA,mBAAQ,EAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;QACvC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QACrC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;KACtB;SAAM;QACL,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;KACtC;AACH,CAAC,CAAA;AAfY,QAAA,SAAS,aAerB;AAEM,MAAM,eAAe,GAAG,CAC7B,MAAmB,EACnB,GAA4C,EAC5C,EAAU,EACV,GAA2D,EAC3D,EAAE;IACF,IAAA,yBAAa,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACvB,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AARY,QAAA,eAAe,mBAQ3B"}
1
+ {"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/observable/send.ts"],"names":[],"mappings":";;;AACA,0CAAsC;AAEtC,uCAAsC;AAEtC,4CAA4C;AAGrC,MAAM,SAAS,GAAG,CACvB,GAA8B,EAC9B,MAAkB,EAClB,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,GAAG,CAAC,WAAW,EAAE;QACnB,MAAM,MAAM,GAAG,IAAA,mBAAQ,EAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;QACvC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QACxC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;KACtB;SAAM;QACL,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;KACzC;AACH,CAAC,CAAA;AAfY,QAAA,SAAS,aAerB;AAEM,MAAM,eAAe,GAAG,CAC7B,MAAmB,EACnB,GAA4C,EAC5C,EAAU,EACV,GAAiD,EACjD,EAAE;IACF,IAAA,yBAAa,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACvB,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AARY,QAAA,eAAe,mBAQ3B"}
@@ -1,4 +1,4 @@
1
1
  import { ActiveObservable } from '../types';
2
2
  import { BasedServer } from '../../server';
3
3
  import { BasedErrorCode, BasedErrorData } from '../../error';
4
- export declare const errorListener: (server: BasedServer, obs: ActiveObservable, err: Error | BasedErrorData<BasedErrorCode.ObservableFunctionError>) => void;
4
+ export declare const errorListener: (server: BasedServer, obs: ActiveObservable, err: Error | BasedErrorData<BasedErrorCode.FunctionError>) => void;
@@ -12,17 +12,22 @@ const errorListener = (server, obs, err) => {
12
12
  obs.reusedCache = false;
13
13
  obs.error =
14
14
  err instanceof Error
15
- ? (0, error_1.createError)(server, { session: { type: 'query', id: obs.id, name: obs.name } }, error_1.BasedErrorCode.ObservableFunctionError, {
15
+ ? (0, error_1.createError)(server, {
16
+ session: { type: 'query', id: obs.id, name: obs.name, headers: {} },
17
+ }, error_1.BasedErrorCode.FunctionError, {
16
18
  err,
17
19
  observableId: obs.id,
18
20
  route: {
19
21
  name: obs.name,
20
22
  },
21
23
  })
22
- : err;
24
+ : err.observableId !== obs.id
25
+ ? { ...err, observableId: obs.id }
26
+ : err;
23
27
  if (obs.clients.size) {
24
28
  server.uwsApp.publish(String(obs.id), (0, protocol_1.encodeErrorResponse)((0, protocol_1.valueToBuffer)(obs.error)), true, false);
25
29
  }
30
+ // TODO: Change this make it one error handler
26
31
  if (obs.functionObserveClients.size) {
27
32
  obs.functionObserveClients.forEach((fnUpdate) => {
28
33
  fnUpdate(obs.cache, obs.checksum, obs.diffCache, obs.previousChecksum, obs.isDeflate, obs.rawData, obs.error);
@@ -1 +1 @@
1
- {"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/observable/start/error.ts"],"names":[],"mappings":";;;AAEA,uCAAyE;AACzE,6CAAmE;AAE5D,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,GAAqB,EACrB,GAAmE,EACnE,EAAE;IACF,OAAO,GAAG,CAAC,KAAK,CAAA;IAChB,OAAO,GAAG,CAAC,SAAS,CAAA;IACpB,OAAO,GAAG,CAAC,QAAQ,CAAA;IACnB,OAAO,GAAG,CAAC,gBAAgB,CAAA;IAE3B,GAAG,CAAC,SAAS,GAAG,KAAK,CAAA;IACrB,GAAG,CAAC,WAAW,GAAG,KAAK,CAAA;IAEvB,GAAG,CAAC,KAAK;QACP,GAAG,YAAY,KAAK;YAClB,CAAC,CAAC,IAAA,mBAAW,EACT,MAAM,EACN,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,EAC1D,sBAAc,CAAC,uBAAuB,EACtC;gBACE,GAAG;gBACH,YAAY,EAAE,GAAG,CAAC,EAAE;gBACpB,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;iBACf;aACF,CACF;YACH,CAAC,CAAC,GAAG,CAAA;IAET,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;QACpB,MAAM,CAAC,MAAM,CAAC,OAAO,CACnB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EACd,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAC7C,IAAI,EACJ,KAAK,CACN,CAAA;KACF;IAED,IAAI,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE;QACnC,GAAG,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9C,QAAQ,CACN,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,KAAK,CACV,CAAA;QACH,CAAC,CAAC,CAAA;KACH;IAED,IAAI,GAAG,CAAC,UAAU,EAAE;QAClB,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAA;QACjC,OAAO,GAAG,CAAC,UAAU,CAAA;QACrB,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;KAC1C;AACH,CAAC,CAAA;AAzDY,QAAA,aAAa,iBAyDzB"}
1
+ {"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/observable/start/error.ts"],"names":[],"mappings":";;;AAEA,uCAAyE;AACzE,6CAAmE;AAE5D,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,GAAqB,EACrB,GAAyD,EACzD,EAAE;IACF,OAAO,GAAG,CAAC,KAAK,CAAA;IAChB,OAAO,GAAG,CAAC,SAAS,CAAA;IACpB,OAAO,GAAG,CAAC,QAAQ,CAAA;IACnB,OAAO,GAAG,CAAC,gBAAgB,CAAA;IAE3B,GAAG,CAAC,SAAS,GAAG,KAAK,CAAA;IACrB,GAAG,CAAC,WAAW,GAAG,KAAK,CAAA;IAEvB,GAAG,CAAC,KAAK;QACP,GAAG,YAAY,KAAK;YAClB,CAAC,CAAC,IAAA,mBAAW,EACT,MAAM,EACN;gBACE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;aACpE,EACD,sBAAc,CAAC,aAAa,EAC5B;gBACE,GAAG;gBACH,YAAY,EAAE,GAAG,CAAC,EAAE;gBACpB,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;iBACf;aACF,CACF;YACH,CAAC,CAAC,GAAG,CAAC,YAAY,KAAK,GAAG,CAAC,EAAE;gBAC7B,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,EAAE;gBAClC,CAAC,CAAC,GAAG,CAAA;IAET,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;QACpB,MAAM,CAAC,MAAM,CAAC,OAAO,CACnB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EACd,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAC7C,IAAI,EACJ,KAAK,CACN,CAAA;KACF;IAED,8CAA8C;IAC9C,IAAI,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE;QACnC,GAAG,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9C,QAAQ,CACN,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,KAAK,CACV,CAAA;QACH,CAAC,CAAC,CAAA;KACH;IAED,IAAI,GAAG,CAAC,UAAU,EAAE;QAClB,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAA;QACjC,OAAO,GAAG,CAAC,UAAU,CAAA;QACrB,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;KAC1C;AACH,CAAC,CAAA;AA9DY,QAAA,aAAa,iBA8DzB"}
@@ -26,7 +26,9 @@ const start = (server, id) => {
26
26
  update.__internalObs__ = true;
27
27
  const startId = ++obs.startId;
28
28
  try {
29
- const r = spec.function(server.client, payload, update);
29
+ const r = spec.function(server.client, payload, update, (err) => {
30
+ (0, error_1.errorListener)(server, obs, err);
31
+ });
30
32
  if (r instanceof Promise) {
31
33
  r.then((close) => {
32
34
  if (obs.isDestroyed || startId !== obs.startId) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/observable/start/index.ts"],"names":[],"mappings":";;;AACA,+CAAqD;AACrD,qCAAyC;AACzC,mCAAuC;AAGhC,MAAM,KAAK,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAE,EAAE;IACvD,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEhD,IAAI,GAAG,CAAC,aAAa,EAAE;QACrB,GAAG,CAAC,aAAa,EAAE,CAAA;QACnB,OAAO,GAAG,CAAC,aAAa,CAAA;KACzB;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAE7C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,+BAAmB,EAAC,IAAI,CAAC,EAAE;QACvC,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QAC/D,OAAM;KACP;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAE3B,MAAM,MAAM,GAA6B,CACvC,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,OAAO,EACP,GAAG,EACH,EAAE;QACF,IAAI,GAAG,EAAE;YACP,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;YAC/B,OAAM;SACP;QACD,IAAA,uBAAc,EACZ,MAAM,EACN,GAAG,EACH,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,OAAO,CACR,CAAA;IACH,CAAC,CAAA;IAED,MAAM,CAAC,eAAe,GAAG,IAAI,CAAA;IAC7B,MAAM,OAAO,GAAG,EAAE,GAAG,CAAC,OAAO,CAAA;IAE7B,IAAI;QACF,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;QACvD,IAAI,CAAC,YAAY,OAAO,EAAE;YACxB,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE;oBAC9C,KAAK,EAAE,CAAA;iBACR;qBAAM;oBACL,GAAG,CAAC,aAAa,GAAG,KAAK,CAAA;iBAC1B;YACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE;oBACjD,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;iBAChC;YACH,CAAC,CAAC,CAAA;SACH;aAAM;YACL,GAAG,CAAC,aAAa,GAAG,CAAC,CAAA;SACtB;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE;YACjD,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;SAChC;KACF;AACH,CAAC,CAAA;AAnEY,QAAA,KAAK,SAmEjB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/observable/start/index.ts"],"names":[],"mappings":";;;AACA,+CAAqD;AACrD,qCAAyC;AACzC,mCAAuC;AAGhC,MAAM,KAAK,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAE,EAAE;IACvD,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEhD,IAAI,GAAG,CAAC,aAAa,EAAE;QACrB,GAAG,CAAC,aAAa,EAAE,CAAA;QACnB,OAAO,GAAG,CAAC,aAAa,CAAA;KACzB;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAE7C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,+BAAmB,EAAC,IAAI,CAAC,EAAE;QACvC,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QAC/D,OAAM;KACP;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAE3B,MAAM,MAAM,GAA6B,CACvC,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,OAAO,EACP,GAAG,EACH,EAAE;QACF,IAAI,GAAG,EAAE;YACP,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;YAC/B,OAAM;SACP;QACD,IAAA,uBAAc,EACZ,MAAM,EACN,GAAG,EACH,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,OAAO,CACR,CAAA;IACH,CAAC,CAAA;IAED,MAAM,CAAC,eAAe,GAAG,IAAI,CAAA;IAC7B,MAAM,OAAO,GAAG,EAAE,GAAG,CAAC,OAAO,CAAA;IAE7B,IAAI;QACF,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9D,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,YAAY,OAAO,EAAE;YACxB,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE;oBAC9C,KAAK,EAAE,CAAA;iBACR;qBAAM;oBACL,GAAG,CAAC,aAAa,GAAG,KAAK,CAAA;iBAC1B;YACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE;oBACjD,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;iBAChC;YACH,CAAC,CAAC,CAAA;SACH;aAAM;YACL,GAAG,CAAC,aAAa,GAAG,CAAC,CAAA;SACtB;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE;YACjD,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;SAChC;KACF;AACH,CAAC,CAAA;AArEY,QAAA,KAAK,SAqEjB"}
@@ -1,6 +1,3 @@
1
1
  import { ActiveObservable } from '../types';
2
2
  import { BasedServer } from '../../server';
3
- export declare const updateListener: {
4
- (server: BasedServer, obs: ActiveObservable, data: any, checksum?: number, diff?: any, previousChecksum?: number, isDeflate?: boolean, rawData?: any): void;
5
- __isEdge__: boolean;
6
- };
3
+ export declare const updateListener: (server: BasedServer, obs: ActiveObservable, data: any, checksum?: number, diff?: any, previousChecksum?: number, isDeflate?: boolean, rawData?: any) => void;
@@ -100,5 +100,4 @@ const updateListener = (server, obs, data, checksum, diff, previousChecksum, isD
100
100
  }
101
101
  };
102
102
  exports.updateListener = updateListener;
103
- exports.updateListener.__isEdge__ = true;
104
103
  //# sourceMappingURL=update.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/observable/start/update.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/observable/start/update.ts"],"names":[],"mappings":"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"}
@@ -4,4 +4,4 @@ import { BasedErrorCode, BasedErrorData } from '../error';
4
4
  import { WebSocketSession, Context } from '@based/functions';
5
5
  export declare const subscribeWs: (server: BasedServer, id: number, checksum: number, ctx: Context<WebSocketSession>) => void;
6
6
  export declare const subscribeFunction: (server: BasedServer, id: number, update: ObservableUpdateFunction) => void;
7
- export declare const subscribeNext: (obs: ActiveObservable, onNext: (err?: BasedErrorData<BasedErrorCode.ObservableFunctionError>) => void) => void;
7
+ export declare const subscribeNext: (obs: ActiveObservable, onNext: (err?: BasedErrorData<BasedErrorCode.FunctionError>) => void) => void;
@@ -6,13 +6,14 @@ const send_1 = require("./send");
6
6
  const get_1 = require("./get");
7
7
  const sendError_1 = require("../sendError");
8
8
  const subscribeWs = (server, id, checksum, ctx) => {
9
- if (!ctx.session) {
9
+ const session = ctx.session;
10
+ if (!session) {
10
11
  return;
11
12
  }
12
- ctx.session.subscribe(String(id));
13
- const obs = (0, get_1.getObs)(server, id);
14
- ctx.session.obs.add(id);
15
- obs.clients.add(ctx.session.id);
13
+ ctx.session.ws.subscribe(String(id));
14
+ const obs = (0, get_1.getObsAndStopRemove)(server, id);
15
+ session.obs.add(id);
16
+ obs.clients.add(session.id);
16
17
  if (obs.error) {
17
18
  (0, sendError_1.sendErrorData)(ctx, obs.error);
18
19
  return;
@@ -28,11 +29,9 @@ const subscribeWs = (server, id, checksum, ctx) => {
28
29
  };
29
30
  exports.subscribeWs = subscribeWs;
30
31
  const subscribeFunction = (server, id, update) => {
31
- // TODO: FIX THIS
32
- const obs = (0, get_1.getObs)(server, id);
32
+ const obs = (0, get_1.getObsAndStopRemove)(server, id);
33
33
  if (obs.functionObserveClients.add(update))
34
34
  if (obs.cache) {
35
- // will make this better!
36
35
  update(obs.cache, obs.checksum, obs.diffCache, obs.previousChecksum, obs.isDeflate);
37
36
  }
38
37
  };
@@ -1 +1 @@
1
- {"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/observable/subscribe.ts"],"names":[],"mappings":";;;AAEA,+CAA2C;AAE3C,iCAAkC;AAClC,+BAA8B;AAC9B,4CAA4C;AAGrC,MAAM,WAAW,GAAG,CACzB,MAAmB,EACnB,EAAU,EACV,QAAgB,EAChB,GAA8B,EAC9B,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IAED,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACjC,MAAM,GAAG,GAAG,IAAA,YAAM,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAE9B,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACvB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAE/B,IAAI,GAAG,CAAC,KAAK,EAAE;QACb,IAAA,yBAAa,EAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAM;KACP;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;AA5BY,QAAA,WAAW,eA4BvB;AAEM,MAAM,iBAAiB,GAAG,CAC/B,MAAmB,EACnB,EAAU,EACV,MAAgC,EAChC,EAAE;IACF,iBAAiB;IACjB,MAAM,GAAG,GAAG,IAAA,YAAM,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAC9B,IAAI,GAAG,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC;QACxC,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,yBAAyB;YACzB,MAAM,CACJ,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,CACd,CAAA;SACF;AACL,CAAC,CAAA;AAlBY,QAAA,iBAAiB,qBAkB7B;AAEM,MAAM,aAAa,GAAG,CAC3B,GAAqB,EACrB,MAA8E,EAC9E,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/observable/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,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;AA9BY,QAAA,WAAW,eA8BvB;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;QACxC,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,MAAM,CACJ,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,CACd,CAAA;SACF;AACL,CAAC,CAAA;AAhBY,QAAA,iBAAiB,qBAgB7B;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,19 +1,17 @@
1
- /// <reference types="node" />
2
1
  import { BasedErrorCode, BasedErrorData } from '../error';
3
- export declare type ObservableUpdateFunction = {
4
- (data: any, checksum?: number, diff?: any, fromChecksum?: number, isDeflate?: boolean, rawData?: any, err?: Error | BasedErrorData<BasedErrorCode.ObservableFunctionError>): void;
2
+ export type ObservableUpdateFunction = {
3
+ (data: any, checksum?: number, diff?: any, fromChecksum?: number, isDeflate?: boolean, rawData?: any, err?: Error | BasedErrorData<BasedErrorCode.FunctionError>): void;
5
4
  __internalObs__?: true;
6
5
  };
7
- export declare type ObserveErrorListener = (err: BasedErrorData<BasedErrorCode.ObservableFunctionError> | BasedErrorData<BasedErrorCode.FunctionIsNotObservable> | BasedErrorData<BasedErrorCode.FunctionNotFound>) => void;
8
- export declare type ActiveObservable = {
6
+ export type ObserveErrorListener = (err: BasedErrorData<BasedErrorCode.FunctionError> | BasedErrorData<BasedErrorCode.FunctionIsWrongType> | BasedErrorData<BasedErrorCode.FunctionNotFound>) => void;
7
+ export type ActiveObservable = {
9
8
  startId: number;
10
9
  name: string;
11
10
  id: number;
12
11
  reusedCache: boolean;
13
12
  functionObserveClients: Set<ObservableUpdateFunction>;
14
13
  clients: Set<number>;
15
- onNextData?: Set<(err?: BasedErrorData<BasedErrorCode.ObservableFunctionError>) => void>;
16
- isDestroyed: boolean;
14
+ onNextData?: Set<(err?: BasedErrorData<BasedErrorCode.FunctionError>) => void>;
17
15
  payload: any;
18
16
  diffCache?: Uint8Array;
19
17
  cache?: Uint8Array;
@@ -22,6 +20,8 @@ export declare type ActiveObservable = {
22
20
  isDeflate?: boolean;
23
21
  checksum?: number;
24
22
  closeFunction?: () => void;
25
- beingDestroyed?: NodeJS.Timeout;
26
- error?: BasedErrorData<BasedErrorCode.ObservableFunctionError> | null;
23
+ error?: BasedErrorData<BasedErrorCode.FunctionError> | null;
24
+ closeAfterIdleTime?: number;
25
+ timeTillDestroy: number | null;
26
+ isDestroyed: boolean;
27
27
  };
@@ -3,4 +3,4 @@ import { WebSocketSession, Context } from '@based/functions';
3
3
  import { ObservableUpdateFunction } from './types';
4
4
  export declare const unsubscribeFunction: (server: BasedServer, id: number, update: ObservableUpdateFunction) => true | void;
5
5
  export declare const unsubscribeWs: (server: BasedServer, id: number, ctx: Context<WebSocketSession>) => true | void;
6
- export declare const unsubscribeWsIgnoreClient: (server: BasedServer, id: number, ctx: Context<WebSocketSession>) => void;
6
+ export declare const unsubscribeWsIgnoreClient: (server: BasedServer, id: number, ctx: Context<WebSocketSession>) => true | void;
@@ -14,29 +14,32 @@ const unsubscribeFunction = (server, id, update) => {
14
14
  };
15
15
  exports.unsubscribeFunction = unsubscribeFunction;
16
16
  const unsubscribeWs = (server, id, ctx) => {
17
- if (!ctx.session?.obs.has(id)) {
17
+ const session = ctx.session;
18
+ if (!session || !session.obs.has(id)) {
18
19
  return;
19
20
  }
21
+ ctx.session.ws.unsubscribe(String(id));
20
22
  const obs = server.activeObservablesById.get(id);
21
- ctx.session.obs.delete(id);
23
+ session.obs.delete(id);
22
24
  if (!obs) {
23
25
  return;
24
26
  }
25
- if (obs.clients.delete(ctx.session.id)) {
27
+ if (obs.clients.delete(session.id)) {
26
28
  (0, destroy_1.destroyObs)(server, id);
27
29
  return true;
28
30
  }
29
31
  };
30
32
  exports.unsubscribeWs = unsubscribeWs;
31
33
  const unsubscribeWsIgnoreClient = (server, id, ctx) => {
32
- if (!ctx.session) {
34
+ const session = ctx.session;
35
+ if (!session) {
33
36
  return;
34
37
  }
35
38
  const obs = server.activeObservablesById.get(id);
36
39
  if (!obs) {
37
- return;
40
+ return true;
38
41
  }
39
- obs.clients.delete(ctx.session.id);
42
+ obs.clients.delete(session.id);
40
43
  (0, destroy_1.destroyObs)(server, id);
41
44
  };
42
45
  exports.unsubscribeWsIgnoreClient = unsubscribeWsIgnoreClient;
@@ -1 +1 @@
1
- {"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/observable/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;IAED,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;AAdY,QAAA,mBAAmB,uBAc/B;AAEM,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QAC7B,OAAM;KACP;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC1B,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACtC,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAjBY,QAAA,aAAa,iBAiBzB;AAEM,MAAM,yBAAyB,GAAG,CACvC,MAAmB,EACnB,EAAU,EACV,GAA8B,EAC9B,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEhD,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IAED,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAElC,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AAlBY,QAAA,yBAAyB,6BAkBrC"}
1
+ {"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/observable/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,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAnBY,QAAA,aAAa,iBAmBzB;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,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC9B,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AAfY,QAAA,yBAAyB,6BAerC"}
@@ -19,4 +19,5 @@ export declare const encodeObservableResponse: (id: number, checksum: number, bu
19
19
  export declare const encodeObservableDiffResponse: (id: number, checksum: number, previousChecksum: number, buffer: Buffer) => Uint8Array;
20
20
  export declare const encodeAuthResponse: (buffer: Buffer) => Uint8Array;
21
21
  export declare const encodeErrorResponse: (buffer: Buffer) => Uint8Array;
22
+ export declare const encodeChannelMessage: (id: number, buffer: Buffer) => Uint8Array;
22
23
  export declare const decode: (buffer: Uint8Array) => any;
package/dist/protocol.js CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.decode = exports.encodeErrorResponse = exports.encodeAuthResponse = exports.encodeObservableDiffResponse = exports.encodeObservableResponse = exports.updateId = exports.encodeGetResponse = exports.encodeFunctionResponse = exports.decodeName = exports.parsePayload = exports.decodePayload = exports.valueToBuffer = exports.encodeHeader = exports.readUint8 = exports.storeUint8 = exports.decodeHeader = exports.COMPRESS_FROM_BYTES = void 0;
6
+ exports.decode = exports.encodeChannelMessage = exports.encodeErrorResponse = exports.encodeAuthResponse = exports.encodeObservableDiffResponse = exports.encodeObservableResponse = exports.updateId = exports.encodeGetResponse = exports.encodeFunctionResponse = exports.decodeName = exports.parsePayload = exports.decodePayload = exports.valueToBuffer = exports.encodeHeader = exports.readUint8 = exports.storeUint8 = exports.decodeHeader = exports.COMPRESS_FROM_BYTES = void 0;
7
7
  const node_zlib_1 = __importDefault(require("node:zlib"));
8
8
  const textDecoder = new TextDecoder();
9
9
  exports.COMPRESS_FROM_BYTES = 150;
@@ -15,7 +15,9 @@ const decodeHeader = (nr) => {
15
15
  // 2 = unsubscribe
16
16
  // 3 = get from observable
17
17
  // 4 = auth
18
- // 5 = error
18
+ // 5 = subscribeChannel
19
+ // 6 = publishChannel
20
+ // 7 = unsubscribeChannel
19
21
  // isDeflate (1 bit)
20
22
  // len (28 bits)
21
23
  const len = nr >> 4;
@@ -52,6 +54,11 @@ const encodeHeader = (type, isDeflate, len) => {
52
54
  // 0 = functionData
53
55
  // 1 = subscriptionData
54
56
  // 2 = subscriptionDiffData
57
+ // 3 = get
58
+ // 4 = authData
59
+ // 5 = errorData
60
+ // 6 = channelMessage
61
+ // 7 = requestChannelId TODO: later...
55
62
  // isDeflate (1 bit)
56
63
  // len (28 bits)
57
64
  const encodedMeta = (type << 1) + (Number(isDeflate) | 0);
@@ -64,7 +71,7 @@ const valueToBuffer = (payload) => {
64
71
  if (payload === undefined) {
65
72
  return Buffer.from([]);
66
73
  }
67
- // only stringify if not string...
74
+ // TODO: only stringify if not string...
68
75
  return Buffer.from(JSON.stringify(payload));
69
76
  };
70
77
  exports.valueToBuffer = valueToBuffer;
@@ -72,8 +79,13 @@ const decodePayload = (payload, isDeflate) => {
72
79
  if (!isDeflate) {
73
80
  return textDecoder.decode(payload);
74
81
  }
75
- const buffer = node_zlib_1.default.inflateRawSync(payload);
76
- return textDecoder.decode(buffer);
82
+ try {
83
+ const buffer = node_zlib_1.default.inflateRawSync(payload);
84
+ return textDecoder.decode(buffer);
85
+ }
86
+ catch (err) {
87
+ console.error('Error deflating payload', err);
88
+ }
77
89
  };
78
90
  exports.decodePayload = decodePayload;
79
91
  const parsePayload = (payload) => {
@@ -95,7 +107,8 @@ const encodeFunctionResponse = (id, buffer) => {
95
107
  // Type 0
96
108
  // | 4 header | 3 id | * payload |
97
109
  let isDeflate = false;
98
- // implement later
110
+ // TODO: implement for streams!
111
+ // chunk isChunk | isNotCunk | isLastchunk 0|1 (use 1 bye for now?)
99
112
  const chunks = 1;
100
113
  if (buffer.length > exports.COMPRESS_FROM_BYTES) {
101
114
  isDeflate = true;
@@ -133,68 +146,49 @@ const encodeGetResponse = (id) => {
133
146
  exports.encodeGetResponse = encodeGetResponse;
134
147
  const updateId = (payload, id) => {
135
148
  const prevId = payload.slice(4, 12);
136
- // if (readUint8(prevId, 0, 8) !== readUint8(payload, 4, 8)) {
137
- // throw new Error('INCORRECT PARSING')
138
- // }
139
149
  (0, exports.storeUint8)(payload, id, 4, 8);
140
150
  return prevId;
141
151
  };
142
152
  exports.updateId = updateId;
143
153
  const encodeObservableResponse = (id, checksum, buffer) => {
144
- // Type 1 (full data) // TODO: include crc32 4 Bytes
154
+ // Type 1 (full data)
145
155
  // | 4 header | 8 id | 8 checksum | * payload |
146
156
  let isDeflate = false;
147
- // implement later
148
- const chunks = 1;
149
157
  if (buffer.length > exports.COMPRESS_FROM_BYTES) {
150
158
  isDeflate = true;
151
159
  buffer = node_zlib_1.default.deflateRawSync(buffer, {});
152
160
  }
153
- if (chunks === 1) {
154
- const msgSize = 16 + buffer.length;
155
- const header = (0, exports.encodeHeader)(1, isDeflate, msgSize);
156
- const array = new Uint8Array(4 + msgSize);
157
- (0, exports.storeUint8)(array, header, 0, 4);
158
- (0, exports.storeUint8)(array, id, 4, 8);
159
- (0, exports.storeUint8)(array, checksum, 12, 8);
160
- if (buffer.length) {
161
- array.set(buffer, 20);
162
- }
163
- return [array, isDeflate];
164
- }
165
- else {
166
- console.warn('chunk not implemented yet');
167
- return [new Uint8Array(0), false];
161
+ const msgSize = 16 + buffer.length;
162
+ const header = (0, exports.encodeHeader)(1, isDeflate, msgSize);
163
+ const array = new Uint8Array(4 + msgSize);
164
+ (0, exports.storeUint8)(array, header, 0, 4);
165
+ (0, exports.storeUint8)(array, id, 4, 8);
166
+ (0, exports.storeUint8)(array, checksum, 12, 8);
167
+ if (buffer.length) {
168
+ array.set(buffer, 20);
168
169
  }
170
+ return [array, isDeflate];
169
171
  };
170
172
  exports.encodeObservableResponse = encodeObservableResponse;
171
173
  const encodeObservableDiffResponse = (id, checksum, previousChecksum, buffer) => {
172
- // Type 2 (diff data) // TODO: include crc32 4 Bytes
174
+ // Type 2 (diff data)
173
175
  // | 4 header | 8 id | 8 checksum | 8 previousChecksum | * diff |
174
176
  let isDeflate = false;
175
- // implement later
176
- const chunks = 1;
177
177
  if (buffer.length > exports.COMPRESS_FROM_BYTES) {
178
178
  isDeflate = true;
179
179
  buffer = node_zlib_1.default.deflateRawSync(buffer, {});
180
180
  }
181
- if (chunks === 1) {
182
- const msgSize = 24 + buffer.length;
183
- const header = (0, exports.encodeHeader)(2, isDeflate, msgSize);
184
- const array = new Uint8Array(4 + msgSize);
185
- (0, exports.storeUint8)(array, header, 0, 4);
186
- (0, exports.storeUint8)(array, id, 4, 8);
187
- (0, exports.storeUint8)(array, checksum, 12, 8);
188
- (0, exports.storeUint8)(array, previousChecksum, 20, 8);
189
- if (buffer.length) {
190
- array.set(buffer, 28);
191
- }
192
- return array;
193
- }
194
- else {
195
- console.warn('chunk not implemented yet');
196
- return new Uint8Array(0);
181
+ const msgSize = 24 + buffer.length;
182
+ const header = (0, exports.encodeHeader)(2, isDeflate, msgSize);
183
+ const array = new Uint8Array(4 + msgSize);
184
+ (0, exports.storeUint8)(array, header, 0, 4);
185
+ (0, exports.storeUint8)(array, id, 4, 8);
186
+ (0, exports.storeUint8)(array, checksum, 12, 8);
187
+ (0, exports.storeUint8)(array, previousChecksum, 20, 8);
188
+ if (buffer.length) {
189
+ array.set(buffer, 28);
197
190
  }
191
+ return array;
198
192
  };
199
193
  exports.encodeObservableDiffResponse = encodeObservableDiffResponse;
200
194
  const encodeSimpleResponse = (type, buffer) => {
@@ -224,7 +218,26 @@ const encodeErrorResponse = (buffer) => {
224
218
  return encodeSimpleResponse(5, buffer);
225
219
  };
226
220
  exports.encodeErrorResponse = encodeErrorResponse;
227
- // decode cached data
221
+ const encodeChannelMessage = (id, buffer) => {
222
+ // Type 7.0 (fill data)
223
+ // | 4 header | 1 subType | 8 id | * payload |
224
+ let isDeflate = false;
225
+ if (buffer.length > exports.COMPRESS_FROM_BYTES) {
226
+ isDeflate = true;
227
+ buffer = node_zlib_1.default.deflateRawSync(buffer, {});
228
+ }
229
+ const msgSize = 8 + buffer.length + 1;
230
+ const header = (0, exports.encodeHeader)(7, isDeflate, msgSize);
231
+ const array = new Uint8Array(4 + msgSize);
232
+ (0, exports.storeUint8)(array, 0, 4, 1);
233
+ (0, exports.storeUint8)(array, header, 0, 4);
234
+ (0, exports.storeUint8)(array, id, 5, 8);
235
+ if (buffer.length) {
236
+ array.set(buffer, 13);
237
+ }
238
+ return array;
239
+ };
240
+ exports.encodeChannelMessage = encodeChannelMessage;
228
241
  const decode = (buffer) => {
229
242
  const header = (0, exports.readUint8)(buffer, 0, 4);
230
243
  const { isDeflate, len, type } = (0, exports.decodeHeader)(header);
@@ -237,7 +250,6 @@ const decode = (buffer) => {
237
250
  const end = len + 4;
238
251
  return (0, exports.decodePayload)(buffer.slice(start, end), isDeflate);
239
252
  }
240
- // decode diff as well
241
253
  };
242
254
  exports.decode = decode;
243
255
  //# sourceMappingURL=protocol.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"protocol.js","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"protocol.js","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"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"}
package/dist/security.js CHANGED
@@ -83,6 +83,7 @@ const blockIncomingRequest = (server, ip, res, req, max, tokens) => {
83
83
  if (code === 2) {
84
84
  server.emit('error', {
85
85
  session: {
86
+ headers: {},
86
87
  ua: req.getHeader('user-agent'),
87
88
  ip,
88
89
  },
@@ -1 +1 @@
1
- {"version":3,"file":"security.js","sourceRoot":"","sources":["../src/security.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"security.js","sourceRoot":"","sources":["../src/security.ts"],"names":[],"mappings":"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"}
package/dist/sendError.js CHANGED
@@ -34,8 +34,7 @@ function sendErrorData(ctx, errorData) {
34
34
  sendHttpErrorData(errorData, ctx);
35
35
  }
36
36
  else if ((0, functions_1.isWsSession)(ctx.session)) {
37
- const ws = ctx.session;
38
- ws.send((0, protocol_1.encodeErrorResponse)((0, protocol_1.valueToBuffer)(errorData)), true, false);
37
+ ctx.session.ws.send((0, protocol_1.encodeErrorResponse)((0, protocol_1.valueToBuffer)(errorData)), true, false);
39
38
  }
40
39
  }
41
40
  exports.sendErrorData = sendErrorData;
@@ -48,8 +47,7 @@ function sendError(server, ctx, basedCode, payload) {
48
47
  }
49
48
  else if ((0, functions_1.isWsSession)(ctx.session)) {
50
49
  const errorData = (0, error_1.createError)(server, ctx, basedCode, payload);
51
- const ws = ctx.session;
52
- ws.send((0, protocol_1.encodeErrorResponse)((0, protocol_1.valueToBuffer)(errorData)), true, false);
50
+ ctx.session.ws.send((0, protocol_1.encodeErrorResponse)((0, protocol_1.valueToBuffer)(errorData)), true, false);
53
51
  }
54
52
  }
55
53
  exports.sendError = sendError;
@@ -1 +1 @@
1
- {"version":3,"file":"sendError.js","sourceRoot":"","sources":["../src/sendError.ts"],"names":[],"mappings":";;;AAAA,yDAAwC;AAExC,gDAMyB;AACzB,yCAA+D;AAC/D,mCAKgB;AAEhB,MAAM,iBAAiB,GAAG,CACxB,SAAyB,EACzB,GAAyB,EACzB,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;IAC9D,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;QACxB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,UAAU,IAAI,aAAa,EAAE,CAAC,CAAA;QAC7D,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;YACpC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;SAChE;QACD,IAAA,sBAAG,EACD,GAAG,EACH,IAAI,CAAC,SAAS,CAAC;YACb,KAAK,EAAE,OAAO;YACd,IAAI;SACL,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,SAAgB,aAAa,CAC3B,MAAmB,EACnB,GAAyB,EACzB,SAAY,EACZ,OAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,MAAM,OAAO,GAAG,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IAC5D,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;AACjC,CAAC;AAXD,sCAWC;AAED,SAAgB,aAAa,CAC3B,GAA4C,EAC5C,SAAyB;IAEzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,IAAA,yBAAa,EAAC,GAAG,CAAC,EAAE;QACtB,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;KAClC;SAAM,IAAI,IAAA,uBAAW,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,EAAE,GAAqB,GAAG,CAAC,OAAO,CAAA;QACxC,EAAE,CAAC,IAAI,CAAC,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;KACpE;AACH,CAAC;AAbD,sCAaC;AAED,SAAgB,SAAS,CACvB,MAAmB,EACnB,GAA4C,EAC5C,SAAY,EACZ,OAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,IAAA,yBAAa,EAAC,GAAG,CAAC,EAAE;QACtB,OAAO,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;KACtD;SAAM,IAAI,IAAA,uBAAW,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAC9D,MAAM,EAAE,GAAqB,GAAG,CAAC,OAAO,CAAA;QACxC,EAAE,CAAC,IAAI,CAAC,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;KACpE;AACH,CAAC;AAhBD,8BAgBC"}
1
+ {"version":3,"file":"sendError.js","sourceRoot":"","sources":["../src/sendError.ts"],"names":[],"mappings":";;;AAAA,yDAAwC;AAExC,gDAMyB;AACzB,yCAA+D;AAC/D,mCAKgB;AAEhB,MAAM,iBAAiB,GAAG,CACxB,SAAyB,EACzB,GAAyB,EACzB,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;IAC9D,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;QACxB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,UAAU,IAAI,aAAa,EAAE,CAAC,CAAA;QAC7D,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;YACpC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;SAChE;QACD,IAAA,sBAAG,EACD,GAAG,EACH,IAAI,CAAC,SAAS,CAAC;YACb,KAAK,EAAE,OAAO;YACd,IAAI;SACL,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,SAAgB,aAAa,CAC3B,MAAmB,EACnB,GAAyB,EACzB,SAAY,EACZ,OAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,MAAM,OAAO,GAAG,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IAC5D,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;AACjC,CAAC;AAXD,sCAWC;AAED,SAAgB,aAAa,CAC3B,GAA4C,EAC5C,SAAyB;IAEzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,IAAA,yBAAa,EAAC,GAAG,CAAC,EAAE;QACtB,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;KAClC;SAAM,IAAI,IAAA,uBAAW,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CACjB,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAC7C,IAAI,EACJ,KAAK,CACN,CAAA;KACF;AACH,CAAC;AAhBD,sCAgBC;AAED,SAAgB,SAAS,CACvB,MAAmB,EACnB,GAA4C,EAC5C,SAAY,EACZ,OAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,IAAA,yBAAa,EAAC,GAAG,CAAC,EAAE;QACtB,OAAO,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;KACtD;SAAM,IAAI,IAAA,uBAAW,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAC9D,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CACjB,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAC7C,IAAI,EACJ,KAAK,CACN,CAAA;KACF;AACH,CAAC;AAnBD,8BAmBC"}
@@ -44,14 +44,27 @@ const sendHttpResponse = (ctx, result, headers, statusCode = '200 OK') => {
44
44
  return;
45
45
  }
46
46
  let cType;
47
- // for functions there is never cache (idea is they are used to execute - observable fns are for cache)
48
47
  let parsed;
49
- if (typeof result === 'string') {
48
+ if (result === undefined) {
49
+ ctx.session.res.cork(() => {
50
+ ctx.session.res.writeStatus(statusCode);
51
+ if (headers) {
52
+ (0, exports.sendHeaders)(ctx, headers);
53
+ }
54
+ if (!ctx.session.corsSend) {
55
+ ctx.session.res.writeHeader('Access-Control-Allow-Origin', '*');
56
+ ctx.session.res.writeHeader('Access-Control-Allow-Headers', '*');
57
+ }
58
+ ctx.session.res.end();
59
+ });
60
+ return;
61
+ }
62
+ else if (typeof result === 'string') {
50
63
  cType = 'text/plain';
51
64
  parsed = result;
65
+ // TODO: more check here
52
66
  }
53
67
  else if (result instanceof stream_1.Readable || result instanceof stream_1.Duplex) {
54
- // received stream....
55
68
  ctx.session.res.cork(() => {
56
69
  ctx.session.res.writeStatus(statusCode);
57
70
  if (headers) {