@miqro/core 1.5.11 → 1.5.14
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/common/config/index.js +5 -1
- package/dist/common/config/index.js.map +1 -1
- package/dist/common/error/index.js +5 -1
- package/dist/common/error/index.js.map +1 -1
- package/dist/common/index.js +5 -1
- package/dist/common/index.js.map +1 -1
- package/dist/common/logger/index.js +5 -1
- package/dist/common/logger/index.js.map +1 -1
- package/dist/common/session/common.d.ts +5 -2
- package/dist/common/session/index.js +5 -1
- package/dist/common/session/index.js.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/middleware/index.js +5 -1
- package/dist/middleware/index.js.map +1 -1
- package/dist/static.d.ts +1 -0
- package/dist/static.js +8 -3
- package/dist/static.js.map +1 -1
- package/package.json +7 -7
- package/src/common/session/common.ts +5 -2
- package/src/static.ts +11 -4
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/config/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,2CAAyB;AACzB,kDAAgC"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/error/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/error/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,sDAAoC;AACpC,mDAAiC;AACjC,6CAA2B;AAC3B,mDAAiC;AACjC,uDAAqC"}
|
package/dist/common/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/dist/common/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,mDAAiC;AACjC,uDAAqC;AACrC,4CAA0B;AAC1B,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/logger/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/logger/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,4CAA0B;AAC1B,8CAA4B;AAC5B,2CAAyB;AACzB,8CAA4B"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Dict } from "@miqro/parser";
|
|
2
1
|
import { Context } from "../context";
|
|
3
2
|
export interface SessionHandlerOptions {
|
|
4
3
|
authService: {
|
|
@@ -18,7 +17,10 @@ export interface SessionHandlerOptions {
|
|
|
18
17
|
};
|
|
19
18
|
};
|
|
20
19
|
}
|
|
21
|
-
|
|
20
|
+
declare type Dict<T = any> = {
|
|
21
|
+
[key: string]: T;
|
|
22
|
+
};
|
|
23
|
+
export interface NoTokenSession extends Dict {
|
|
22
24
|
account: string;
|
|
23
25
|
username: string;
|
|
24
26
|
groups: string[];
|
|
@@ -32,3 +34,4 @@ export interface GroupPolicy {
|
|
|
32
34
|
groups: GroupPolicyGroups[];
|
|
33
35
|
groupPolicy: GroupPolicyType;
|
|
34
36
|
}
|
|
37
|
+
export {};
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/session/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/session/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,4CAA0B"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,+CAA6B;AAC7B,2CAAyB;AACzB,0CAAwB;AACxB,+CAA6B"}
|
package/dist/middleware/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,sCAAoD;AAEpD,qCAAuC;AACvC,+BAAkC;AAClC,iCAA4B;AAC5B,qCAAsC;AACtC,iCAAkC;AAClC,iCAAkC;AAClC,iCAAwC;AAExC,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,0CAAwB;AACxB,0CAAwB;AACxB,wCAAsB;AACtB,2CAAyB;AACzB,mCAAoC;AAA5B,oGAAA,UAAU,OAAA;AAEX,MAAM,UAAU,GAAG,GAAc,EAAE;IACxC,MAAM,GAAG,GAAc,EAAE,CAAC;IAC1B,IAAI,IAAA,yBAAgB,EAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE;QAC5C,GAAG,CAAC,IAAI,CAAC,IAAA,sBAAa,GAAE,CAAC,CAAC;KAC3B;IACD,IAAI,IAAA,yBAAgB,EAAC,cAAc,EAAE,KAAK,CAAC,EAAE;QAC3C,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAW,GAAE,CAAC,CAAC;KACzB;IACD,IAAI,IAAA,yBAAgB,EAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QACnC,GAAG,CAAC,IAAI,CAAC,IAAA,WAAI,GAAE,CAAC,CAAC;KAClB;IACD,IAAI,IAAA,yBAAgB,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC3C,GAAG,CAAC,IAAI,CAAC,IAAA,qBAAY,GAAE,CAAC,CAAC;KAC1B;IACD,IAAI,IAAA,yBAAgB,EAAC,aAAa,EAAE,IAAI,CAAC,EAAE;QACzC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,GAAE,CAAC,CAAC;KACxB;IACD,IAAI,IAAA,yBAAgB,EAAC,oBAAoB,EAAE,IAAI,CAAC,EAAE;QAChD,GAAG,CAAC,IAAI,CAAC,IAAA,uBAAgB,GAAE,CAAC,CAAC;KAC9B;IACD,IAAI,IAAA,yBAAgB,EAAC,aAAa,EAAE,IAAI,CAAC,EAAE;QACzC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,GAAE,CAAC,CAAC;KACxB;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAxBW,QAAA,UAAU,cAwBrB"}
|
package/dist/static.d.ts
CHANGED
package/dist/static.js
CHANGED
|
@@ -5,14 +5,14 @@ const fs_1 = require("fs");
|
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const parser_1 = require("@miqro/parser");
|
|
7
7
|
const router_1 = require("./router");
|
|
8
|
-
const outputFile = async (path, contentType, ctx, allowGetJSON) => {
|
|
8
|
+
const outputFile = async (path, contentType, ctx, allowGetJSON, status = 200) => {
|
|
9
9
|
const buffer = (0, fs_1.readFileSync)(path);
|
|
10
10
|
return allowGetJSON && ctx.query.format && ctx.query.format === "json" ?
|
|
11
11
|
ctx.json({
|
|
12
12
|
buffer
|
|
13
13
|
}) :
|
|
14
14
|
ctx.end({
|
|
15
|
-
status
|
|
15
|
+
status,
|
|
16
16
|
headers: {
|
|
17
17
|
["Content-Type"]: contentType
|
|
18
18
|
},
|
|
@@ -65,6 +65,11 @@ class StaticRouter extends router_1.Router {
|
|
|
65
65
|
type: "string",
|
|
66
66
|
required: false
|
|
67
67
|
},
|
|
68
|
+
index404Status: {
|
|
69
|
+
type: "number",
|
|
70
|
+
required: false,
|
|
71
|
+
defaultValue: 404
|
|
72
|
+
},
|
|
68
73
|
contentTypes: {
|
|
69
74
|
type: "object",
|
|
70
75
|
required: false,
|
|
@@ -198,7 +203,7 @@ class StaticRouter extends router_1.Router {
|
|
|
198
203
|
if ((0, fs_1.existsSync)(realPath)) {
|
|
199
204
|
const ext = (0, path_1.extname)(realPath);
|
|
200
205
|
const contentType = contentTypes[ext] ? contentTypes[ext] : defaultContentType;
|
|
201
|
-
await outputFile(realPath, contentType, ctx, allowGetJSON);
|
|
206
|
+
await outputFile(realPath, contentType, ctx, allowGetJSON, this.staticOptions.index404Status);
|
|
202
207
|
}
|
|
203
208
|
}
|
|
204
209
|
return !ctx.res.headersSent ? super.run(ctx, pathTokens, prePathTokens) : false;
|
package/dist/static.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static.js","sourceRoot":"","sources":["../src/static.ts"],"names":[],"mappings":";;;AAAA,2BAAmE;AACnE,+BAAsC;AAEtC,0CAAoC;AAEpC,qCAA+C;AAE/C,MAAM,UAAU,GAAG,KAAK,EAAE,IAAY,EAAE,WAAmB,EAAE,GAAY,EAAE,YAAqB,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"static.js","sourceRoot":"","sources":["../src/static.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@miqro/core",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.14",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -15,19 +15,19 @@
|
|
|
15
15
|
"author": "claukers",
|
|
16
16
|
"license": "ISC",
|
|
17
17
|
"devDependencies": {
|
|
18
|
-
"@miqro/test": "
|
|
18
|
+
"@miqro/test": "0.1.0",
|
|
19
|
+
"@types/node": "17.0.23",
|
|
20
|
+
"typescript": "4.6.3",
|
|
19
21
|
"@types/cookie": "0.4.1",
|
|
20
|
-
"@types/
|
|
21
|
-
"@types/uuid": "8.3.4",
|
|
22
|
-
"typescript": "^4.5.4"
|
|
22
|
+
"@types/uuid": "8.3.4"
|
|
23
23
|
},
|
|
24
24
|
"engines": {
|
|
25
25
|
"node": ">=16.0.0",
|
|
26
26
|
"npm": ">=6.0.0"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@miqro/request": "^0.0.
|
|
30
|
-
"@miqro/parser": "^0.
|
|
29
|
+
"@miqro/request": "^0.0.7",
|
|
30
|
+
"@miqro/parser": "^0.1.1",
|
|
31
31
|
"cookie": "0.4.1",
|
|
32
32
|
"uuid": "8.3.2"
|
|
33
33
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import {Dict} from "@miqro/parser";
|
|
2
1
|
import {Context} from "../context";
|
|
3
2
|
|
|
4
3
|
export interface SessionHandlerOptions {
|
|
@@ -17,7 +16,11 @@ export interface SessionHandlerOptions {
|
|
|
17
16
|
}
|
|
18
17
|
}
|
|
19
18
|
|
|
20
|
-
|
|
19
|
+
type Dict<T = any> = {
|
|
20
|
+
[key: string]: T
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export interface NoTokenSession extends Dict {
|
|
21
24
|
account: string;
|
|
22
25
|
username: string;
|
|
23
26
|
groups: string[];
|
package/src/static.ts
CHANGED
|
@@ -5,14 +5,14 @@ import {parse} from "@miqro/parser";
|
|
|
5
5
|
import {PathPartToken} from "./common/tokenize-match";
|
|
6
6
|
import {Router, RouterOptions} from "./router";
|
|
7
7
|
|
|
8
|
-
const outputFile = async (path: string, contentType: string, ctx: Context, allowGetJSON: boolean) => {
|
|
8
|
+
const outputFile = async (path: string, contentType: string, ctx: Context, allowGetJSON: boolean, status = 200) => {
|
|
9
9
|
const buffer = readFileSync(path);
|
|
10
10
|
return allowGetJSON && ctx.query.format && ctx.query.format === "json" ?
|
|
11
11
|
ctx.json({
|
|
12
12
|
buffer
|
|
13
13
|
}) :
|
|
14
14
|
ctx.end({
|
|
15
|
-
status
|
|
15
|
+
status,
|
|
16
16
|
headers: {
|
|
17
17
|
["Content-Type"]: contentType
|
|
18
18
|
},
|
|
@@ -34,6 +34,7 @@ export interface StaticRouterOptions extends RouterOptions {
|
|
|
34
34
|
allowGetJSON?: boolean;
|
|
35
35
|
index?: string;
|
|
36
36
|
index404?: string;
|
|
37
|
+
index404Status?: number;
|
|
37
38
|
contentTypes?: any;
|
|
38
39
|
defaultContentType?: string;
|
|
39
40
|
}
|
|
@@ -51,6 +52,7 @@ class StaticRouter extends Router {
|
|
|
51
52
|
allowGetJSON: boolean;
|
|
52
53
|
index: string;
|
|
53
54
|
index404: string;
|
|
55
|
+
index404Status: number;
|
|
54
56
|
contentTypes: any;
|
|
55
57
|
defaultContentType: string;
|
|
56
58
|
};
|
|
@@ -90,6 +92,11 @@ class StaticRouter extends Router {
|
|
|
90
92
|
type: "string",
|
|
91
93
|
required: false
|
|
92
94
|
},
|
|
95
|
+
index404Status: {
|
|
96
|
+
type: "number",
|
|
97
|
+
required: false,
|
|
98
|
+
defaultValue: 404
|
|
99
|
+
},
|
|
93
100
|
contentTypes: {
|
|
94
101
|
type: "object",
|
|
95
102
|
required: false,
|
|
@@ -218,12 +225,12 @@ class StaticRouter extends Router {
|
|
|
218
225
|
}
|
|
219
226
|
}
|
|
220
227
|
}
|
|
221
|
-
if(this.staticOptions.index404) {
|
|
228
|
+
if (this.staticOptions.index404) {
|
|
222
229
|
const realPath = resolve(this.staticOptions.directory, this.staticOptions.index404);
|
|
223
230
|
if (existsSync(realPath)) {
|
|
224
231
|
const ext = extname(realPath);
|
|
225
232
|
const contentType = contentTypes[ext] ? contentTypes[ext] : defaultContentType;
|
|
226
|
-
await outputFile(realPath, contentType, ctx, allowGetJSON);
|
|
233
|
+
await outputFile(realPath, contentType, ctx, allowGetJSON, this.staticOptions.index404Status);
|
|
227
234
|
}
|
|
228
235
|
}
|
|
229
236
|
return !ctx.res.headersSent ? super.run(ctx, pathTokens, prePathTokens) : false;
|