@builder6/server 0.2.3 → 0.2.6
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/app.config.js +9 -4
- package/dist/app.config.js.map +1 -1
- package/dist/app.controller.js.map +1 -1
- package/dist/app.express.js.map +1 -1
- package/dist/app.module.js +2 -0
- package/dist/app.module.js.map +1 -1
- package/dist/auth/auth.service.js +7 -4
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/auth/index.js.map +1 -1
- package/dist/b6.config.js +1 -1
- package/dist/b6.config.js.map +1 -1
- package/dist/b6.server.js +84 -60
- package/dist/b6.server.js.map +1 -1
- package/dist/files/files.service.js +2 -1
- package/dist/files/files.service.js.map +1 -1
- package/dist/files/index.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/microsoft365/microsoft365.controller.js.map +1 -1
- package/dist/microsoft365/microsoft365.module.js +1 -1
- package/dist/microsoft365/microsoft365.service.js +1 -1
- package/dist/microsoft365/microsoft365.service.js.map +1 -1
- package/dist/moleculer/moleculer.config.js +14 -15
- package/dist/moleculer/moleculer.config.js.map +1 -1
- package/dist/moleculer/moleculer.module.js +1 -1
- package/dist/moleculer/moleculer.service.js +8 -6
- package/dist/moleculer/moleculer.service.js.map +1 -1
- package/dist/mongodb/mongodb.service.d.ts +1 -1
- package/dist/mongodb/mongodb.service.js +2 -2
- package/dist/mongodb/mongodb.service.js.map +1 -1
- package/dist/oidc/oidc.controller.js +1 -1
- package/dist/oidc/oidc.controller.js.map +1 -1
- package/dist/oidc/oidc.module.js +1 -1
- package/dist/oidc/oidc.service.js.map +1 -1
- package/dist/plugin/plugin.module.d.ts +14 -0
- package/dist/plugin/plugin.module.js +67 -0
- package/dist/plugin/plugin.module.js.map +1 -0
- package/dist/plugin/plugin.service.d.ts +3 -0
- package/dist/plugin/plugin.service.js +21 -0
- package/dist/plugin/plugin.service.js.map +1 -0
- package/dist/rooms/globals/augmentation.d.ts +16 -16
- package/dist/rooms/lib/Json.js +3 -3
- package/dist/rooms/lib/utils.d.ts +1 -1
- package/dist/rooms/lib/utils.js +7 -7
- package/dist/rooms/protocol/AuthToken.d.ts +2 -2
- package/dist/rooms/protocol/AuthToken.js +3 -3
- package/dist/rooms/protocol/Authentication.d.ts +4 -4
- package/dist/rooms/protocol/BaseActivitiesData.d.ts +1 -1
- package/dist/rooms/protocol/BaseRoomInfo.d.ts +1 -1
- package/dist/rooms/protocol/BaseUserMeta.d.ts +1 -1
- package/dist/rooms/protocol/ClientMsg.d.ts +2 -2
- package/dist/rooms/protocol/Comments.d.ts +19 -19
- package/dist/rooms/protocol/InboxNotifications.d.ts +6 -6
- package/dist/rooms/protocol/Op.d.ts +6 -6
- package/dist/rooms/protocol/Op.js +2 -2
- package/dist/rooms/protocol/SerializedCrdt.d.ts +1 -1
- package/dist/rooms/protocol/ServerMsg.d.ts +6 -6
- package/dist/rooms/protocol/VersionHistory.d.ts +2 -2
- package/dist/rooms/rooms.controller.js +2 -2
- package/dist/rooms/rooms.controller.js.map +1 -1
- package/dist/rooms/rooms.gateway.js +1 -1
- package/dist/rooms/rooms.gateway.js.map +1 -1
- package/dist/rooms/rooms.service.js +7 -5
- package/dist/rooms/rooms.service.js.map +1 -1
- package/dist/steedos/mongodb.controller.d.ts +2 -0
- package/dist/steedos/mongodb.controller.js +134 -14
- package/dist/steedos/mongodb.controller.js.map +1 -1
- package/dist/steedos/steedos.module.js +1 -3
- package/dist/steedos/steedos.module.js.map +1 -1
- package/dist/tables/meta.service.js +21 -3
- package/dist/tables/meta.service.js.map +1 -1
- package/dist/tables/records.service.d.ts +3 -1
- package/dist/tables/records.service.js +5 -3
- package/dist/tables/records.service.js.map +1 -1
- package/dist/tables/tables.controller.js +11 -4
- package/dist/tables/tables.controller.js.map +1 -1
- package/dist/tables/tables.module.js +1 -3
- package/dist/tables/tables.module.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,24 +1,24 @@
|
|
|
1
|
-
|
|
1
|
+
'use strict';
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const app_config_1 = require("../app.config");
|
|
4
4
|
const defaultConfig = {
|
|
5
|
-
namespace:
|
|
5
|
+
namespace: 'steedos',
|
|
6
6
|
nodeID: null,
|
|
7
7
|
metadata: {},
|
|
8
8
|
logger: {
|
|
9
|
-
type:
|
|
9
|
+
type: 'Console',
|
|
10
10
|
options: {
|
|
11
|
-
level:
|
|
11
|
+
level: 'info',
|
|
12
12
|
colors: true,
|
|
13
13
|
moduleColors: false,
|
|
14
|
-
formatter:
|
|
14
|
+
formatter: '[MO] {timestamp} {level} [{mod}] {msg}',
|
|
15
15
|
objectPrinter: null,
|
|
16
|
-
autoPadding: false
|
|
17
|
-
}
|
|
16
|
+
autoPadding: false,
|
|
17
|
+
},
|
|
18
18
|
},
|
|
19
19
|
transporter: process.env.TRANSPORTER,
|
|
20
20
|
cacher: process.env.CACHER,
|
|
21
|
-
serializer:
|
|
21
|
+
serializer: 'JSON',
|
|
22
22
|
requestTimeout: 0,
|
|
23
23
|
retryPolicy: {
|
|
24
24
|
enabled: false,
|
|
@@ -32,8 +32,8 @@ const defaultConfig = {
|
|
|
32
32
|
},
|
|
33
33
|
disableBalancer: false,
|
|
34
34
|
registry: {
|
|
35
|
-
strategy:
|
|
36
|
-
preferLocal: true
|
|
35
|
+
strategy: 'RoundRobin',
|
|
36
|
+
preferLocal: true,
|
|
37
37
|
},
|
|
38
38
|
circuitBreaker: {
|
|
39
39
|
enabled: false,
|
|
@@ -41,12 +41,12 @@ const defaultConfig = {
|
|
|
41
41
|
minRequestCount: 20,
|
|
42
42
|
windowTime: 60,
|
|
43
43
|
halfOpenTime: 10000,
|
|
44
|
-
check: (err) => err && err.code >= 500
|
|
44
|
+
check: (err) => err && err.code >= 500,
|
|
45
45
|
},
|
|
46
46
|
bulkhead: {
|
|
47
47
|
enabled: false,
|
|
48
48
|
concurrency: 10,
|
|
49
|
-
maxQueueSize: 100
|
|
49
|
+
maxQueueSize: 100,
|
|
50
50
|
},
|
|
51
51
|
validator: true,
|
|
52
52
|
errorHandler: null,
|
|
@@ -59,12 +59,11 @@ const defaultConfig = {
|
|
|
59
59
|
middlewares: [],
|
|
60
60
|
replCommands: null,
|
|
61
61
|
skipProcessEventRegistration: true,
|
|
62
|
-
created(broker) {
|
|
63
|
-
},
|
|
62
|
+
created(broker) { },
|
|
64
63
|
started(broker) {
|
|
65
64
|
},
|
|
66
65
|
stopped(broker) {
|
|
67
|
-
}
|
|
66
|
+
},
|
|
68
67
|
};
|
|
69
68
|
exports.default = () => {
|
|
70
69
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moleculer.config.js","sourceRoot":"","sources":["../../src/moleculer/moleculer.config.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAGb,8CAAsC;AAStC,MAAM,aAAa,GAAG;
|
|
1
|
+
{"version":3,"file":"moleculer.config.js","sourceRoot":"","sources":["../../src/moleculer/moleculer.config.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAGb,8CAAsC;AAStC,MAAM,aAAa,GAAG;IACpB,SAAS,EAAE,SAAS;IACpB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,EAAE;IAEZ,MAAM,EAAE;QACN,IAAI,EAAE,SAAS;QACf,OAAO,EAAE;YAEP,KAAK,EAAE,MAAM;YAEb,MAAM,EAAE,IAAI;YAEZ,YAAY,EAAE,KAAK;YAEnB,SAAS,EAAE,wCAAwC;YAEnD,aAAa,EAAE,IAAI;YAEnB,WAAW,EAAE,KAAK;SACnB;KACF;IAED,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;IAEpC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM;IAE1B,UAAU,EAAE,MAAM;IAElB,cAAc,EAAE,CAAC;IAEjB,WAAW,EAAE;QACX,OAAO,EAAE,KAAK;KACf;IAED,YAAY,EAAE,GAAG;IAEjB,iBAAiB,EAAE,EAAE;IACrB,gBAAgB,EAAE,EAAE;IAEpB,oBAAoB,EAAE,KAAK;IAE3B,QAAQ,EAAE;QACR,OAAO,EAAE,KAAK;KACf;IAED,eAAe,EAAE,KAAK;IAEtB,QAAQ,EAAE;QACR,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,IAAI;KAClB;IAED,cAAc,EAAE;QACd,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,GAAG;QACd,eAAe,EAAE,EAAE;QACnB,UAAU,EAAE,EAAE;QACd,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG;KAC5C;IAED,QAAQ,EAAE;QACR,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,GAAG;KAClB;IAED,SAAS,EAAE,IAAI;IAEf,YAAY,EAAE,IAAI;IAElB,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;KACf;IAED,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;KACf;IAED,WAAW,EAAE,EAAE;IAEf,YAAY,EAAE,IAAI;IAElB,4BAA4B,EAAE,IAAI;IAElC,OAAO,CAAC,MAAW,IAAG,CAAC;IAEvB,OAAO,CAAC,MAAW;IAEnB,CAAC;IAED,OAAO,CAAC,MAAW;IAEnB,CAAC;CACF,CAAC;AAEF,kBAAe,GAAG,EAAE;IAClB,OAAO;QACL,GAAG,aAAa;QAChB,GAAG,IAAA,oBAAS,GAAE;KACf,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -14,7 +14,7 @@ let MoleculerModule = class MoleculerModule {
|
|
|
14
14
|
exports.MoleculerModule = MoleculerModule;
|
|
15
15
|
exports.MoleculerModule = MoleculerModule = __decorate([
|
|
16
16
|
(0, common_1.Module)({
|
|
17
|
-
providers: [moleculer_service_1.MoleculerService]
|
|
17
|
+
providers: [moleculer_service_1.MoleculerService],
|
|
18
18
|
})
|
|
19
19
|
], MoleculerModule);
|
|
20
20
|
//# sourceMappingURL=moleculer.module.js.map
|
|
@@ -21,9 +21,9 @@ let MoleculerService = MoleculerService_1 = class MoleculerService {
|
|
|
21
21
|
constructor(configService) {
|
|
22
22
|
this.configService = configService;
|
|
23
23
|
this.logger = new common_1.Logger(MoleculerService_1.name);
|
|
24
|
-
const transporter = this.configService.get(
|
|
24
|
+
const transporter = this.configService.get('transporter');
|
|
25
25
|
if (!transporter) {
|
|
26
|
-
console.error(
|
|
26
|
+
console.error('B6_TRANSPORTER env is required.');
|
|
27
27
|
return;
|
|
28
28
|
}
|
|
29
29
|
this.broker = new moleculer_1.ServiceBroker({
|
|
@@ -33,7 +33,7 @@ let MoleculerService = MoleculerService_1 = class MoleculerService {
|
|
|
33
33
|
this.broker.start();
|
|
34
34
|
}
|
|
35
35
|
loadServices() {
|
|
36
|
-
const plugins = this.configService.get(
|
|
36
|
+
const plugins = this.configService.get('plugin.services');
|
|
37
37
|
if (plugins) {
|
|
38
38
|
for (const plugin of plugins.split(',')) {
|
|
39
39
|
this.loadService(plugin);
|
|
@@ -47,19 +47,21 @@ let MoleculerService = MoleculerService_1 = class MoleculerService {
|
|
|
47
47
|
this.logger.warn(`插件格式无效: ${plugin}`);
|
|
48
48
|
return;
|
|
49
49
|
}
|
|
50
|
-
const [, packageName
|
|
50
|
+
const [, packageName] = match;
|
|
51
51
|
this.logger.log(`加载插件: 名称:${packageName}`);
|
|
52
52
|
if (!this.isPackageInstalled(packageName)) {
|
|
53
53
|
this.logger.error(`插件 ${packageName} 未安装,请先安装`);
|
|
54
54
|
return;
|
|
55
55
|
}
|
|
56
|
-
const packageServicePath = path.resolve(this.getPackagePath(packageName),
|
|
56
|
+
const packageServicePath = path.resolve(this.getPackagePath(packageName), './dist/package.service.js');
|
|
57
57
|
if (!fs.existsSync(packageServicePath)) {
|
|
58
58
|
this.logger.error(`插件 ${packageName} 缺少文件: ${packageServicePath}`);
|
|
59
59
|
return;
|
|
60
60
|
}
|
|
61
61
|
const serviceModule = require(packageServicePath);
|
|
62
|
-
const serviceSchema = serviceModule.default
|
|
62
|
+
const serviceSchema = serviceModule.default
|
|
63
|
+
? serviceModule.default
|
|
64
|
+
: serviceModule;
|
|
63
65
|
if (serviceSchema) {
|
|
64
66
|
this.broker.createService(serviceSchema);
|
|
65
67
|
this.logger.log(`插件服务已创建: ${packageName}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moleculer.service.js","sourceRoot":"","sources":["../../src/moleculer/moleculer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,2CAA+C;AAC/C,yCAA0C;AAC1C,yBAAyB;AACzB,6BAA6B;AAE7B,yDAAiD;AAG1C,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAI3B,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAF/B,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAgB,CAAC,IAAI,CAAC,CAAC;QAG1D,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC1D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;YACjD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,yBAAa,CAAC;YAC9B,GAAG,0BAAe;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED,YAAY;QAEV,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC1D,IAAI,OAAO,EAAE,CAAC;YACZ,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBAKxC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IAED,WAAW,CAAC,MAAM;QAChB,IAAI,CAAC;YAEH,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YACpD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,MAAM,EAAE,CAAC,CAAC;gBACtC,OAAO;YACT,CAAC;YAED,MAAM,CAAC,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"moleculer.service.js","sourceRoot":"","sources":["../../src/moleculer/moleculer.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export declare class MongodbService {
|
|
|
11
11
|
findOne(collectionName: string, query: object, options?: object): Promise<any>;
|
|
12
12
|
objectqlFind(collectionName: string, queryOptions: any, processingOptions?: any): Promise<any>;
|
|
13
13
|
objectqlFindOne(collectionName: string, options: any): Promise<any>;
|
|
14
|
-
findOneAndUpdate(collectionName: string,
|
|
14
|
+
findOneAndUpdate(collectionName: string, query: object, data: any): Promise<any>;
|
|
15
15
|
deleteOne(collectionName: string, query: object): Promise<any>;
|
|
16
16
|
deleteMany(collectionName: string, query: object): Promise<any>;
|
|
17
17
|
}
|
|
@@ -89,9 +89,9 @@ let MongodbService = MongodbService_1 = class MongodbService {
|
|
|
89
89
|
return result.data[0];
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
|
-
async findOneAndUpdate(collectionName,
|
|
92
|
+
async findOneAndUpdate(collectionName, query, data) {
|
|
93
93
|
const collection = this.db.collection(collectionName);
|
|
94
|
-
const result = await collection.findOneAndUpdate(
|
|
94
|
+
const result = await collection.findOneAndUpdate(query, { $set: data }, { returnDocument: 'after' });
|
|
95
95
|
return result.value;
|
|
96
96
|
}
|
|
97
97
|
async deleteOne(collectionName, query) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongodb.service.js","sourceRoot":"","sources":["../../src/mongodb/mongodb.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mongodb.service.js","sourceRoot":"","sources":["../../src/mongodb/mongodb.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,uCAAqC;AAErC,2CAAoD;AACpD,qCAA0C;AAC1C,+BAAoC;AACpC,4DAA4D;AAC5D,2CAA+C;AAGxC,IAAM,cAAc,sBAApB,MAAM,cAAc;IAKzB,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAJ/B,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;QAKxD,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,GAAG,IAAI,qBAAW,CAAC,QAAQ,EAAE,EAGvC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM;aACR,OAAO,EAAE;aACT,IAAI,CAAC,GAAG,EAAE;YACT,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,cAAsB,EAAE,IAAS;QAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,EAAE,GAAG,EAAE,IAAA,SAAM,GAAE,EAAE,GAAG,IAAI,EAAE,CAAC;QACzC,MAAM,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,cAAsB,EAAE,KAAa,EAAE,UAAkB,EAAE;QACpE,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,OAAO,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,cAAsB,EAAE,KAAa,EAAE,UAAkB,EAAE;QACvE,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAY,EAAE,EAAE,OAAO,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,cAAsB,EACtB,YAAiB,EACjB,oBAAyB,EAAE,UAAU,EAAE,KAAK,EAAE;QAE9C,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,GAAG,YAAY,CAAC;QAC1E,MAAM,WAAW,GAAG;YAClB,IAAI,EAAE,GAAG;YACT,IAAI;YACJ,iBAAiB,EAAE,IAAI;YACvB,GAAG,WAAW;SACR,CAAC;QACT,IAAI,OAAO,EAAE,CAAC;YACZ,WAAW,CAAC,MAAM,GAAG,OAAO,CAAC;QAC/B,CAAC;QACD,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnC,WAAW,CAAC,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;gBAC9C,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC1C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,MAAM,EAAE,CAAC;YACnD,CAAC,CAAC,CAAC;QACL,CAAC;QACD,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/B,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC;YAC9B,CAAC;iBAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACtC,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAEtD,OAAO,eAAe,CAAC,UAAU,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,cAAsB,EAAE,OAAY;QACxD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QACpC,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE;YACtD,OAAO;YACP,MAAM;SACP,CAAC,CAAQ,CAAC;QACX,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,cAAsB,EAAE,KAAa,EAAE,IAAS;QACrE,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,gBAAgB,CAC9C,KAAK,EACL,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,EAAE,cAAc,EAAE,OAAO,EAAE,CAC5B,CAAC;QACF,OAAO,MAAM,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,cAAsB,EAAE,KAAa;QACnD,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACjD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,cAAsB,EAAE,KAAa;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACjD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA7GY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAMwB,sBAAa;GALrC,cAAc,CA6G1B"}
|
|
@@ -57,7 +57,7 @@ let OidcController = class OidcController {
|
|
|
57
57
|
const tokenSet = await client.callback(provider.redirect_uri, params, {
|
|
58
58
|
state: storedState,
|
|
59
59
|
code_verifier: storedVerifier,
|
|
60
|
-
nonce: storedNonce
|
|
60
|
+
nonce: storedNonce,
|
|
61
61
|
});
|
|
62
62
|
delete req.session[`oidc_${providerId}_state`];
|
|
63
63
|
delete req.session[`oidc_${providerId}_code_verifier`];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.controller.js","sourceRoot":"","sources":["../../src/oidc/oidc.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"oidc.controller.js","sourceRoot":"","sources":["../../src/oidc/oidc.controller.ts"],"names":[],"mappings":"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"}
|
package/dist/oidc/oidc.module.js
CHANGED
|
@@ -16,7 +16,7 @@ exports.OidcModule = OidcModule;
|
|
|
16
16
|
exports.OidcModule = OidcModule = __decorate([
|
|
17
17
|
(0, common_1.Module)({
|
|
18
18
|
providers: [oidc_service_1.OidcService],
|
|
19
|
-
controllers: [oidc_controller_1.OidcController]
|
|
19
|
+
controllers: [oidc_controller_1.OidcController],
|
|
20
20
|
})
|
|
21
21
|
], OidcModule);
|
|
22
22
|
//# sourceMappingURL=oidc.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../src/oidc/oidc.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,iDAA2C;
|
|
1
|
+
{"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../src/oidc/oidc.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,iDAA2C;AAGpC,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,KAAK,CAAC,iBAAiB,CAAC,UAAkB;QACxC,MAAM,qBAAqB,GAAG,MAAM,CAAC;QACrC,MAAM,aAAa,GAAG,0BAAU,CAAC,YAAY,EAAE,CAAC;QAChD,MAAM,cAAc,GAAG,0BAAU,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,0BAAU,CAAC,MAAM,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,0BAAU,CAAC,MAAM,EAAE,CAAC;QAGlC,OAAO;YACL,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YAClC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;YACzC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACxC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAChD,YAAY,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,gBAAgB,UAAU,WAAW;YAC1E,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,sBAAsB;YACjE,KAAK;YACL,KAAK;YACL,qBAAqB;YACrB,aAAa;YACb,cAAc;SACf,CAAC;IACJ,CAAC;CACF,CAAA;AAvBY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;GACA,WAAW,CAuBvB"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { DynamicModule, Logger } from '@nestjs/common';
|
|
2
|
+
export declare class PluginModule {
|
|
3
|
+
static readonly logger: Logger;
|
|
4
|
+
static plugins: Plugin[];
|
|
5
|
+
static forRoot(modules: any): DynamicModule;
|
|
6
|
+
static loadPlugin(packageName: string): any;
|
|
7
|
+
static isPackageInstalled(packageName: string): boolean;
|
|
8
|
+
static getPackagePath(packageName: string): string;
|
|
9
|
+
}
|
|
10
|
+
interface Plugin {
|
|
11
|
+
name: string;
|
|
12
|
+
module: DynamicModule;
|
|
13
|
+
}
|
|
14
|
+
export {};
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var PluginModule_1;
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.PluginModule = void 0;
|
|
11
|
+
const common_1 = require("@nestjs/common");
|
|
12
|
+
const fs = require("fs");
|
|
13
|
+
const path = require("path");
|
|
14
|
+
const plugin_service_1 = require("./plugin.service");
|
|
15
|
+
let PluginModule = PluginModule_1 = class PluginModule {
|
|
16
|
+
static forRoot(modules) {
|
|
17
|
+
if (modules) {
|
|
18
|
+
for (const module of modules.split(',')) {
|
|
19
|
+
const pluginModule = this.loadPlugin(module);
|
|
20
|
+
this.plugins.push({
|
|
21
|
+
name: module,
|
|
22
|
+
module: pluginModule,
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
console.log('this.plugins', this.plugins);
|
|
27
|
+
return {
|
|
28
|
+
module: PluginModule_1,
|
|
29
|
+
imports: [...this.plugins.map((plugin) => plugin.module)],
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
static loadPlugin(packageName) {
|
|
33
|
+
const packageModulePath = path.resolve(this.getPackagePath(packageName), './dist/plugin.module.js');
|
|
34
|
+
if (!fs.existsSync(packageModulePath)) {
|
|
35
|
+
this.logger.error(`插件 ${packageName} 缺少文件: ${packageModulePath}`);
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
const PluginModule = require(packageModulePath);
|
|
39
|
+
return PluginModule.default;
|
|
40
|
+
}
|
|
41
|
+
static isPackageInstalled(packageName) {
|
|
42
|
+
try {
|
|
43
|
+
require.resolve(`${packageName}/package.json`);
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
static getPackagePath(packageName) {
|
|
51
|
+
try {
|
|
52
|
+
return path.dirname(require.resolve(`${packageName}/package.json`));
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
throw new Error(`无法解析插件路径: ${packageName}`);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
exports.PluginModule = PluginModule;
|
|
60
|
+
PluginModule.logger = new common_1.Logger(PluginModule_1.name);
|
|
61
|
+
PluginModule.plugins = [];
|
|
62
|
+
exports.PluginModule = PluginModule = PluginModule_1 = __decorate([
|
|
63
|
+
(0, common_1.Module)({
|
|
64
|
+
providers: [plugin_service_1.PluginService],
|
|
65
|
+
})
|
|
66
|
+
], PluginModule);
|
|
67
|
+
//# sourceMappingURL=plugin.module.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plugin.module.js","sourceRoot":"","sources":["../../src/plugin/plugin.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAA+D;AAC/D,yBAAyB;AACzB,6BAA6B;AAC7B,qDAAiD;AAK1C,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAIvB,MAAM,CAAC,OAAO,CAAC,OAAO;QACpB,IAAI,OAAO,EAAE,CAAC;YACZ,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxC,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC7C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;oBAChB,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,YAAY;iBACrB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,OAAO;YACL,MAAM,EAAE,cAAY;YACpB,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACzC,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,WAAmB;QAEnC,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CACpC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAChC,yBAAyB,CAC1B,CAAC;QAEF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,WAAW,UAAU,iBAAiB,EAAE,CAAC,CAAC;YAClE,OAAO;QACT,CAAC;QAID,MAAM,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAEhD,OAAO,YAAY,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,WAAmB;QAC3C,IAAI,CAAC;YACH,OAAO,CAAC,OAAO,CAAC,GAAG,WAAW,eAAe,CAAC,CAAC;YAC/C,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,WAAmB;QACvC,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,WAAW,eAAe,CAAC,CAAC,CAAC;QACtE,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,aAAa,WAAW,EAAE,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;;AAvDU,oCAAY;AACP,mBAAM,GAAG,IAAI,eAAM,CAAC,cAAY,CAAC,IAAI,CAAC,AAAhC,CAAiC;AACzC,oBAAO,GAAa,EAAE,AAAf,CAAgB;uBAF1B,YAAY;IAHxB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,8BAAa,CAAC;KAC3B,CAAC;GACW,YAAY,CAwDxB"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var PluginService_1;
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.PluginService = void 0;
|
|
11
|
+
const common_1 = require("@nestjs/common");
|
|
12
|
+
let PluginService = PluginService_1 = class PluginService {
|
|
13
|
+
constructor() {
|
|
14
|
+
this.logger = new common_1.Logger(PluginService_1.name);
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
exports.PluginService = PluginService;
|
|
18
|
+
exports.PluginService = PluginService = PluginService_1 = __decorate([
|
|
19
|
+
(0, common_1.Injectable)()
|
|
20
|
+
], PluginService);
|
|
21
|
+
//# sourceMappingURL=plugin.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plugin.service.js","sourceRoot":"","sources":["../../src/plugin/plugin.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAoD;AAG7C,IAAM,aAAa,qBAAnB,MAAM,aAAa;IAAnB;QACY,WAAM,GAAG,IAAI,eAAM,CAAC,eAAa,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC;CAAA,CAAA;AAFY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;GACA,aAAa,CAEzB"}
|
|
@@ -1,25 +1,25 @@
|
|
|
1
|
-
import type { Json, JsonObject } from
|
|
2
|
-
import type { BaseActivitiesData } from
|
|
3
|
-
import type { BaseRoomInfo } from
|
|
4
|
-
import type { BaseUserMeta } from
|
|
5
|
-
import type { BaseMetadata } from
|
|
1
|
+
import type { Json, JsonObject } from '../lib/Json';
|
|
2
|
+
import type { BaseActivitiesData } from '../protocol/BaseActivitiesData';
|
|
3
|
+
import type { BaseRoomInfo } from '../protocol/BaseRoomInfo';
|
|
4
|
+
import type { BaseUserMeta } from '../protocol/BaseUserMeta';
|
|
5
|
+
import type { BaseMetadata } from '../protocol/Comments';
|
|
6
6
|
declare global {
|
|
7
7
|
export interface Liveblocks {
|
|
8
8
|
[key: string]: unknown;
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
-
type ExtendableTypes =
|
|
12
|
-
type MakeErrorString<K extends ExtendableTypes, Reason extends string =
|
|
13
|
-
type GetOverride<K extends ExtendableTypes, B, Reason extends string =
|
|
11
|
+
type ExtendableTypes = 'Presence' | 'Storage' | 'UserMeta' | 'RoomEvent' | 'ThreadMetadata' | 'RoomInfo' | 'ActivitiesData';
|
|
12
|
+
type MakeErrorString<K extends ExtendableTypes, Reason extends string = 'does not match its requirements'> = `The type you provided for '${K}' ${Reason}. To learn how to fix this, see https://liveblocks.io/docs/errors/${K}`;
|
|
13
|
+
type GetOverride<K extends ExtendableTypes, B, Reason extends string = 'does not match its requirements'> = GetOverrideOrErrorValue<K, B, MakeErrorString<K, Reason>>;
|
|
14
14
|
type GetOverrideOrErrorValue<K extends ExtendableTypes, B, ErrorType> = unknown extends Liveblocks[K] ? B : Liveblocks[K] extends B ? Liveblocks[K] : ErrorType;
|
|
15
|
-
export type DP = GetOverride<
|
|
16
|
-
export type DS = GetOverride<
|
|
17
|
-
export type DU = GetOverrideOrErrorValue<
|
|
18
|
-
export type DE = GetOverride<
|
|
19
|
-
export type DM = GetOverride<
|
|
20
|
-
export type DRI = GetOverride<
|
|
21
|
-
export type DAD = GetOverrideOrErrorValue<
|
|
22
|
-
[K in keyof Liveblocks[
|
|
15
|
+
export type DP = GetOverride<'Presence', JsonObject, 'is not a valid JSON object'>;
|
|
16
|
+
export type DS = GetOverride<'Storage', JsonObject, 'is not a valid LSON value'>;
|
|
17
|
+
export type DU = GetOverrideOrErrorValue<'UserMeta', BaseUserMeta, Record<'id' | 'info', MakeErrorString<'UserMeta'>>>;
|
|
18
|
+
export type DE = GetOverride<'RoomEvent', Json, 'is not a valid JSON value'>;
|
|
19
|
+
export type DM = GetOverride<'ThreadMetadata', BaseMetadata>;
|
|
20
|
+
export type DRI = GetOverride<'RoomInfo', BaseRoomInfo>;
|
|
21
|
+
export type DAD = GetOverrideOrErrorValue<'ActivitiesData', BaseActivitiesData, {
|
|
22
|
+
[K in keyof Liveblocks['ActivitiesData']]: "At least one of the custom notification kinds you provided for 'ActivitiesData' does not match its requirements. To learn how to fix this, see https://liveblocks.io/docs/errors/ActivitiesData";
|
|
23
23
|
}>;
|
|
24
24
|
export type KDAD = keyof DAD extends `$${string}` ? keyof DAD : "Custom notification kinds must start with '$' but your custom 'ActivitiesData' type contains at least one kind which doesn't. To learn how to fix this, see https://liveblocks.io/docs/errors/ActivitiesData";
|
|
25
25
|
export {};
|
package/dist/rooms/lib/Json.js
CHANGED
|
@@ -5,9 +5,9 @@ exports.isJsonArray = isJsonArray;
|
|
|
5
5
|
exports.isJsonObject = isJsonObject;
|
|
6
6
|
function isJsonScalar(data) {
|
|
7
7
|
return (data === null ||
|
|
8
|
-
typeof data ===
|
|
9
|
-
typeof data ===
|
|
10
|
-
typeof data ===
|
|
8
|
+
typeof data === 'string' ||
|
|
9
|
+
typeof data === 'number' ||
|
|
10
|
+
typeof data === 'boolean');
|
|
11
11
|
}
|
|
12
12
|
function isJsonArray(data) {
|
|
13
13
|
return Array.isArray(data);
|
package/dist/rooms/lib/utils.js
CHANGED
|
@@ -20,8 +20,8 @@ function raise(msg) {
|
|
|
20
20
|
}
|
|
21
21
|
function isPlainObject(blob) {
|
|
22
22
|
return (blob !== null &&
|
|
23
|
-
typeof blob ===
|
|
24
|
-
Object.prototype.toString.call(blob) ===
|
|
23
|
+
typeof blob === 'object' &&
|
|
24
|
+
Object.prototype.toString.call(blob) === '[object Object]');
|
|
25
25
|
}
|
|
26
26
|
function entries(obj) {
|
|
27
27
|
return Object.entries(obj);
|
|
@@ -36,7 +36,7 @@ function mapValues(obj, mapFn) {
|
|
|
36
36
|
const result = {};
|
|
37
37
|
for (const pair of Object.entries(obj)) {
|
|
38
38
|
const key = pair[0];
|
|
39
|
-
if (key ===
|
|
39
|
+
if (key === '__proto__') {
|
|
40
40
|
continue;
|
|
41
41
|
}
|
|
42
42
|
const value = pair[1];
|
|
@@ -57,13 +57,13 @@ function deepClone(value) {
|
|
|
57
57
|
}
|
|
58
58
|
function b64decode(b64value) {
|
|
59
59
|
try {
|
|
60
|
-
const formattedValue = b64value.replace(/-/g,
|
|
60
|
+
const formattedValue = b64value.replace(/-/g, '+').replace(/_/g, '/');
|
|
61
61
|
const decodedValue = decodeURIComponent(atob(formattedValue)
|
|
62
|
-
.split(
|
|
62
|
+
.split('')
|
|
63
63
|
.map(function (c) {
|
|
64
|
-
return
|
|
64
|
+
return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
|
|
65
65
|
})
|
|
66
|
-
.join(
|
|
66
|
+
.join(''));
|
|
67
67
|
return decodedValue;
|
|
68
68
|
}
|
|
69
69
|
catch (err) {
|
|
@@ -33,13 +33,13 @@ function isValidAuthTokenPayload(data) {
|
|
|
33
33
|
data.k === TokenKind.SECRET_LEGACY));
|
|
34
34
|
}
|
|
35
35
|
function parseAuthToken(rawTokenString) {
|
|
36
|
-
const tokenParts = rawTokenString.split(
|
|
36
|
+
const tokenParts = rawTokenString.split('.');
|
|
37
37
|
if (tokenParts.length !== 3) {
|
|
38
|
-
throw new Error(
|
|
38
|
+
throw new Error('Authentication error: invalid JWT token');
|
|
39
39
|
}
|
|
40
40
|
const payload = (0, utils_1.tryParseJson)((0, utils_1.b64decode)(tokenParts[1]));
|
|
41
41
|
if (!(payload && isValidAuthTokenPayload(payload))) {
|
|
42
|
-
throw new Error(
|
|
42
|
+
throw new Error('Authentication error: expected a valid token but did not get one. Hint: if you are using a callback, ensure the room is passed when creating the token. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClientCallback');
|
|
43
43
|
}
|
|
44
44
|
return {
|
|
45
45
|
raw: rawTokenString,
|
|
@@ -3,7 +3,7 @@ export type CustomAuthenticationResult = {
|
|
|
3
3
|
error?: never;
|
|
4
4
|
} | {
|
|
5
5
|
token?: never;
|
|
6
|
-
error:
|
|
6
|
+
error: 'forbidden';
|
|
7
7
|
reason: string;
|
|
8
8
|
} | {
|
|
9
9
|
token?: never;
|
|
@@ -11,12 +11,12 @@ export type CustomAuthenticationResult = {
|
|
|
11
11
|
reason: string;
|
|
12
12
|
};
|
|
13
13
|
export type Authentication = {
|
|
14
|
-
type:
|
|
14
|
+
type: 'public';
|
|
15
15
|
publicApiKey: string;
|
|
16
16
|
} | {
|
|
17
|
-
type:
|
|
17
|
+
type: 'private';
|
|
18
18
|
url: string;
|
|
19
19
|
} | {
|
|
20
|
-
type:
|
|
20
|
+
type: 'custom';
|
|
21
21
|
callback: (room?: string) => Promise<CustomAuthenticationResult>;
|
|
22
22
|
};
|