@based/server 4.0.5 → 4.1.1
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.
- package/dist/functionApi/client/channel.js +0 -1
- package/dist/functionApi/client/channel.js.map +1 -1
- package/dist/functionApi/client/index.d.ts +1 -0
- package/dist/functionApi/client/index.js +3 -0
- package/dist/functionApi/client/index.js.map +1 -1
- package/dist/observable/send.d.ts +2 -3
- package/dist/observable/send.js.map +1 -1
- package/dist/observable/start/error.d.ts +2 -3
- package/dist/observable/start/error.js +1 -1
- package/dist/observable/start/error.js.map +1 -1
- package/dist/observable/start/index.js +2 -3
- package/dist/observable/start/index.js.map +1 -1
- package/dist/observable/start/update.d.ts +1 -1
- package/dist/observable/start/update.js +6 -9
- package/dist/observable/start/update.js.map +1 -1
- package/dist/observable/subscribe.js +1 -1
- package/dist/observable/subscribe.js.map +1 -1
- package/dist/observable/types.d.ts +5 -7
- package/dist/server.d.ts +3 -1
- package/dist/server.js +24 -2
- package/dist/server.js.map +1 -1
- package/package.json +2 -2
|
@@ -5,7 +5,6 @@ const functions_1 = require("@based/functions");
|
|
|
5
5
|
const observable_1 = require("../../observable");
|
|
6
6
|
const publish_1 = require("../publish");
|
|
7
7
|
const channelSubscribe_1 = require("../channelSubscribe");
|
|
8
|
-
// add generics...
|
|
9
8
|
class BasedChannel extends functions_1.BasedChannel {
|
|
10
9
|
constructor(ctx, name, payload) {
|
|
11
10
|
super();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../../src/functionApi/client/channel.ts"],"names":[],"mappings":";;;AAAA,gDAKyB;AACzB,iDAAkD;AAClD,wCAAoC;AACpC,0DAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../../src/functionApi/client/channel.ts"],"names":[],"mappings":";;;AAAA,gDAKyB;AACzB,iDAAkD;AAClD,wCAAoC;AACpC,0DAAsD;AAEtD,MAAa,YAAa,SAAQ,wBAAoB;IAMpD,YAAY,GAAmC,EAAE,IAAY,EAAE,OAAY;QACzE,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,EAAE,GAAG,IAAA,4BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACxC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,SAAS,CACP,SAAiC,EACjC,OAA4B;QAE5B,OAAO,IAAA,mCAAgB,EACrB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAC9B,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,OAAO,EACZ,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACX,IAAI,GAAG,EAAE;gBACP,IAAI,OAAO,EAAE;oBACX,OAAO,CAAC,GAAG,CAAC,CAAA;iBACb;gBACD,OAAM;aACP;YACD,SAAS,CAAC,GAAG,CAAC,CAAA;QAChB,CAAC,CACF,CAAA;IACH,CAAC;IAED,OAAO,CAAC,OAAY,EAAE,MAAe,IAAI,CAAC,GAAG;QAC3C,IAAA,iBAAO,EACL,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAC9B,IAAI,CAAC,IAAI,EACT,GAAG,EACH,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,OAAO,EACZ,OAAO,CACR,CAAA;IACH,CAAC;CACF;AA7CD,oCA6CC"}
|
|
@@ -8,6 +8,7 @@ export declare class BasedFunctionClient extends BasedfunctionClientAbstract {
|
|
|
8
8
|
server: BasedServer;
|
|
9
9
|
ctx: Context<InternalSessionClient>;
|
|
10
10
|
constructor(server: BasedServer);
|
|
11
|
+
geo(ctx: Context): Promise<import("@based/functions").Geo>;
|
|
11
12
|
call(name: string, payload?: any, ctx?: Context): Promise<any>;
|
|
12
13
|
query(name: string, payload?: any): BasedQuery;
|
|
13
14
|
channel(name: string, payload?: any): BasedChannel;
|
|
@@ -18,6 +18,9 @@ class BasedFunctionClient extends functions_1.BasedFunctionClient {
|
|
|
18
18
|
session: { type: 'client', client: this, headers: {} },
|
|
19
19
|
};
|
|
20
20
|
}
|
|
21
|
+
geo(ctx) {
|
|
22
|
+
return this.server.geo(ctx);
|
|
23
|
+
}
|
|
21
24
|
// TODO: CTX - Transpile the ctx in there by static analysis for "call" & "stream"
|
|
22
25
|
call(name, payload, ctx = this.ctx) {
|
|
23
26
|
return (0, callFunction_1.callFunction)(this.server, name, ctx, payload);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/functionApi/client/index.ts"],"names":[],"mappings":";;;;;;AACA,kDAA8C;AAC9C,mCAAoC;AACpC,uCAAwC;AACxC,sCAA0C;AAC1C,0DAA4B;AAC5B,gDASyB;AAEzB,MAAa,mBAAoB,SAAQ,+BAA2B;IAIlE,YAAY,MAAmB;QAC7B,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,GAAG,GAAG;YACT,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;SACvD,CAAA;IACH,CAAC;IAED,kFAAkF;IAClF,IAAI,CAAC,IAAY,EAAE,OAAa,EAAE,MAAe,IAAI,CAAC,GAAG;QACvD,OAAO,IAAA,2BAAY,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;IACtD,CAAC;IAED,KAAK,CAAC,IAAY,EAAE,OAAa;QAC/B,OAAO,IAAI,kBAAU,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,OAAO,CAAC,IAAY,EAAE,OAAa;QACjC,OAAO,IAAI,sBAAY,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,MAAM,CACV,IAAY,EACZ,UAA8B,EAC9B,MAAe,IAAI,CAAC,GAAG;QAEvB,aAAa;QACb,OAAO,IAAA,uBAAc,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IAC3D,CAAC;IAED,cAAc,CACZ,GAAqB,EACrB,SAAqB;QAErB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IACxD,CAAC;IAED,YAAY,CAAC,GAAqB,EAAE,SAAoB;QACtD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAM;SACP;QACD,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;YACzB,OAAM;SACP;QACD,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAA;QACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;IACtC,CAAC;IAED,aAAa,CAAC,GAAqB,EAAE,SAAoB;QACvD,IAAI,CAAC,IAAA,uBAAW,EAAC,GAAG,CAAC,EAAE;YACrB,OAAM;SACP;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAChD,CAAC;IAED,CAAC,mBAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACnB,OAAO,uBAAuB,CAAA;IAChC,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/functionApi/client/index.ts"],"names":[],"mappings":";;;;;;AACA,kDAA8C;AAC9C,mCAAoC;AACpC,uCAAwC;AACxC,sCAA0C;AAC1C,0DAA4B;AAC5B,gDASyB;AAEzB,MAAa,mBAAoB,SAAQ,+BAA2B;IAIlE,YAAY,MAAmB;QAC7B,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,GAAG,GAAG;YACT,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;SACvD,CAAA;IACH,CAAC;IAED,GAAG,CAAC,GAAY;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,kFAAkF;IAClF,IAAI,CAAC,IAAY,EAAE,OAAa,EAAE,MAAe,IAAI,CAAC,GAAG;QACvD,OAAO,IAAA,2BAAY,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;IACtD,CAAC;IAED,KAAK,CAAC,IAAY,EAAE,OAAa;QAC/B,OAAO,IAAI,kBAAU,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,OAAO,CAAC,IAAY,EAAE,OAAa;QACjC,OAAO,IAAI,sBAAY,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,MAAM,CACV,IAAY,EACZ,UAA8B,EAC9B,MAAe,IAAI,CAAC,GAAG;QAEvB,aAAa;QACb,OAAO,IAAA,uBAAc,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IAC3D,CAAC;IAED,cAAc,CACZ,GAAqB,EACrB,SAAqB;QAErB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IACxD,CAAC;IAED,YAAY,CAAC,GAAqB,EAAE,SAAoB;QACtD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAM;SACP;QACD,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;YACzB,OAAM;SACP;QACD,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAA;QACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;IACtC,CAAC;IAED,aAAa,CAAC,GAAqB,EAAE,SAAoB;QACvD,IAAI,CAAC,IAAA,uBAAW,EAAC,GAAG,CAAC,EAAE;YACrB,OAAM;SACP;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAChD,CAAC;IAED,CAAC,mBAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACnB,OAAO,uBAAuB,CAAA;IAChC,CAAC;CACF;AAlED,kDAkEC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Context, WebSocketSession, HttpSession } from '@based/functions';
|
|
2
2
|
import { BasedServer } from '../server';
|
|
3
|
-
import {
|
|
4
|
-
import { ActiveObservable } from './types';
|
|
3
|
+
import { ActiveObservable, ObservableError } from './types';
|
|
5
4
|
export declare const sendObsWs: (ctx: Context<WebSocketSession>, buffer: Uint8Array, obs: ActiveObservable) => void;
|
|
6
|
-
export declare const sendObsGetError: (server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, id: number, err:
|
|
5
|
+
export declare const sendObsGetError: (server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, id: number, err: ObservableError) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/observable/send.ts"],"names":[],"mappings":";;;AACA,0CAAsC;AAEtC,uCAAsC;
|
|
1
|
+
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/observable/send.ts"],"names":[],"mappings":";;;AACA,0CAAsC;AAEtC,uCAAsC;AACtC,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,GAAoB,EACpB,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,3 @@
|
|
|
1
|
-
import { ActiveObservable } from '../types';
|
|
1
|
+
import { ActiveObservable, ObservableError } from '../types';
|
|
2
2
|
import { BasedServer } from '../../server';
|
|
3
|
-
|
|
4
|
-
export declare const errorListener: (server: BasedServer, obs: ActiveObservable, err: Error | BasedErrorData<BasedErrorCode.FunctionError>) => void;
|
|
3
|
+
export declare const errorListener: (server: BasedServer, obs: ActiveObservable, err: Error | ObservableError) => void;
|
|
@@ -30,7 +30,7 @@ const errorListener = (server, obs, err) => {
|
|
|
30
30
|
// TODO: Change this make it one error handler
|
|
31
31
|
if (obs.functionObserveClients.size) {
|
|
32
32
|
obs.functionObserveClients.forEach((fnUpdate) => {
|
|
33
|
-
fnUpdate(obs.
|
|
33
|
+
fnUpdate(obs.rawData, obs.checksum, obs.error, obs.cache, obs.diffCache, obs.previousChecksum, obs.isDeflate);
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
36
|
if (obs.onNextData) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/observable/start/error.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/observable/start/error.ts"],"names":[],"mappings":";;;AAEA,uCAAyD;AACzD,6CAAmE;AAE5D,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,GAAqB,EACrB,GAA4B,EAC5B,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,OAAO,EACX,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,CACd,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"}
|
|
@@ -16,14 +16,13 @@ const start = (server, id) => {
|
|
|
16
16
|
return;
|
|
17
17
|
}
|
|
18
18
|
const payload = obs.payload;
|
|
19
|
-
const update = (data, checksum,
|
|
19
|
+
const update = (data, checksum, err, cache, diff, fromChecksum, isDeflate) => {
|
|
20
20
|
if (err) {
|
|
21
21
|
(0, error_1.errorListener)(server, obs, err);
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
24
|
-
(0, update_1.updateListener)(server, obs, data, checksum, diff, fromChecksum, isDeflate
|
|
24
|
+
(0, update_1.updateListener)(server, obs, data, checksum, cache, diff, fromChecksum, isDeflate);
|
|
25
25
|
};
|
|
26
|
-
update.__internalObs__ = true;
|
|
27
26
|
const startId = ++obs.startId;
|
|
28
27
|
try {
|
|
29
28
|
const r = spec.function(server.client, payload, update, (err) => {
|
|
@@ -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,
|
|
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,GAAG,EACH,KAAK,EACL,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,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,KAAK,EACL,IAAI,EACJ,YAAY,EACZ,SAAS,CACV,CAAA;IACH,CAAC,CAAA;IAED,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;AApEY,QAAA,KAAK,SAoEjB"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ActiveObservable } from '../types';
|
|
2
2
|
import { BasedServer } from '../../server';
|
|
3
|
-
export declare const updateListener: (server: BasedServer, obs: ActiveObservable, data: any, checksum?: number, diff?: any, previousChecksum?: number, isDeflate?: boolean
|
|
3
|
+
export declare const updateListener: (server: BasedServer, obs: ActiveObservable, data: any, checksum?: number, reusedData?: Uint8Array, diff?: any, previousChecksum?: number, isDeflate?: boolean) => void;
|
|
@@ -5,7 +5,7 @@ const protocol_1 = require("../../protocol");
|
|
|
5
5
|
const utils_1 = require("@saulx/utils");
|
|
6
6
|
const hash_1 = require("@saulx/hash");
|
|
7
7
|
const diff_1 = require("@saulx/diff");
|
|
8
|
-
const updateListener = (server, obs, data, checksum, diff, previousChecksum, isDeflate
|
|
8
|
+
const updateListener = (server, obs, data, checksum, reusedData, diff, previousChecksum, isDeflate) => {
|
|
9
9
|
if (checksum === undefined) {
|
|
10
10
|
if (data === undefined) {
|
|
11
11
|
checksum = 0;
|
|
@@ -21,18 +21,15 @@ const updateListener = (server, obs, data, checksum, diff, previousChecksum, isD
|
|
|
21
21
|
}
|
|
22
22
|
if (checksum !== obs.checksum) {
|
|
23
23
|
let encodedData;
|
|
24
|
-
if (
|
|
24
|
+
if (reusedData) {
|
|
25
25
|
obs.reusedCache = true;
|
|
26
|
-
encodedData =
|
|
26
|
+
encodedData = reusedData;
|
|
27
27
|
if (diff) {
|
|
28
28
|
obs.diffCache = diff;
|
|
29
29
|
obs.previousChecksum = previousChecksum;
|
|
30
30
|
}
|
|
31
|
-
if (
|
|
32
|
-
obs.rawData =
|
|
33
|
-
}
|
|
34
|
-
else {
|
|
35
|
-
// go go go just read id and put it
|
|
31
|
+
if (data) {
|
|
32
|
+
obs.rawData = data;
|
|
36
33
|
}
|
|
37
34
|
if (!isDeflate) {
|
|
38
35
|
isDeflate = false;
|
|
@@ -83,7 +80,7 @@ const updateListener = (server, obs, data, checksum, diff, previousChecksum, isD
|
|
|
83
80
|
}
|
|
84
81
|
if (obs.functionObserveClients.size) {
|
|
85
82
|
obs.functionObserveClients.forEach((fnUpdate) => {
|
|
86
|
-
fnUpdate(obs.
|
|
83
|
+
fnUpdate(obs.rawData, obs.checksum, obs.error, obs.cache, obs.diffCache, obs.previousChecksum, obs.isDeflate);
|
|
87
84
|
});
|
|
88
85
|
}
|
|
89
86
|
if (obs.onNextData) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/observable/start/update.ts"],"names":[],"mappings":";;;AACA,6CAKuB;AACvB,wCAAuC;AACvC,sCAA4D;AAC5D,sCAAyC;AAGlC,MAAM,cAAc,GAAG,CAC5B,MAAmB,EACnB,GAAqB,EACrB,IAAS,EACT,QAAiB,EACjB,IAAU,EACV,gBAAyB,EACzB,SAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/observable/start/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ const subscribeFunction = (server, id, update) => {
|
|
|
32
32
|
const obs = (0, get_1.getObsAndStopRemove)(server, id);
|
|
33
33
|
if (obs.functionObserveClients.add(update))
|
|
34
34
|
if (obs.cache) {
|
|
35
|
-
update(obs.
|
|
35
|
+
update(obs.rawData, obs.checksum, null, obs.cache, obs.diffCache, obs.previousChecksum, obs.isDeflate);
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
exports.subscribeFunction = subscribeFunction;
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,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;AACL,CAAC,CAAA;AAlBY,QAAA,iBAAiB,qBAkB7B;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,9 +1,7 @@
|
|
|
1
1
|
import { BasedErrorCode, BasedErrorData } from '../error';
|
|
2
|
-
export type
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
};
|
|
6
|
-
export type ObserveErrorListener = (err: BasedErrorData<BasedErrorCode.FunctionError> | BasedErrorData<BasedErrorCode.FunctionIsWrongType> | BasedErrorData<BasedErrorCode.FunctionNotFound>) => void;
|
|
2
|
+
export type ObservableError = BasedErrorData<BasedErrorCode.FunctionError> | BasedErrorData<BasedErrorCode.FunctionIsWrongType> | BasedErrorData<BasedErrorCode.FunctionNotFound>;
|
|
3
|
+
export type ObservableUpdateFunction = (data: any, checksum?: number, err?: null | ObservableError, cache?: Uint8Array, diff?: any, fromChecksum?: number, isDeflate?: boolean) => void;
|
|
4
|
+
export type ObserveErrorListener = (err: ObservableError) => void;
|
|
7
5
|
export type ActiveObservable = {
|
|
8
6
|
startId: number;
|
|
9
7
|
name: string;
|
|
@@ -11,7 +9,7 @@ export type ActiveObservable = {
|
|
|
11
9
|
reusedCache: boolean;
|
|
12
10
|
functionObserveClients: Set<ObservableUpdateFunction>;
|
|
13
11
|
clients: Set<number>;
|
|
14
|
-
onNextData?: Set<(err?:
|
|
12
|
+
onNextData?: Set<(err?: ObservableError) => void>;
|
|
15
13
|
payload: any;
|
|
16
14
|
diffCache?: Uint8Array;
|
|
17
15
|
cache?: Uint8Array;
|
|
@@ -20,7 +18,7 @@ export type ActiveObservable = {
|
|
|
20
18
|
isDeflate?: boolean;
|
|
21
19
|
checksum?: number;
|
|
22
20
|
closeFunction?: () => void;
|
|
23
|
-
error?:
|
|
21
|
+
error?: ObservableError | null;
|
|
24
22
|
closeAfterIdleTime?: number;
|
|
25
23
|
timeTillDestroy: number | null;
|
|
26
24
|
isDestroyed: boolean;
|
package/dist/server.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import
|
|
3
|
+
import { Context, BasedFunctionClient, WebSocketSession, HttpSession, Geo } from '@based/functions';
|
|
4
4
|
import type { ActiveObservable } from './observable';
|
|
5
5
|
import uws from '@based/uws';
|
|
6
6
|
import { BasedFunctions, FunctionConfig } from './functions';
|
|
@@ -24,6 +24,7 @@ type RateLimit = {
|
|
|
24
24
|
export type ServerOptions = {
|
|
25
25
|
port?: number;
|
|
26
26
|
key?: string;
|
|
27
|
+
geo?: (ctx: Context) => Promise<Geo>;
|
|
27
28
|
disableRest?: boolean;
|
|
28
29
|
disableWs?: boolean;
|
|
29
30
|
silent?: boolean;
|
|
@@ -51,6 +52,7 @@ export declare class BasedServer {
|
|
|
51
52
|
silent: boolean;
|
|
52
53
|
rateLimit: RateLimit;
|
|
53
54
|
listenSocket: any;
|
|
55
|
+
geo: (ctx: Context) => Promise<Geo>;
|
|
54
56
|
blockedIps: Set<string>;
|
|
55
57
|
allowedIps: Set<string>;
|
|
56
58
|
rateLimitCounter: Map<string, {
|
package/dist/server.js
CHANGED
|
@@ -4,9 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.BasedServer = void 0;
|
|
7
|
+
const functions_1 = require("@based/functions");
|
|
7
8
|
const uws_1 = __importDefault(require("@based/uws"));
|
|
8
9
|
const incoming_1 = __importDefault(require("./incoming"));
|
|
9
|
-
const
|
|
10
|
+
const functions_2 = require("./functions");
|
|
10
11
|
const auth_1 = require("./auth");
|
|
11
12
|
const utils_1 = require("@saulx/utils");
|
|
12
13
|
const picocolors = require("picocolors");
|
|
@@ -23,6 +24,24 @@ class BasedServer {
|
|
|
23
24
|
http: 1e3,
|
|
24
25
|
drain: 500,
|
|
25
26
|
};
|
|
27
|
+
this.geo = async (ctx) => {
|
|
28
|
+
if (!ctx.session) {
|
|
29
|
+
throw new Error('Session expired while parsing geo location');
|
|
30
|
+
}
|
|
31
|
+
if ((0, functions_1.isClientContext)(ctx)) {
|
|
32
|
+
return {
|
|
33
|
+
country: 'NL',
|
|
34
|
+
ip: ctx.session.ip,
|
|
35
|
+
accuracy: 0,
|
|
36
|
+
long: 0,
|
|
37
|
+
lat: 0,
|
|
38
|
+
regions: [],
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
throw new Error('Cannot parse geo location from a non external context');
|
|
43
|
+
}
|
|
44
|
+
};
|
|
26
45
|
this.blockedIps = new Set();
|
|
27
46
|
// opposite of blockedIps can never get blocked
|
|
28
47
|
this.allowedIps = new Set();
|
|
@@ -40,7 +59,7 @@ class BasedServer {
|
|
|
40
59
|
if (opts.silent) {
|
|
41
60
|
this.silent = opts.silent;
|
|
42
61
|
}
|
|
43
|
-
this.functions = new
|
|
62
|
+
this.functions = new functions_2.BasedFunctions(this, opts.functions);
|
|
44
63
|
this.auth = new auth_1.BasedAuth(this, opts.auth);
|
|
45
64
|
if (opts.client) {
|
|
46
65
|
// @ts-ignore - allow different ones if you want a special client
|
|
@@ -52,6 +71,9 @@ class BasedServer {
|
|
|
52
71
|
if (opts.rateLimit) {
|
|
53
72
|
this.rateLimit = opts.rateLimit;
|
|
54
73
|
}
|
|
74
|
+
if (opts.geo) {
|
|
75
|
+
this.geo = opts.geo;
|
|
76
|
+
}
|
|
55
77
|
(0, incoming_1.default)(this, opts);
|
|
56
78
|
}
|
|
57
79
|
emit(type, client, val, err) {
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@based/server",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.1.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"files": [
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"jsonexport": "^3.2.0",
|
|
28
28
|
"jsonwebtoken": "^8.5.1",
|
|
29
29
|
"mime-types": "^2.1.31",
|
|
30
|
-
"@based/functions": "^1.
|
|
30
|
+
"@based/functions": "^1.2.2"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"@types/mime-types": "2.1.1",
|