prostgles-server 2.0.169 → 2.0.172
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/AuthHandler.d.ts +16 -13
- package/dist/AuthHandler.d.ts.map +1 -1
- package/dist/AuthHandler.js +8 -7
- package/dist/AuthHandler.js.map +1 -1
- package/dist/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder.js +6 -5
- package/dist/DboBuilder.js.map +1 -1
- package/dist/Filtering.d.ts.map +1 -1
- package/dist/Filtering.js +1 -1
- package/dist/Filtering.js.map +1 -1
- package/lib/AuthHandler.ts +25 -20
- package/lib/DboBuilder.ts +6 -7
- package/lib/Filtering.ts +2 -2
- package/package.json +2 -2
- package/tests/client/PID.txt +1 -1
- package/tests/config_test/package.json +11 -13
- package/tests/config_test2/package.json +7 -7
- package/tests/isomorphic_queries.js +2 -0
- package/tests/isomorphic_queries.ts +3 -1
- package/tests/server/DBoGenerated.d.ts +96 -96
- package/tests/server/index.js +6 -13
- package/tests/server/index.ts +7 -12
- package/tests/server/package-lock.json +3 -3
package/dist/Filtering.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Filtering.js","sourceRoot":"","sources":["../lib/Filtering.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Filtering.js","sourceRoot":"","sources":["../lib/Filtering.ts"],"names":[],"mappings":"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"}
|
package/lib/AuthHandler.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AnyObject, AuthGuardLocation, AuthGuardLocationResponse, CHANNELS } from "prostgles-types";
|
|
2
2
|
import { LocalParams, PRGLIOSocket } from "./DboBuilder";
|
|
3
3
|
import { DB, DbHandler, Prostgles } from "./Prostgles";
|
|
4
|
-
|
|
4
|
+
type Awaitable<T> = T | Promise<T>;
|
|
5
5
|
type AuthSocketSchema = {
|
|
6
6
|
user?: AnyObject;
|
|
7
7
|
register?: boolean;
|
|
@@ -98,30 +98,34 @@ export type Auth<DBO = DbHandler> = {
|
|
|
98
98
|
/**
|
|
99
99
|
* Used in creating a session/logging in using a magic link
|
|
100
100
|
*/
|
|
101
|
-
check: (magicId: string, dbo: DBO, db: DB) =>
|
|
101
|
+
check: (magicId: string, dbo: DBO, db: DB) => Awaitable<BasicSession | undefined>;
|
|
102
102
|
}
|
|
103
103
|
|
|
104
104
|
}
|
|
105
105
|
|
|
106
|
-
|
|
107
|
-
* User data used on server. Mainly used in http request auth
|
|
108
|
-
*/
|
|
109
|
-
getUser: (sid: string | undefined, dbo: DBO, db: DB, client: AuthClientRequest) => Promise<AnyObject | undefined> | AnyObject | undefined;
|
|
106
|
+
getUser: (sid: string | undefined, dbo: DBO, db: DB, client: AuthClientRequest) => Awaitable<{
|
|
110
107
|
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
108
|
+
/**
|
|
109
|
+
* User data used on server. Mainly used in http request auth
|
|
110
|
+
*/
|
|
111
|
+
user: AnyObject;
|
|
112
|
+
|
|
113
|
+
/**
|
|
114
|
+
* User data sent to client. Mainly used in socket request auth
|
|
115
|
+
*/
|
|
116
|
+
clientUser: AnyObject;
|
|
117
|
+
|
|
118
|
+
} | undefined>;
|
|
115
119
|
|
|
116
|
-
register?: (params: AnyObject, dbo: DBO, db: DB) =>
|
|
117
|
-
login?: (params: AnyObject, dbo: DBO, db: DB) =>
|
|
118
|
-
logout?: (sid: string | undefined, dbo: DBO, db: DB) =>
|
|
120
|
+
register?: (params: AnyObject, dbo: DBO, db: DB) => Awaitable<BasicSession> | BasicSession;
|
|
121
|
+
login?: (params: AnyObject, dbo: DBO, db: DB) => Awaitable<BasicSession> | BasicSession;
|
|
122
|
+
logout?: (sid: string | undefined, dbo: DBO, db: DB) => Awaitable<any>;
|
|
119
123
|
|
|
120
124
|
/**
|
|
121
125
|
* If provided then then session info will be saved on socket.__prglCache and reused from there
|
|
122
126
|
*/
|
|
123
127
|
cacheSession?: {
|
|
124
|
-
getSession: (sid: string | undefined, dbo: DBO, db: DB) =>
|
|
128
|
+
getSession: (sid: string | undefined, dbo: DBO, db: DB) => Awaitable<BasicSession>
|
|
125
129
|
}
|
|
126
130
|
}
|
|
127
131
|
|
|
@@ -223,7 +227,7 @@ export default class AuthHandler {
|
|
|
223
227
|
if (!this.opts) return;
|
|
224
228
|
|
|
225
229
|
this.opts.sidKeyName = this.opts.sidKeyName || "session_id";
|
|
226
|
-
const { sidKeyName, login, getUser,
|
|
230
|
+
const { sidKeyName, login, getUser, expressConfig } = this.opts;
|
|
227
231
|
this.sidKeyName = this.opts.sidKeyName;
|
|
228
232
|
|
|
229
233
|
if (typeof sidKeyName !== "string" && !login) {
|
|
@@ -234,7 +238,7 @@ export default class AuthHandler {
|
|
|
234
238
|
*/
|
|
235
239
|
if (this.sidKeyName === "sid") throw "sidKeyName cannot be 'sid' please provide another name.";
|
|
236
240
|
|
|
237
|
-
if (!getUser
|
|
241
|
+
if (!getUser) throw "getUser missing from auth config";
|
|
238
242
|
|
|
239
243
|
if (expressConfig) {
|
|
240
244
|
const { app, publicRoutes = [], onGetRequestOK, magicLinks } = expressConfig;
|
|
@@ -465,15 +469,16 @@ export default class AuthHandler {
|
|
|
465
469
|
|
|
466
470
|
const res = await this.throttledFunc(async () => {
|
|
467
471
|
|
|
468
|
-
const { getUser
|
|
472
|
+
const { getUser } = this.opts ?? {};
|
|
469
473
|
|
|
470
|
-
if (getUser &&
|
|
474
|
+
if (getUser && localParams && (localParams.httpReq || localParams.socket)) {
|
|
471
475
|
const sid = this.getSID(localParams);
|
|
472
476
|
const clientReq = localParams.httpReq? { httpReq: localParams.httpReq } : { socket: localParams.socket };
|
|
473
477
|
let user, clientUser;
|
|
474
478
|
if(sid){
|
|
475
|
-
|
|
476
|
-
|
|
479
|
+
const res = await getUser(sid, this.dbo as any, this.db, clientReq);
|
|
480
|
+
user = res?.user;
|
|
481
|
+
clientUser = res?.clientUser;
|
|
477
482
|
}
|
|
478
483
|
if(getSession && isSocket){
|
|
479
484
|
const session = await getSession(sid, this.dbo as any, this.db)
|
package/lib/DboBuilder.ts
CHANGED
|
@@ -508,8 +508,8 @@ export class ViewHandler {
|
|
|
508
508
|
// this.tsDataName = snakify(this.name, true);
|
|
509
509
|
// if(this.tsDataName === "T") this.tsDataName = this.tsDataName + "_";
|
|
510
510
|
// this.tsDataDef = `export type ${this.tsDataName} = {\n`;
|
|
511
|
-
this.columnsForTypes.map(({ name, udt_name }) => {
|
|
512
|
-
this.tsColumnDefs.push(`${escapeTSNames(name, false)}?: ${postgresToTsType(udt_name) as string};`);
|
|
511
|
+
this.columnsForTypes.map(({ name, udt_name, is_nullable }) => {
|
|
512
|
+
this.tsColumnDefs.push(`${escapeTSNames(name, false)}?: ${postgresToTsType(udt_name) as string} ${is_nullable? " | null " : ""};`);
|
|
513
513
|
});
|
|
514
514
|
// this.tsDataDef += "};";
|
|
515
515
|
// this.tsDataDef += "\n";
|
|
@@ -1491,7 +1491,8 @@ export class ViewHandler {
|
|
|
1491
1491
|
allowedFields: allowed_colnames
|
|
1492
1492
|
}),
|
|
1493
1493
|
selected: false,
|
|
1494
|
-
getFields: () => [f.name]
|
|
1494
|
+
getFields: () => [f.name],
|
|
1495
|
+
column_udt_type: f.type === "column"? this.columns.find(c => c.name === f.name)?.udt_name : undefined
|
|
1495
1496
|
}))
|
|
1496
1497
|
);
|
|
1497
1498
|
|
|
@@ -1559,7 +1560,6 @@ export class ViewHandler {
|
|
|
1559
1560
|
/* TODO: Allow filter funcs */
|
|
1560
1561
|
// const singleFuncs = FUNCTIONS.filter(f => f.singleColArg);
|
|
1561
1562
|
|
|
1562
|
-
|
|
1563
1563
|
const f = pickKeys(data, filterKeys);
|
|
1564
1564
|
const q = parseFilterItem({
|
|
1565
1565
|
filter: f,
|
|
@@ -2899,7 +2899,6 @@ export class TableHandler extends ViewHandler {
|
|
|
2899
2899
|
|
|
2900
2900
|
import { JOIN_TYPES } from "./Prostgles";
|
|
2901
2901
|
import { BasicSession } from "./AuthHandler";
|
|
2902
|
-
import { bool } from "aws-sdk/clients/signer";
|
|
2903
2902
|
|
|
2904
2903
|
export class DboBuilder {
|
|
2905
2904
|
tablesOrViews?: TableSchema[]; //TableSchema TableOrViewInfo
|
|
@@ -3612,8 +3611,8 @@ export function isPlainObject(o: any): o is Record<string, any> {
|
|
|
3612
3611
|
export function postgresToTsType(udt_data_type: PG_COLUMN_UDT_DATA_TYPE): keyof typeof TS_PG_Types {
|
|
3613
3612
|
return getKeys(TS_PG_Types).find(k => {
|
|
3614
3613
|
// @ts-ignore
|
|
3615
|
-
return TS_PG_Types[k].includes(udt_data_type)
|
|
3616
|
-
})
|
|
3614
|
+
return TS_PG_Types[k].includes(udt_data_type)
|
|
3615
|
+
}) ?? "any";
|
|
3617
3616
|
}
|
|
3618
3617
|
|
|
3619
3618
|
function sqlErrCodeToMsg(code: string){
|
package/lib/Filtering.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
|
|
2
2
|
|
|
3
3
|
import { SelectItem } from "./QueryBuilder";
|
|
4
|
-
import { isEmpty, getKeys, FullFilter, EXISTS_KEYS, FilterDataType, GeomFilterKeys, GeomFilter_Funcs, TextFilter_FullTextSearchFilterKeys } from "prostgles-types";
|
|
4
|
+
import { isEmpty, getKeys, FullFilter, EXISTS_KEYS, FilterDataType, GeomFilterKeys, GeomFilter_Funcs, TextFilter_FullTextSearchFilterKeys, ColumnInfo } from "prostgles-types";
|
|
5
5
|
import { isPlainObject } from "./DboBuilder";
|
|
6
6
|
|
|
7
7
|
/**
|
|
@@ -27,7 +27,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
|
|
|
27
27
|
filter: { [fk]: _f[fk] },
|
|
28
28
|
select,
|
|
29
29
|
tableAlias,
|
|
30
|
-
pgp
|
|
30
|
+
pgp,
|
|
31
31
|
}))
|
|
32
32
|
.sort() /* sorted to ensure duplicate subscription channels are not created due to different condition order */
|
|
33
33
|
.join(" AND ")
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.172",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"bluebird": "^3.7.2",
|
|
30
30
|
"file-type": "^16.5.3",
|
|
31
31
|
"pg-promise": "^10.11.1",
|
|
32
|
-
"prostgles-types": "^1.5.
|
|
32
|
+
"prostgles-types": "^1.5.135",
|
|
33
33
|
"sharp": "^0.30.5"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
package/tests/client/PID.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
28185
|
|
@@ -11,21 +11,19 @@
|
|
|
11
11
|
"author": "",
|
|
12
12
|
"license": "ISC",
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@types/express": "
|
|
15
|
-
"@types/
|
|
16
|
-
"
|
|
17
|
-
"
|
|
18
|
-
"
|
|
19
|
-
"express": "^4.17.1",
|
|
20
|
-
"prostgles-client": "^1.5.83",
|
|
14
|
+
"@types/express": "latest",
|
|
15
|
+
"@types/ws": "latest",
|
|
16
|
+
"chokidar": "latest",
|
|
17
|
+
"express": "latest",
|
|
18
|
+
"prostgles-client": "latest",
|
|
21
19
|
"prostgles-server": "file:../..",
|
|
22
|
-
"socket.io": "
|
|
23
|
-
"socket.io-client": "
|
|
24
|
-
"ws": "
|
|
20
|
+
"socket.io": "latest",
|
|
21
|
+
"socket.io-client": "latest",
|
|
22
|
+
"ws": "latest"
|
|
25
23
|
},
|
|
26
24
|
"devDependencies": {
|
|
27
|
-
"@types/node": "
|
|
28
|
-
"tsc-watch": "
|
|
29
|
-
"typescript": "
|
|
25
|
+
"@types/node": "latest",
|
|
26
|
+
"tsc-watch": "latest",
|
|
27
|
+
"typescript": "latest"
|
|
30
28
|
}
|
|
31
29
|
}
|
|
@@ -16,16 +16,16 @@
|
|
|
16
16
|
"@types/socket.io-client": "^1.4.35",
|
|
17
17
|
"@types/ws": "^7.4.0",
|
|
18
18
|
"chokidar": "^3.5.1",
|
|
19
|
-
"express": "
|
|
20
|
-
"prostgles-client": "
|
|
19
|
+
"express": "latest",
|
|
20
|
+
"prostgles-client": "latest",
|
|
21
21
|
"prostgles-server": "file:../..",
|
|
22
22
|
"prostgles-types": "^1.5.66",
|
|
23
|
-
"socket.io": "
|
|
24
|
-
"socket.io-client": "
|
|
25
|
-
"ws": "
|
|
23
|
+
"socket.io": "latest",
|
|
24
|
+
"socket.io-client": "latest",
|
|
25
|
+
"ws": "latest"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@types/node": "
|
|
29
|
-
"typescript": "
|
|
28
|
+
"@types/node": "latest",
|
|
29
|
+
"typescript": "latest"
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -416,7 +416,9 @@ async function isomorphic(db) {
|
|
|
416
416
|
await tryRun("JSONB filtering", async () => {
|
|
417
417
|
const row = await db.obj_table.insert({ obj: { propName: 3232 } }, { returning: "*" });
|
|
418
418
|
const sameRow = await db.obj_table.findOne({ obj: { propName: 3232 } });
|
|
419
|
+
const count = await db.obj_table.count({ obj: { propName: 3232 } });
|
|
419
420
|
assert_1.strict.deepStrictEqual(row, sameRow);
|
|
421
|
+
assert_1.strict.deepStrictEqual(+count, 1);
|
|
420
422
|
});
|
|
421
423
|
await tryRun("Postgis examples", async () => {
|
|
422
424
|
await db.shapes.delete();
|
|
@@ -470,7 +470,9 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
|
|
|
470
470
|
await tryRun("JSONB filtering", async () => {
|
|
471
471
|
const row = await db.obj_table.insert({obj: { propName: 3232 }}, { returning: "*" });
|
|
472
472
|
const sameRow = await db.obj_table.findOne({obj: { propName: 3232 }});
|
|
473
|
-
|
|
473
|
+
const count = await db.obj_table.count({obj: { propName: 3232 }});
|
|
474
|
+
assert.deepStrictEqual(row, sameRow);
|
|
475
|
+
assert.deepStrictEqual(+count, 1);
|
|
474
476
|
})
|
|
475
477
|
|
|
476
478
|
await tryRun("Postgis examples", async () => {
|
|
@@ -12,152 +12,152 @@ export type TxCB = {
|
|
|
12
12
|
|
|
13
13
|
/* SCHEMA DEFINITON. Table names have been altered to work with Typescript */
|
|
14
14
|
export type D_34_42_34 = {
|
|
15
|
-
"\"*\""?: string;
|
|
16
|
-
"id"?: number;
|
|
15
|
+
"\"*\""?: string | null ;
|
|
16
|
+
"id"?: number ;
|
|
17
17
|
}
|
|
18
18
|
export type D_42 = {
|
|
19
|
-
"*"?: string;
|
|
20
|
-
"id"?: number;
|
|
19
|
+
"*"?: string | null ;
|
|
20
|
+
"id"?: number ;
|
|
21
21
|
}
|
|
22
22
|
export type Ex_j_ins = {
|
|
23
|
-
"added"?: Date;
|
|
24
|
-
"id"?: number;
|
|
25
|
-
"name"?: string;
|
|
26
|
-
"public"?: string;
|
|
23
|
+
"added"?: Date | null ;
|
|
24
|
+
"id"?: number ;
|
|
25
|
+
"name"?: string ;
|
|
26
|
+
"public"?: string | null ;
|
|
27
27
|
}
|
|
28
28
|
export type Geography_columns = {
|
|
29
|
-
"coord_dimension"?: number;
|
|
30
|
-
"f_geography_column"?: string;
|
|
31
|
-
"f_table_catalog"?: string;
|
|
32
|
-
"f_table_name"?: string;
|
|
33
|
-
"f_table_schema"?: string;
|
|
34
|
-
"srid"?: number;
|
|
35
|
-
"type"?: string;
|
|
29
|
+
"coord_dimension"?: number | null ;
|
|
30
|
+
"f_geography_column"?: string | null ;
|
|
31
|
+
"f_table_catalog"?: string | null ;
|
|
32
|
+
"f_table_name"?: string | null ;
|
|
33
|
+
"f_table_schema"?: string | null ;
|
|
34
|
+
"srid"?: number | null ;
|
|
35
|
+
"type"?: string | null ;
|
|
36
36
|
}
|
|
37
37
|
export type Geometry_columns = {
|
|
38
|
-
"coord_dimension"?: number;
|
|
39
|
-
"f_geometry_column"?: string;
|
|
40
|
-
"f_table_catalog"?: string;
|
|
41
|
-
"f_table_name"?: string;
|
|
42
|
-
"f_table_schema"?: string;
|
|
43
|
-
"srid"?: number;
|
|
44
|
-
"type"?: string;
|
|
38
|
+
"coord_dimension"?: number | null ;
|
|
39
|
+
"f_geometry_column"?: string | null ;
|
|
40
|
+
"f_table_catalog"?: string | null ;
|
|
41
|
+
"f_table_name"?: string | null ;
|
|
42
|
+
"f_table_schema"?: string | null ;
|
|
43
|
+
"srid"?: number | null ;
|
|
44
|
+
"type"?: string | null ;
|
|
45
45
|
}
|
|
46
46
|
export type Insert_rules = {
|
|
47
|
-
"added"?: Date;
|
|
48
|
-
"id"?: number;
|
|
49
|
-
"name"?: string;
|
|
47
|
+
"added"?: Date | null ;
|
|
48
|
+
"id"?: number ;
|
|
49
|
+
"name"?: string | null ;
|
|
50
50
|
}
|
|
51
51
|
export type Items = {
|
|
52
|
-
"h"?: Array<string
|
|
53
|
-
"id"?: number;
|
|
54
|
-
"name"?: string;
|
|
52
|
+
"h"?: Array<string> | null ;
|
|
53
|
+
"id"?: number ;
|
|
54
|
+
"name"?: string | null ;
|
|
55
55
|
}
|
|
56
56
|
export type Items2 = {
|
|
57
|
-
"hh"?: Array<string
|
|
58
|
-
"id"?: number;
|
|
59
|
-
"items_id"?: number;
|
|
60
|
-
"name"?: string;
|
|
57
|
+
"hh"?: Array<string> | null ;
|
|
58
|
+
"id"?: number ;
|
|
59
|
+
"items_id"?: number | null ;
|
|
60
|
+
"name"?: string | null ;
|
|
61
61
|
}
|
|
62
62
|
export type Items3 = {
|
|
63
|
-
"h"?: Array<string
|
|
64
|
-
"id"?: number;
|
|
65
|
-
"name"?: string;
|
|
63
|
+
"h"?: Array<string> | null ;
|
|
64
|
+
"id"?: number ;
|
|
65
|
+
"name"?: string | null ;
|
|
66
66
|
}
|
|
67
67
|
export type Items4 = {
|
|
68
|
-
"added"?: Date;
|
|
69
|
-
"id"?: number;
|
|
70
|
-
"name"?: string;
|
|
71
|
-
"public"?: string;
|
|
68
|
+
"added"?: Date | null ;
|
|
69
|
+
"id"?: number ;
|
|
70
|
+
"name"?: string ;
|
|
71
|
+
"public"?: string | null ;
|
|
72
72
|
}
|
|
73
73
|
export type Items4_pub = {
|
|
74
|
-
"added"?: Date;
|
|
75
|
-
"id"?: number;
|
|
76
|
-
"name"?: string;
|
|
77
|
-
"public"?: string;
|
|
74
|
+
"added"?: Date | null ;
|
|
75
|
+
"id"?: number ;
|
|
76
|
+
"name"?: string ;
|
|
77
|
+
"public"?: string | null ;
|
|
78
78
|
}
|
|
79
79
|
export type Items_with_media = {
|
|
80
|
-
"id"?: number;
|
|
81
|
-
"name"?: string;
|
|
80
|
+
"id"?: number ;
|
|
81
|
+
"name"?: string | null ;
|
|
82
82
|
}
|
|
83
83
|
export type Items_with_one_media = {
|
|
84
|
-
"id"?: number;
|
|
85
|
-
"name"?: string;
|
|
84
|
+
"id"?: number ;
|
|
85
|
+
"name"?: string | null ;
|
|
86
86
|
}
|
|
87
87
|
export type Lookup_col1 = {
|
|
88
|
-
"id"?: string;
|
|
88
|
+
"id"?: string ;
|
|
89
89
|
}
|
|
90
90
|
export type Media = {
|
|
91
|
-
"content_type"?: string;
|
|
92
|
-
"description"?: string;
|
|
93
|
-
"etag"?: string;
|
|
94
|
-
"extension"?: string;
|
|
95
|
-
"id"?: string;
|
|
96
|
-
"name"?: string;
|
|
97
|
-
"original_name"?: string;
|
|
98
|
-
"s3_url"?: string;
|
|
99
|
-
"signed_url"?: string;
|
|
100
|
-
"signed_url_expires"?: number;
|
|
101
|
-
"url"?: string;
|
|
91
|
+
"content_type"?: string ;
|
|
92
|
+
"description"?: string | null ;
|
|
93
|
+
"etag"?: string | null ;
|
|
94
|
+
"extension"?: string ;
|
|
95
|
+
"id"?: string ;
|
|
96
|
+
"name"?: string ;
|
|
97
|
+
"original_name"?: string ;
|
|
98
|
+
"s3_url"?: string | null ;
|
|
99
|
+
"signed_url"?: string | null ;
|
|
100
|
+
"signed_url_expires"?: number | null ;
|
|
101
|
+
"url"?: string ;
|
|
102
102
|
}
|
|
103
103
|
export type Obj_table = {
|
|
104
|
-
"id"?: number;
|
|
105
|
-
"obj"?:
|
|
104
|
+
"id"?: number ;
|
|
105
|
+
"obj"?: any | null ;
|
|
106
106
|
}
|
|
107
107
|
export type Planes = {
|
|
108
|
-
"flight_number"?: string;
|
|
109
|
-
"id"?: number;
|
|
110
|
-
"last_updated"?: number;
|
|
111
|
-
"x"?: number;
|
|
112
|
-
"y"?: number;
|
|
108
|
+
"flight_number"?: string | null ;
|
|
109
|
+
"id"?: number ;
|
|
110
|
+
"last_updated"?: number ;
|
|
111
|
+
"x"?: number | null ;
|
|
112
|
+
"y"?: number | null ;
|
|
113
113
|
}
|
|
114
114
|
export type Prostgles_lookup_media_items_with_media = {
|
|
115
|
-
"foreign_id"?: number;
|
|
116
|
-
"media_id"?: string;
|
|
115
|
+
"foreign_id"?: number | null ;
|
|
116
|
+
"media_id"?: string ;
|
|
117
117
|
}
|
|
118
118
|
export type Prostgles_lookup_media_items_with_one_media = {
|
|
119
|
-
"foreign_id"?: number;
|
|
120
|
-
"media_id"?: string;
|
|
119
|
+
"foreign_id"?: number ;
|
|
120
|
+
"media_id"?: string ;
|
|
121
121
|
}
|
|
122
122
|
export type Shapes = {
|
|
123
|
-
"geog"?: any;
|
|
124
|
-
"geom"?: any;
|
|
125
|
-
"id"?: string;
|
|
123
|
+
"geog"?: any | null ;
|
|
124
|
+
"geom"?: any | null ;
|
|
125
|
+
"id"?: string ;
|
|
126
126
|
}
|
|
127
127
|
export type Spatial_ref_sys = {
|
|
128
|
-
"auth_name"?: string;
|
|
129
|
-
"auth_srid"?: number;
|
|
130
|
-
"proj4text"?: string;
|
|
131
|
-
"srid"?: number;
|
|
132
|
-
"srtext"?: string;
|
|
128
|
+
"auth_name"?: string | null ;
|
|
129
|
+
"auth_srid"?: number | null ;
|
|
130
|
+
"proj4text"?: string | null ;
|
|
131
|
+
"srid"?: number ;
|
|
132
|
+
"srtext"?: string | null ;
|
|
133
133
|
}
|
|
134
134
|
export type Tr1 = {
|
|
135
|
-
"id"?: number;
|
|
136
|
-
"t1"?: string;
|
|
135
|
+
"id"?: number ;
|
|
136
|
+
"t1"?: string | null ;
|
|
137
137
|
}
|
|
138
138
|
export type Tr2 = {
|
|
139
|
-
"id"?: number;
|
|
140
|
-
"t1"?: string;
|
|
141
|
-
"t2"?: string;
|
|
142
|
-
"tr1_id"?: number;
|
|
139
|
+
"id"?: number ;
|
|
140
|
+
"t1"?: string | null ;
|
|
141
|
+
"t2"?: string | null ;
|
|
142
|
+
"tr1_id"?: number | null ;
|
|
143
143
|
}
|
|
144
144
|
export type Uuid_text = {
|
|
145
|
-
"col1"?: string;
|
|
146
|
-
"col2"?: string;
|
|
147
|
-
"id"?: string;
|
|
148
|
-
"name"?: string;
|
|
145
|
+
"col1"?: string | null ;
|
|
146
|
+
"col2"?: string | null ;
|
|
147
|
+
"id"?: string ;
|
|
148
|
+
"name"?: string | null ;
|
|
149
149
|
}
|
|
150
150
|
export type V_items = {
|
|
151
|
-
"id"?: number;
|
|
152
|
-
"name"?: string;
|
|
151
|
+
"id"?: number | null ;
|
|
152
|
+
"name"?: string | null ;
|
|
153
153
|
}
|
|
154
154
|
export type Various = {
|
|
155
|
-
"added"?: Date;
|
|
156
|
-
"h"?: Array<string
|
|
157
|
-
"id"?: number;
|
|
158
|
-
"jsn"?:
|
|
159
|
-
"name"?: string;
|
|
160
|
-
"tsv"?: any;
|
|
155
|
+
"added"?: Date | null ;
|
|
156
|
+
"h"?: Array<string> | null ;
|
|
157
|
+
"id"?: number ;
|
|
158
|
+
"jsn"?: any | null ;
|
|
159
|
+
"name"?: string | null ;
|
|
160
|
+
"tsv"?: any | null ;
|
|
161
161
|
}
|
|
162
162
|
|
|
163
163
|
export type JoinMakerTables = {
|
package/tests/server/index.js
CHANGED
|
@@ -163,24 +163,17 @@ const dbConnection = {
|
|
|
163
163
|
},
|
|
164
164
|
auth: {
|
|
165
165
|
sidKeyName: "token",
|
|
166
|
-
|
|
166
|
+
getUser: async (sid) => {
|
|
167
167
|
if (sid) {
|
|
168
168
|
const s = sessions.find(s => s.id === sid);
|
|
169
169
|
if (s) {
|
|
170
|
-
const
|
|
171
|
-
if (
|
|
172
|
-
return { sid: s.id, uid:
|
|
170
|
+
const user = users.find(u => s && s.user_id === u.id);
|
|
171
|
+
if (user) {
|
|
172
|
+
return { user, clientUser: { sid: s.id, uid: user.id } };
|
|
173
|
+
}
|
|
173
174
|
}
|
|
174
175
|
}
|
|
175
|
-
return
|
|
176
|
-
},
|
|
177
|
-
getUser: async (sid) => {
|
|
178
|
-
if (sid) {
|
|
179
|
-
const s = sessions.find(s => s.id === sid);
|
|
180
|
-
if (s)
|
|
181
|
-
return users.find(u => s && s.user_id === u.id);
|
|
182
|
-
}
|
|
183
|
-
return null;
|
|
176
|
+
return undefined;
|
|
184
177
|
},
|
|
185
178
|
login: async ({ username, password } = {}) => {
|
|
186
179
|
const u = users.find(u => u.username === username && u.password === password);
|
package/tests/server/index.ts
CHANGED
|
@@ -187,22 +187,17 @@ const dbConnection = {
|
|
|
187
187
|
},
|
|
188
188
|
auth: {
|
|
189
189
|
sidKeyName: "token",
|
|
190
|
-
getClientUser: async (sid) => {
|
|
191
|
-
if(sid){
|
|
192
|
-
const s = sessions.find(s => s.id === sid);
|
|
193
|
-
if(s){
|
|
194
|
-
const u = users.find(u => s && s.user_id === u.id);
|
|
195
|
-
if(u) return { sid: s.id, uid: u.id };
|
|
196
|
-
}
|
|
197
|
-
}
|
|
198
|
-
return null;
|
|
199
|
-
},
|
|
200
190
|
getUser: async (sid) => {
|
|
201
191
|
if(sid){
|
|
202
192
|
const s = sessions.find(s => s.id === sid);
|
|
203
|
-
if(s)
|
|
193
|
+
if(s) {
|
|
194
|
+
const user = users.find(u => s && s.user_id === u.id);
|
|
195
|
+
if(user) {
|
|
196
|
+
return { user, clientUser: { sid: s.id, uid: user.id } }
|
|
197
|
+
}
|
|
198
|
+
}
|
|
204
199
|
}
|
|
205
|
-
return
|
|
200
|
+
return undefined;
|
|
206
201
|
},
|
|
207
202
|
login: async ({ username, password } = {}) => {
|
|
208
203
|
const u = users.find(u => u.username === username && u.password === password);
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
},
|
|
22
22
|
"../..": {
|
|
23
23
|
"name": "prostgles-server",
|
|
24
|
-
"version": "2.0.
|
|
24
|
+
"version": "2.0.171",
|
|
25
25
|
"license": "MIT",
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@aws-sdk/client-s3": "^3.95.0",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"bluebird": "^3.7.2",
|
|
30
30
|
"file-type": "^16.5.3",
|
|
31
31
|
"pg-promise": "^10.11.1",
|
|
32
|
-
"prostgles-types": "^1.5.
|
|
32
|
+
"prostgles-types": "^1.5.135",
|
|
33
33
|
"sharp": "^0.30.5"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
@@ -1371,7 +1371,7 @@
|
|
|
1371
1371
|
"bluebird": "^3.7.2",
|
|
1372
1372
|
"file-type": "^16.5.3",
|
|
1373
1373
|
"pg-promise": "^10.11.1",
|
|
1374
|
-
"prostgles-types": "^1.5.
|
|
1374
|
+
"prostgles-types": "^1.5.135",
|
|
1375
1375
|
"sharp": "^0.30.5",
|
|
1376
1376
|
"typescript": "^4.7.2"
|
|
1377
1377
|
}
|