@based/server 3.4.2 → 3.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,4 @@
1
- @based/server:build: cache hit, replaying output 4fe59d6d46e30dfb
2
- @based/server:build: 
3
- @based/server:build: > @based/server@3.4.1 build
4
- @based/server:build: > npx tsc
5
- @based/server:build: 
1
+
2
+ > @based/server@3.4.0 build
3
+ > npx tsc
4
+
@@ -5,6 +5,7 @@ exports.default = async (server, client, [, reqId, payload]) => {
5
5
  if (typeof payload === 'string')
6
6
  throw new Error('payload cannot be a string');
7
7
  try {
8
+ // @ts-ignore
8
9
  const id = await server.db.update(payload.payload, payload.query);
9
10
  client.send([client_1.RequestTypes.BulkUpdate, reqId, { id }]);
10
11
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/handlers/bulkUpdate/index.ts"],"names":[],"mappings":";;AAEA,0CAA4D;AAC5D,kBAAe,KAAK,EAClB,MAAmB,EACnB,MAAc,EACd,CAAC,EAAE,KAAK,EAAE,OAAO,CAAiB,EAClC,EAAE;IACF,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;IAC9E,IAAI;QACF,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QACjE,MAAM,CAAC,IAAI,CAAC,CAAC,qBAAY,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;KACtD;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,CAAC,IAAI,CAAC;YACV,qBAAY,CAAC,GAAG;YAChB,KAAK;YACL,CAAC;YACD;gBACE,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,OAAO;aACR;SACF,CAAC,CAAA;KACH;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/handlers/bulkUpdate/index.ts"],"names":[],"mappings":";;AAEA,0CAA4D;AAC5D,kBAAe,KAAK,EAClB,MAAmB,EACnB,MAAc,EACd,CAAC,EAAE,KAAK,EAAE,OAAO,CAAiB,EAClC,EAAE;IACF,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;IAC9E,IAAI;QACF,aAAa;QACb,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QACjE,MAAM,CAAC,IAAI,CAAC,CAAC,qBAAY,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;KACtD;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,CAAC,IAAI,CAAC;YACV,qBAAY,CAAC,GAAG;YAChB,KAAK;YACL,CAAC;YACD;gBACE,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,OAAO;aACR;SACF,CAAC,CAAA;KACH;AACH,CAAC,CAAA"}
@@ -6,10 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const DataStream_1 = require("./DataStream");
7
7
  const storeFile_1 = __importDefault(require("./storeFile"));
8
8
  const getExtenstion_1 = __importDefault(require("./getExtenstion"));
9
+ const Client_1 = require("../../../Client");
9
10
  const isCompleteOpts = (options) => {
10
11
  return !!(options.id && options.size && options.type && options.extension);
11
12
  };
12
13
  const setHeader = (server, file, res) => {
14
+ if (!res.client) {
15
+ res.client = new Client_1.Client(server, undefined, res);
16
+ }
13
17
  file.headersSet++;
14
18
  if (file.headersSet === 2) {
15
19
  const opts = file.opts;
@@ -63,7 +67,7 @@ const setHeader = (server, file, res) => {
63
67
  updateProgress();
64
68
  });
65
69
  }
66
- (0, storeFile_1.default)(server, file.stream, opts);
70
+ (0, storeFile_1.default)(server, file.stream, opts, res.client);
67
71
  }
68
72
  else {
69
73
  invalidFile(res);
@@ -1 +1 @@
1
- {"version":3,"file":"formStream.js","sourceRoot":"","sources":["../../../../src/handlers/rest/file/formStream.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"formStream.js","sourceRoot":"","sources":["../../../../src/handlers/rest/file/formStream.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { Readable } from 'stream';
2
2
  import { BasedServer } from '../../..';
3
3
  import { FileOptions } from './types';
4
- declare const _default: (server: BasedServer, stream: Readable, opts: FileOptions) => Promise<void>;
4
+ import { Client } from '../../../Client';
5
+ declare const _default: (server: BasedServer, stream: Readable, opts: FileOptions, user: Client) => Promise<void>;
5
6
  export default _default;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = async (server, stream, opts) => {
3
+ exports.default = async (server, stream, opts, user) => {
4
4
  const storeFile = server.config.storeFile;
5
5
  if (!storeFile) {
6
6
  throw new Error('No file upload handler available!');
@@ -12,8 +12,8 @@ exports.default = async (server, stream, opts) => {
12
12
  mimeType: opts.type,
13
13
  extension: opts.extension,
14
14
  size: opts.size,
15
+ user,
15
16
  });
16
- // thumb
17
17
  const setObj = {
18
18
  $id: opts.id,
19
19
  src: result.src,
@@ -1 +1 @@
1
- {"version":3,"file":"storeFile.js","sourceRoot":"","sources":["../../../../src/handlers/rest/file/storeFile.ts"],"names":[],"mappings":";;AAIA,kBAAe,KAAK,EAClB,MAAmB,EACnB,MAAgB,EAChB,IAAiB,EACF,EAAE;IACjB,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAA;IAEzC,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;KACrD;IAED,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC;QAC7B,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,MAAM;QACN,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,QAAQ,EAAE,IAAI,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC,CAAA;IAEF,QAAQ;IAER,MAAM,MAAM,GAAQ;QAClB,GAAG,EAAE,IAAI,CAAC,EAAE;QACZ,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI;KACvC,CAAA;IAED,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;KAC5B;IAED,IAAI,MAAM,CAAC,UAAU,EAAE;QACrB,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;KACtC;IAED,cAAc;IACd,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC1B,CAAC,CAAA"}
1
+ {"version":3,"file":"storeFile.js","sourceRoot":"","sources":["../../../../src/handlers/rest/file/storeFile.ts"],"names":[],"mappings":";;AAKA,kBAAe,KAAK,EAClB,MAAmB,EACnB,MAAgB,EAChB,IAAiB,EACjB,IAAY,EACG,EAAE;IACjB,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAA;IAEzC,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;KACrD;IAED,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC;QAC7B,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,MAAM;QACN,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,QAAQ,EAAE,IAAI,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI;KACL,CAAC,CAAA;IAEF,MAAM,MAAM,GAAQ;QAClB,GAAG,EAAE,IAAI,CAAC,EAAE;QACZ,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI;KACvC,CAAA;IAED,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;KAC5B;IAED,IAAI,MAAM,CAAC,UAAU,EAAE;QACrB,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;KACtC;IAED,cAAc;IACd,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC1B,CAAC,CAAA"}
@@ -95,7 +95,11 @@ exports.default = async (server, res, opts) => {
95
95
  catch (err) { }
96
96
  }
97
97
  else {
98
- await (0, storeFile_1.default)(server, stream, opts);
98
+ if (!res.client) {
99
+ res.client = new Client_1.Client(server, undefined, res);
100
+ }
101
+ // @ts-ignore
102
+ await (0, storeFile_1.default)(server, stream, { user: res.client, ...opts });
99
103
  }
100
104
  };
101
105
  //# sourceMappingURL=stream.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../../src/handlers/rest/file/stream.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../../src/handlers/rest/file/stream.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -34,6 +34,7 @@ exports.BasedServerClient = BasedServerClient_1.default;
34
34
  const Params_1 = require("./Params");
35
35
  Object.defineProperty(exports, "Params", { enumerable: true, get: function () { return Params_1.Params; } });
36
36
  const getFromConfig_1 = require("./getFromConfig");
37
+ const pkg = require('../package.json');
37
38
  __exportStar(require("./types"), exports);
38
39
  class BasedServer extends events_1.EventEmitter {
39
40
  constructor({ key, cert, useLessMemory, port, db, config, state, }) {
@@ -173,7 +174,7 @@ class BasedServer extends events_1.EventEmitter {
173
174
  return new Promise((resolve, reject) => {
174
175
  this.uwsApp.listen(this.port, (listenSocket) => {
175
176
  if (listenSocket) {
176
- console.info('💫 Based-server listening on port:', this.port);
177
+ console.info(`💫 Based-server ${pkg.version} listening on port:`, this.port);
177
178
  // do this better wrap a nice thing arround it
178
179
  this.listenSocket = listenSocket;
179
180
  resolve(this);
@@ -202,7 +203,6 @@ class BasedServer extends events_1.EventEmitter {
202
203
  this.uwsApp = null;
203
204
  await this.db.destroy();
204
205
  this.db = null;
205
- // clean up subscriptions (tmp)
206
206
  await (0, utils_1.wait)(1000);
207
207
  }
208
208
  }
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/secrets.js CHANGED
@@ -9,7 +9,6 @@ const types_1 = require("@based/types");
9
9
  const jwtDecode = (resolve, reject, value, publicKey) => {
10
10
  try {
11
11
  jsonwebtoken_1.default.verify(value, publicKey,
12
- // FIX: Reverted to re-enable airhub
13
12
  // {
14
13
  // algorithms: ['RS256'],
15
14
  // },
@@ -35,30 +34,36 @@ const jwtDecode = (resolve, reject, value, publicKey) => {
35
34
  }
36
35
  };
37
36
  const getSecret = async (server, secret) => {
38
- let cert = server.config?.secrets?.[secret];
39
- // can make a thing to update it as well - but later...
40
- if (server.config?.secretsConfig) {
41
- if (!server.config.secretsConfig.secretTimeouts) {
42
- server.config.secretsConfig.secretTimeouts = {};
43
- }
44
- if (!cert) {
45
- cert = await server.config.secretsConfig.getInitial(server, secret);
46
- if (!cert) {
47
- return null;
48
- }
49
- if (!server.config.secrets) {
50
- server.config.secrets = {};
37
+ try {
38
+ let cert = server.config?.secrets?.[secret];
39
+ // can make a thing to update it as well - but later...
40
+ if (server.config?.secretsConfig) {
41
+ if (!server.config.secretsConfig.secretTimeouts) {
42
+ server.config.secretsConfig.secretTimeouts = {};
51
43
  }
52
- server.config.secretsConfig.secretTimeouts[secret] = 0;
53
- server.config.secrets[secret] = cert;
54
- }
55
- else {
56
- if (server.config.secretsConfig.secretTimeouts[secret] !== undefined) {
44
+ if (!cert) {
45
+ cert = await server.config.secretsConfig.getInitial(server, secret);
46
+ if (!cert) {
47
+ return null;
48
+ }
49
+ if (!server.config.secrets) {
50
+ server.config.secrets = {};
51
+ }
57
52
  server.config.secretsConfig.secretTimeouts[secret] = 0;
53
+ server.config.secrets[secret] = cert;
54
+ }
55
+ else {
56
+ if (server.config.secretsConfig.secretTimeouts[secret] !== undefined) {
57
+ server.config.secretsConfig.secretTimeouts[secret] = 0;
58
+ }
58
59
  }
59
60
  }
61
+ return cert || false;
62
+ }
63
+ catch (err) {
64
+ console.warn('Error getting secret (unhandled)', err);
65
+ return false;
60
66
  }
61
- return cert || false;
62
67
  };
63
68
  exports.getSecret = getSecret;
64
69
  const cleanCarriageReturn = (value) => typeof value === 'string' ? value.replace(/\n$/, '') : value;
@@ -1 +1 @@
1
- {"version":3,"file":"secrets.js","sourceRoot":"","sources":["../src/secrets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"secrets.js","sourceRoot":"","sources":["../src/secrets.ts"],"names":[],"mappings":"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"}
package/dist/types.d.ts CHANGED
@@ -42,6 +42,7 @@ export declare type FileOpts = {
42
42
  id: string;
43
43
  extension: string;
44
44
  size: number;
45
+ user?: Client;
45
46
  };
46
47
  export declare type GetInitial = (server: BasedServer, name: string) => Promise<ObservableFunction | CallFunction | null>;
47
48
  export declare type Geo = {
File without changes
@@ -0,0 +1,20 @@
1
+ // make a based server thing useFunctionWorker
2
+ // workerConfig = {
3
+ // concurrency: 5
4
+ // maxCrashRate: [5, 1000] // 20 per second
5
+ // logs in a special way
6
+ // }
7
+ // import workerify from './workerify'
8
+ /*
9
+ import { CallFunction, ObservableFunction } from '@based/server/src/types'
10
+
11
+ export default (
12
+ fn: ObservableFunction | CallFunction
13
+ ): ObservableFunction | CallFunction => {
14
+ console.info('GO GO GO', fn)
15
+
16
+ return fn
17
+ }
18
+
19
+ */
20
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/workers/index.ts"],"names":[],"mappings":"AAAA,8CAA8C;AAC9C,mBAAmB;AACnB,kBAAkB;AAClB,4CAA4C;AAC5C,wBAAwB;AACxB,IAAI;AACJ,sCAAsC;AAEtC;;;;;;;;;;;EAWE"}
@@ -0,0 +1,12 @@
1
+ declare class WorkerClient {
2
+ constructor(id: number);
3
+ }
4
+ declare class WorkerBasedClient {
5
+ }
6
+ declare class WorkerParams {
7
+ private _clientId;
8
+ payload: any;
9
+ callStack: any[];
10
+ get user(): WorkerClient;
11
+ get based(): WorkerBasedClient;
12
+ }
@@ -0,0 +1,46 @@
1
+ // import { Client } from '@based/server/src/types'
2
+ // import { BasedServerClient } from '@based/server'
3
+ // export type CallParams = {
4
+ // payload: any
5
+ // based: BasedServerClient
6
+ // user: Client
7
+ // callStack: string[]
8
+ // }
9
+ // export type ObservableParams = {
10
+ // payload: any
11
+ // based: BasedServerClient
12
+ // user?: Client
13
+ // callStack: string[]
14
+ // // error later...
15
+ // update: (value: any, checksum?: number) => void
16
+ // }
17
+ // workers
18
+ // in the worker we are going to run the code with getters
19
+ // e.g.
20
+ // fn({ user, payload, update, based }) // we add error later
21
+ // fn({ user, payload, based })
22
+ // WorkerParams object - mimic normal params object
23
+ // this all has to be part of based server
24
+ // mimic normal client
25
+ class WorkerClient {
26
+ constructor(id) {
27
+ // yes number
28
+ console.info(id);
29
+ }
30
+ }
31
+ // has to wrap every method
32
+ class WorkerBasedClient {
33
+ }
34
+ class WorkerParams {
35
+ constructor() {
36
+ this.callStack = [];
37
+ }
38
+ get user() {
39
+ // also pair it with other functions potentialy
40
+ return new WorkerClient(this._clientId);
41
+ }
42
+ get based() {
43
+ return new WorkerBasedClient();
44
+ }
45
+ }
46
+ //# sourceMappingURL=workerCode.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"workerCode.js","sourceRoot":"","sources":["../../src/workers/workerCode.ts"],"names":[],"mappings":"AAAA,mDAAmD;AACnD,oDAAoD;AAEpD,6BAA6B;AAC7B,iBAAiB;AACjB,6BAA6B;AAC7B,iBAAiB;AACjB,wBAAwB;AACxB,IAAI;AAEJ,mCAAmC;AACnC,iBAAiB;AACjB,6BAA6B;AAC7B,kBAAkB;AAClB,wBAAwB;AACxB,sBAAsB;AACtB,oDAAoD;AACpD,IAAI;AAEJ,UAAU;AAEV,0DAA0D;AAE1D,OAAO;AAEP,6DAA6D;AAE7D,+BAA+B;AAE/B,mDAAmD;AAEnD,0CAA0C;AAE1C,sBAAsB;AACtB,MAAM,YAAY;IAChB,YAAY,EAAU;QACpB,aAAa;QACb,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAClB,CAAC;CAEF;AAED,2BAA2B;AAC3B,MAAM,iBAAiB;CAEtB;AAED,MAAM,YAAY;IAAlB;QAKS,cAAS,GAAG,EAAE,CAAA;IAUvB,CAAC;IARC,IAAI,IAAI;QACN,+CAA+C;QAC/C,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACzC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,iBAAiB,EAAE,CAAA;IAChC,CAAC;CACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@based/server",
3
- "version": "3.4.2",
3
+ "version": "3.4.4",
4
4
  "license": "MIT",
5
5
  "main": "dist/index.js",
6
6
  "module": "src/index.ts",
@@ -28,7 +28,7 @@
28
28
  },
29
29
  "devDependencies": {
30
30
  "@types/node": "^17.0.23",
31
- "ts-node": "^10.1.0",
31
+ "ts-node": "10.9.1",
32
32
  "typescript": "^4.3.5",
33
33
  "rimraf": "^3.0.2"
34
34
  }