@builder6/server 0.6.5 → 0.7.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.
Files changed (111) hide show
  1. package/dist/app.express.js +0 -1
  2. package/dist/app.express.js.map +1 -1
  3. package/dist/app.module.js +12 -10
  4. package/dist/app.module.js.map +1 -1
  5. package/dist/b6.server.js +11 -134
  6. package/dist/b6.server.js.map +1 -1
  7. package/dist/oidc/oidc.service.js +1 -1
  8. package/dist/oidc/oidc.service.js.map +1 -1
  9. package/package.json +10 -8
  10. package/dist/app.config.d.ts +0 -2
  11. package/dist/app.config.js +0 -55
  12. package/dist/app.config.js.map +0 -1
  13. package/dist/b6.config.d.ts +0 -0
  14. package/dist/b6.config.js +0 -4
  15. package/dist/b6.config.js.map +0 -1
  16. package/dist/files/files.controller.d.ts +0 -11
  17. package/dist/files/files.controller.js +0 -148
  18. package/dist/files/files.controller.js.map +0 -1
  19. package/dist/files/files.module.d.ts +0 -2
  20. package/dist/files/files.module.js +0 -26
  21. package/dist/files/files.module.js.map +0 -1
  22. package/dist/files/files.moleculer.d.ts +0 -10
  23. package/dist/files/files.moleculer.js +0 -53
  24. package/dist/files/files.moleculer.js.map +0 -1
  25. package/dist/files/files.service.d.ts +0 -30
  26. package/dist/files/files.service.js +0 -207
  27. package/dist/files/files.service.js.map +0 -1
  28. package/dist/files/index.d.ts +0 -3
  29. package/dist/files/index.js +0 -20
  30. package/dist/files/index.js.map +0 -1
  31. package/dist/index.d.ts +0 -3
  32. package/dist/index.js +0 -26
  33. package/dist/index.js.map +0 -1
  34. package/dist/moleculer.config.d.ts +0 -2
  35. package/dist/moleculer.config.js +0 -74
  36. package/dist/moleculer.config.js.map +0 -1
  37. package/dist/plugin/moleculer.service.d.ts +0 -11
  38. package/dist/plugin/moleculer.service.js +0 -96
  39. package/dist/plugin/moleculer.service.js.map +0 -1
  40. package/dist/plugin/plugin.module.d.ts +0 -14
  41. package/dist/plugin/plugin.module.js +0 -72
  42. package/dist/plugin/plugin.module.js.map +0 -1
  43. package/dist/plugin/plugin.service.d.ts +0 -3
  44. package/dist/plugin/plugin.service.js +0 -21
  45. package/dist/plugin/plugin.service.js.map +0 -1
  46. package/dist/rooms/globals/augmentation.d.ts +0 -25
  47. package/dist/rooms/globals/augmentation.js +0 -3
  48. package/dist/rooms/globals/augmentation.js.map +0 -1
  49. package/dist/rooms/lib/DateToString.d.ts +0 -3
  50. package/dist/rooms/lib/DateToString.js +0 -3
  51. package/dist/rooms/lib/DateToString.js.map +0 -1
  52. package/dist/rooms/lib/Json.d.ts +0 -9
  53. package/dist/rooms/lib/Json.js +0 -18
  54. package/dist/rooms/lib/Json.js.map +0 -1
  55. package/dist/rooms/lib/utils.d.ts +0 -33
  56. package/dist/rooms/lib/utils.js +0 -122
  57. package/dist/rooms/lib/utils.js.map +0 -1
  58. package/dist/rooms/protocol/AuthToken.d.ts +0 -50
  59. package/dist/rooms/protocol/AuthToken.js +0 -49
  60. package/dist/rooms/protocol/AuthToken.js.map +0 -1
  61. package/dist/rooms/protocol/Authentication.d.ts +0 -22
  62. package/dist/rooms/protocol/Authentication.js +0 -3
  63. package/dist/rooms/protocol/Authentication.js.map +0 -1
  64. package/dist/rooms/protocol/BaseActivitiesData.d.ts +0 -4
  65. package/dist/rooms/protocol/BaseActivitiesData.js +0 -3
  66. package/dist/rooms/protocol/BaseActivitiesData.js.map +0 -1
  67. package/dist/rooms/protocol/BaseRoomInfo.d.ts +0 -6
  68. package/dist/rooms/protocol/BaseRoomInfo.js +0 -3
  69. package/dist/rooms/protocol/BaseRoomInfo.js.map +0 -1
  70. package/dist/rooms/protocol/BaseUserMeta.d.ts +0 -10
  71. package/dist/rooms/protocol/BaseUserMeta.js +0 -3
  72. package/dist/rooms/protocol/BaseUserMeta.js.map +0 -1
  73. package/dist/rooms/protocol/ClientMsg.d.ts +0 -41
  74. package/dist/rooms/protocol/ClientMsg.js +0 -13
  75. package/dist/rooms/protocol/ClientMsg.js.map +0 -1
  76. package/dist/rooms/protocol/Comments.d.ts +0 -146
  77. package/dist/rooms/protocol/Comments.js +0 -3
  78. package/dist/rooms/protocol/Comments.js.map +0 -1
  79. package/dist/rooms/protocol/InboxNotifications.d.ts +0 -49
  80. package/dist/rooms/protocol/InboxNotifications.js +0 -3
  81. package/dist/rooms/protocol/InboxNotifications.js.map +0 -1
  82. package/dist/rooms/protocol/Op.d.ts +0 -82
  83. package/dist/rooms/protocol/Op.js +0 -28
  84. package/dist/rooms/protocol/Op.js.map +0 -1
  85. package/dist/rooms/protocol/SerializedCrdt.d.ts +0 -40
  86. package/dist/rooms/protocol/SerializedCrdt.js +0 -19
  87. package/dist/rooms/protocol/SerializedCrdt.js.map +0 -1
  88. package/dist/rooms/protocol/ServerMsg.d.ts +0 -128
  89. package/dist/rooms/protocol/ServerMsg.js +0 -25
  90. package/dist/rooms/protocol/ServerMsg.js.map +0 -1
  91. package/dist/rooms/protocol/VersionHistory.d.ts +0 -9
  92. package/dist/rooms/protocol/VersionHistory.js +0 -3
  93. package/dist/rooms/protocol/VersionHistory.js.map +0 -1
  94. package/dist/rooms/rooms.controller.d.ts +0 -64
  95. package/dist/rooms/rooms.controller.js +0 -401
  96. package/dist/rooms/rooms.controller.js.map +0 -1
  97. package/dist/rooms/rooms.gateway.d.ts +0 -30
  98. package/dist/rooms/rooms.gateway.js +0 -188
  99. package/dist/rooms/rooms.gateway.js.map +0 -1
  100. package/dist/rooms/rooms.guard.d.ts +0 -9
  101. package/dist/rooms/rooms.guard.js +0 -48
  102. package/dist/rooms/rooms.guard.js.map +0 -1
  103. package/dist/rooms/rooms.module.d.ts +0 -2
  104. package/dist/rooms/rooms.module.js +0 -36
  105. package/dist/rooms/rooms.module.js.map +0 -1
  106. package/dist/rooms/rooms.service.d.ts +0 -51
  107. package/dist/rooms/rooms.service.js +0 -225
  108. package/dist/rooms/rooms.service.js.map +0 -1
  109. package/views/ag-grid/README.md +0 -15
  110. package/views/ag-grid/ag-grid.hbs +0 -1099
  111. package/views/devextreme/datagrid.hbs +0 -240
@@ -34,7 +34,6 @@ async function ExpressApplication() {
34
34
  const documentFactory = () => swagger_1.SwaggerModule.createDocument(app, swaggerConfig);
35
35
  swagger_1.SwaggerModule.setup('api/v6', app, documentFactory);
36
36
  app.useStaticAssets((0, path_1.join)(__dirname, '..', 'public'));
37
- app.setBaseViewsDir((0, path_1.join)(__dirname, '..', 'views'));
38
37
  app.setViewEngine('hbs');
39
38
  app.use(cookieParser());
40
39
  app.use((0, express_1.json)({ limit: '50mb' }));
@@ -1 +1 @@
1
- {"version":3,"file":"app.express.js","sourceRoot":"","sources":["../src/app.express.ts"],"names":[],"mappings":";;AAYA,qCAyCC;AArDD,uCAA2C;AAC3C,6CAAyC;AACzC,+BAA4B;AAE5B,6CAAiE;AACjE,8CAA8C;AAC9C,2CAA2C;AAC3C,qCAA2C;AAC3C,qDAAgD;AAEhD,2CAA2C;AAE5B,KAAK,UAAU,kBAAkB;IAC9C,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAyB,sBAAS,CAAC,CAAC;IACxE,GAAG,CAAC,mBAAmB,CAAC,IAAI,uBAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,GAAG,CAAC,UAAU,CAAC;QACb,MAAM,EAAE,UAAU,MAAM,EAAE,QAAQ;YAChC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,EAAE,oCAAoC;QAC7C,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IACH,GAAG,CAAC,GAAG,CACL,OAAO,CAAC;QACN,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE,KAAK;QACb,iBAAiB,EAAE,KAAK;KACzB,CAAC,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,IAAI,yBAAe,EAAE;SACxC,QAAQ,CAAC,cAAc,CAAC;SACxB,cAAc,CAAC,8BAA8B,CAAC;SAC9C,UAAU,CAAC,KAAK,CAAC;SACjB,aAAa,EAAE;SACf,KAAK,EAAE,CAAC;IAEX,MAAM,eAAe,GAAG,GAAG,EAAE,CAC3B,uBAAa,CAAC,cAAc,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IACnD,uBAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;IAEpD,GAAG,CAAC,eAAe,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IACrD,GAAG,CAAC,eAAe,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACpD,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEzB,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC;IACxB,GAAG,CAAC,GAAG,CAAC,IAAA,cAAI,EAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACjC,GAAG,CAAC,GAAG,CACL,IAAA,oBAAU,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CACxE,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;IAEvB,OAAO,GAAG,CAAC;AACb,CAAC"}
1
+ {"version":3,"file":"app.express.js","sourceRoot":"","sources":["../src/app.express.ts"],"names":[],"mappings":";;AAYA,qCAwCC;AApDD,uCAA2C;AAC3C,6CAAyC;AACzC,+BAA4B;AAE5B,6CAAiE;AACjE,8CAA8C;AAC9C,2CAA2C;AAC3C,qCAA2C;AAC3C,qDAAgD;AAEhD,2CAA2C;AAE5B,KAAK,UAAU,kBAAkB;IAC9C,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAyB,sBAAS,CAAC,CAAC;IACxE,GAAG,CAAC,mBAAmB,CAAC,IAAI,uBAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,GAAG,CAAC,UAAU,CAAC;QACb,MAAM,EAAE,UAAU,MAAM,EAAE,QAAQ;YAChC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,EAAE,oCAAoC;QAC7C,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IACH,GAAG,CAAC,GAAG,CACL,OAAO,CAAC;QACN,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE,KAAK;QACb,iBAAiB,EAAE,KAAK;KACzB,CAAC,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,IAAI,yBAAe,EAAE;SACxC,QAAQ,CAAC,cAAc,CAAC;SACxB,cAAc,CAAC,8BAA8B,CAAC;SAC9C,UAAU,CAAC,KAAK,CAAC;SACjB,aAAa,EAAE;SACf,KAAK,EAAE,CAAC;IAEX,MAAM,eAAe,GAAG,GAAG,EAAE,CAC3B,uBAAa,CAAC,cAAc,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IACnD,uBAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;IAEpD,GAAG,CAAC,eAAe,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IACrD,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEzB,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC;IACxB,GAAG,CAAC,GAAG,CAAC,IAAA,cAAI,EAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACjC,GAAG,CAAC,GAAG,CACL,IAAA,oBAAU,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CACxE,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;IAEvB,OAAO,GAAG,CAAC;AACb,CAAC"}
@@ -13,15 +13,16 @@ const core_1 = require("@builder6/core");
13
13
  const tables_1 = require("@builder6/tables");
14
14
  const core_2 = require("@builder6/core");
15
15
  const steedos_module_1 = require("./steedos/steedos.module");
16
- const rooms_module_1 = require("./rooms/rooms.module");
17
- const files_module_1 = require("./files/files.module");
16
+ const rooms_1 = require("@builder6/rooms");
17
+ const core_3 = require("@builder6/core");
18
18
  const moleculer_1 = require("@builder6/moleculer");
19
19
  const microsoft365_module_1 = require("./microsoft365/microsoft365.module");
20
20
  const oidc_module_1 = require("./oidc/oidc.module");
21
21
  const app_controller_1 = require("./app.controller");
22
- const plugin_module_1 = require("./plugin/plugin.module");
22
+ const core_4 = require("@builder6/core");
23
23
  const email_1 = require("@builder6/email");
24
- const app_config_1 = require("./app.config");
24
+ const pages_1 = require("@builder6/pages");
25
+ const core_5 = require("@builder6/core");
25
26
  let AppModule = class AppModule {
26
27
  };
27
28
  exports.AppModule = AppModule;
@@ -29,23 +30,24 @@ exports.AppModule = AppModule = __decorate([
29
30
  (0, common_1.Module)({
30
31
  imports: [
31
32
  config_1.ConfigModule.forRoot({
32
- envFilePath: ['.env.local', '.env'],
33
- load: [app_config_1.default],
33
+ load: [core_5.getConfigs, core_5.getDbConfigs],
34
34
  isGlobal: true,
35
35
  }),
36
36
  moleculer_1.MoleculerModule.forRoot({
37
37
  namespace: "steedos",
38
38
  transporter: process.env.B6_TRANSPORTER,
39
+ ...(0, core_5.getMoleculerConfigs)(),
39
40
  }),
40
41
  core_2.AuthModule,
41
42
  core_1.MongodbModule,
42
43
  steedos_module_1.SteedosModule,
44
+ core_3.FilesModule,
45
+ email_1.EmailModule,
43
46
  tables_1.TablesModule,
44
- rooms_module_1.RoomsModule,
45
- files_module_1.FilesModule,
47
+ pages_1.PagesModule,
48
+ rooms_1.RoomsModule,
46
49
  microsoft365_module_1.Microsoft365Module,
47
- email_1.EmailModule,
48
- plugin_module_1.PluginModule.forRoot(),
50
+ core_4.PluginModule.forRootAsync(),
49
51
  ...(process.env.B6_OIDC_ENABLED ? [oidc_module_1.OidcModule] : []),
50
52
  ],
51
53
  controllers: [app_controller_1.AppController],
@@ -1 +1 @@
1
- {"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAE9C,yCAA+C;AAC/C,6CAAgD;AAChD,yCAA4C;AAC5C,6DAAyD;AACzD,uDAAmD;AACnD,uDAAmD;AACnD,mDAAsD;AACtD,4EAAwE;AACxE,oDAAgD;AAChD,qDAAiD;AACjD,0DAAsD;AACtD,2CAA8C;AAC9C,6CAAqC;AA6B9B,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,8BAAS;oBAAT,SAAS;IA3BrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC;gBACnB,WAAW,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC;gBACnC,IAAI,EAAE,CAAC,oBAAS,CAAC;gBACjB,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,2BAAe,CAAC,OAAO,CAAC;gBAEpB,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;aAE1C,CAAC;YACF,iBAAU;YACV,oBAAa;YACb,8BAAa;YACb,qBAAY;YACZ,0BAAW;YACX,0BAAW;YACX,wCAAkB;YAClB,mBAAW;YACX,4BAAY,CAAC,OAAO,EAAE;YACtB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,wBAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACrD;QACD,WAAW,EAAE,CAAC,8BAAa,CAAC;QAC5B,SAAS,EAAE,EAAE;KACd,CAAC;GACW,SAAS,CAAG"}
1
+ {"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAE9C,yCAA+C;AAC/C,6CAAgD;AAChD,yCAA4C;AAC5C,6DAAyD;AACzD,2CAA8C;AAC9C,yCAA6C;AAC7C,mDAAsD;AACtD,4EAAwE;AACxE,oDAAgD;AAChD,qDAAiD;AACjD,yCAA8C;AAC9C,2CAA8C;AAC9C,2CAA8C;AAC9C,yCAA+E;AA8BxE,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,8BAAS;oBAAT,SAAS;IA5BrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC;gBACnB,IAAI,EAAE,CAAC,iBAAU,EAAE,mBAAY,CAAC;gBAChC,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,2BAAe,CAAC,OAAO,CAAC;gBAEpB,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;gBAEvC,GAAG,IAAA,0BAAmB,GAAE;aAC3B,CAAC;YACF,iBAAU;YACV,oBAAa;YACb,8BAAa;YACb,kBAAW;YACX,mBAAW;YACX,qBAAY;YACZ,mBAAW;YACX,mBAAW;YACX,wCAAkB;YAClB,mBAAY,CAAC,YAAY,EAAE;YAC3B,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,wBAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACrD;QACD,WAAW,EAAE,CAAC,8BAAa,CAAC;QAC5B,SAAS,EAAE,EAAE;KACd,CAAC;GACW,SAAS,CAAG"}
package/dist/b6.server.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
4
  const common_1 = require("@nestjs/common");
5
5
  const project = require("../package.json");
6
- const app_config_1 = require("./app.config");
6
+ const core_1 = require("@builder6/core");
7
7
  const childProcess = require('child_process');
8
8
  var semver = require('semver');
9
9
  if (!semver.satisfies(process.version, '>=14.0.0')) {
@@ -15,7 +15,6 @@ var util = require('util');
15
15
  var nopt = require('nopt');
16
16
  var path = require('path');
17
17
  const os = require('os');
18
- const fs = require("fs-extra");
19
18
  var knownOpts = {
20
19
  help: Boolean,
21
20
  port: Number,
@@ -68,10 +67,8 @@ class B6Server {
68
67
  this.memoryAuditLogged = 0;
69
68
  }
70
69
  async loadConfig() {
71
- const configJs = require('./b6.config');
72
70
  this.config = {
73
- ...configJs,
74
- ...(0, app_config_1.getEnvConfigs)(),
71
+ ...(0, core_1.getEnvConfigs)(),
75
72
  };
76
73
  if (this.parsedArgs.help) {
77
74
  console.log('B6 Server v' + project.version);
@@ -91,18 +88,15 @@ class B6Server {
91
88
  console.log('Documentation can be found at https://builder6.com');
92
89
  process.exit();
93
90
  }
94
- if (this.parsedArgs.version) {
95
- console.log('Builder6 Server v' + project.version);
96
- console.log('Node.js ' + process.version);
97
- console.log(os.type() +
98
- ' ' +
99
- os.release() +
100
- ' ' +
101
- os.arch() +
102
- ' ' +
103
- os.endianness());
104
- process.exit();
105
- }
91
+ console.log('Builder6 Server v' + project.version);
92
+ console.log('Node.js ' + process.version);
93
+ console.log(os.type() +
94
+ ' ' +
95
+ os.release() +
96
+ ' ' +
97
+ os.arch() +
98
+ ' ' +
99
+ os.endianness());
106
100
  if (this.parsedArgs.verbose) {
107
101
  this.config.verbose = true;
108
102
  }
@@ -130,129 +124,12 @@ class B6Server {
130
124
  }
131
125
  this.logger.log('Loaded config', this.config);
132
126
  }
133
- getPluginPackages() {
134
- if (this.config.plugin?.packages) {
135
- const pluginList = this.config.plugin.packages.split(',');
136
- const pluginMap = {};
137
- pluginList.forEach((plugin) => {
138
- const match = plugin.match(/^(@[^@]+\/[^@]+|[^@]+)(?:@(.+))?$/);
139
- if (match) {
140
- const name = match[1];
141
- const version = match[2] || 'latest';
142
- pluginMap[name] = version;
143
- }
144
- });
145
- return pluginMap;
146
- }
147
- return {};
148
- }
149
- async updateNpmrc() {
150
- const npmrcPath = path.join(process.env.B6_PLUGIN_DIR, '.npmrc');
151
- if (this.config.plugin?.npmrc) {
152
- try {
153
- fs.writeFileSync(npmrcPath, this.config.plugin?.npmrc);
154
- }
155
- catch (error) {
156
- this.state = States.STOPPED;
157
- this.logger.log('Unable to write .npmrc file');
158
- throw error;
159
- }
160
- }
161
- else {
162
- if (fs.existsSync(npmrcPath)) {
163
- try {
164
- fs.unlinkSync(npmrcPath);
165
- }
166
- catch (error) {
167
- this.state = States.STOPPED;
168
- this.logger.log('Unable to remove old .npmrc file');
169
- throw error;
170
- }
171
- }
172
- }
173
- }
174
- async updatePackage() {
175
- const pkgFilePath = path.join(process.env.B6_PLUGIN_DIR, 'package.json');
176
- if (!fs.existsSync(pkgFilePath)) {
177
- fs.writeFileSync(pkgFilePath, JSON.stringify({ name: 'b6-server', version: '0.0.1', dependencies: {} }, null, 2));
178
- }
179
- const packageContent = fs.readFileSync(pkgFilePath, { encoding: 'utf8' });
180
- const pkg = JSON.parse(packageContent);
181
- const existingDependencies = pkg.dependencies || {};
182
- const wantedDependencies = this.getPluginPackages();
183
- const existingModules = Object.keys(existingDependencies);
184
- const wantedModules = Object.keys(wantedDependencies);
185
- let changed = false;
186
- if (existingModules.length !== wantedModules.length) {
187
- changed = true;
188
- }
189
- else {
190
- existingModules.sort();
191
- wantedModules.sort();
192
- for (let i = 0; i < existingModules.length; i++) {
193
- if (existingModules[i] !== wantedModules[i]) {
194
- changed = true;
195
- break;
196
- }
197
- if (existingDependencies[existingModules[i]] !==
198
- wantedDependencies[wantedModules[i]]) {
199
- changed = true;
200
- break;
201
- }
202
- }
203
- }
204
- if (changed) {
205
- this.state = States.INSTALLING;
206
- this.logger.log('Updating project dependencies', wantedDependencies);
207
- pkg.dependencies = wantedDependencies;
208
- fs.writeFileSync(pkgFilePath, JSON.stringify(pkg, null, 2));
209
- const npmEnv = Object.assign({}, process.env, this.config.env);
210
- const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
211
- return new Promise((resolve, reject) => {
212
- const child = childProcess.spawn(npmCommand, [
213
- 'install',
214
- '--omit=dev',
215
- '--no-audit',
216
- '--no-update-notifier',
217
- '--no-fund',
218
- ], {
219
- windowsHide: true,
220
- cwd: path.join(process.env.B6_PLUGIN_DIR),
221
- env: npmEnv,
222
- shell: true,
223
- });
224
- child.stdout.on('data', (data) => {
225
- this.logger.log('[npm] ' + data);
226
- });
227
- child.stderr.on('data', (data) => {
228
- this.logger.log('[npm] ' + data);
229
- });
230
- child.on('error', (err) => {
231
- this.logger.log('[npm] ' + err.toString());
232
- });
233
- child.on('close', (code) => {
234
- if (code === 0) {
235
- resolve();
236
- }
237
- else {
238
- reject(new Error(`Failed to install project dependencies ret code: ${code} signal ${child.signalCode}`));
239
- }
240
- });
241
- }).catch((err) => {
242
- fs.writeFileSync(pkgFilePath, packageContent);
243
- throw err;
244
- });
245
- }
246
- }
247
127
  async startApp() {
248
128
  const ExpressApplication = require('./app.express');
249
129
  this.app = await ExpressApplication.default();
250
130
  await this.app.listen(this.config.port);
251
131
  }
252
132
  async bootstrap() {
253
- await this.loadConfig();
254
- await this.updateNpmrc();
255
- await this.updatePackage();
256
133
  await this.startApp();
257
134
  }
258
135
  }
@@ -1 +1 @@
1
- {"version":3,"file":"b6.server.js","sourceRoot":"","sources":["../src/b6.server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"b6.server.js","sourceRoot":"","sources":["../src/b6.server.ts"],"names":[],"mappings":"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"}
@@ -21,7 +21,7 @@ let OidcService = class OidcService {
21
21
  configUrl: process.env.B6_OIDC_CONFIG_URL,
22
22
  client_id: process.env.B6_OIDC_CLIENT_ID,
23
23
  client_secret: process.env.B6_OIDC_CLIENT_SECRET,
24
- redirect_uri: `${process.env.ROOT_URL}/api/v6/oidc/${providerId}/callback`,
24
+ redirect_uri: `${process.env.ROOT_URL}/api/v6/oidc/${providerId}/login/callback`,
25
25
  scope: process.env.B6_OIDC_CLIENT_SCOPE || 'openid email profile',
26
26
  state,
27
27
  nonce,
@@ -1 +1 @@
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"}
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,iBAAiB;YAChF,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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@builder6/server",
3
- "version": "0.6.5",
3
+ "version": "0.7.1",
4
4
  "description": "",
5
5
  "author": "",
6
6
  "license": "AGPL-3.0-only",
@@ -29,12 +29,14 @@
29
29
  "test:e2e": "jest --config ./test/jest-e2e.json"
30
30
  },
31
31
  "dependencies": {
32
- "@builder6/core": "^0.6.5",
33
- "@builder6/email": "^0.6.5",
34
- "@builder6/moleculer": "^0.6.5",
35
- "@builder6/query-mongodb": "^0.6.5",
36
- "@builder6/tables": "^0.6.5",
37
- "@nestjs/common": "^9.0.0",
32
+ "@builder6/core": "^0.7.1",
33
+ "@builder6/email": "^0.7.1",
34
+ "@builder6/moleculer": "^0.7.0",
35
+ "@builder6/pages": "^0.7.1",
36
+ "@builder6/query-mongodb": "^0.7.0",
37
+ "@builder6/rooms": "^0.7.1",
38
+ "@builder6/tables": "^0.7.1",
39
+ "@nestjs/common": "^10.0.0",
38
40
  "@nestjs/config": "^3.3.0",
39
41
  "@nestjs/core": "^9.0.0",
40
42
  "@nestjs/jwt": "^9.0.0",
@@ -115,5 +117,5 @@
115
117
  "publishConfig": {
116
118
  "access": "public"
117
119
  },
118
- "gitHead": "b4f7ff4cfa74b8d192b54e6488a136141d6ee661"
120
+ "gitHead": "b0e1429ea0940fa47cadb4abc340bb7498b15784"
119
121
  }
@@ -1,2 +0,0 @@
1
- export declare function getEnvConfigs(): any;
2
- export default function getConfig(): any;
@@ -1,55 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getEnvConfigs = getEnvConfigs;
4
- exports.default = getConfig;
5
- const dotenvFlow = require("dotenv-flow");
6
- const path = require("path");
7
- dotenvFlow.config({
8
- path: process.cwd(),
9
- silent: true,
10
- });
11
- process.env.B6_ROOT_URL = process.env.B6_ROOT_URL || process.env.ROOT_URL;
12
- process.env.B6_MONGO_URL = process.env.B6_MONGO_URL || process.env.MONGO_URL;
13
- process.env.B6_TRANSPORTER =
14
- process.env.B6_TRANSPORTER ||
15
- process.env.STEEDOS_TRANSPORTER ||
16
- process.env.TRANSPORTER;
17
- process.env.B6_HOME = process.env.B6_HOME || process.cwd();
18
- process.env.B6_PLUGIN_DIR =
19
- process.env.B6_PLUGIN_DIR || path.join(process.cwd(), 'plugins');
20
- function parseEnvToJSON(env, prefixes) {
21
- const result = {};
22
- Object.keys(env).forEach((key) => {
23
- const hasValidPrefix = prefixes.some((prefix) => key.startsWith(prefix));
24
- if (!hasValidPrefix) {
25
- return;
26
- }
27
- const strippedKey = key
28
- .replace(new RegExp(`^(${prefixes.join('|')})`), '')
29
- .toLowerCase();
30
- const keys = strippedKey.split('_');
31
- let current = result;
32
- keys.forEach((k, index) => {
33
- if (index === keys.length - 1) {
34
- current[k] = isNaN(env[key]) ? env[key] : Number(env[key]);
35
- }
36
- else {
37
- current[k] = current[k] || {};
38
- current = current[k];
39
- }
40
- });
41
- });
42
- return result;
43
- }
44
- function getEnvConfigs() {
45
- const env = parseEnvToJSON(process.env, ['STEEDOS_', 'B6_']);
46
- return env;
47
- }
48
- function getConfig() {
49
- const env = getEnvConfigs();
50
- return {
51
- plugin: {},
52
- ...env,
53
- };
54
- }
55
- //# sourceMappingURL=app.config.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"app.config.js","sourceRoot":"","sources":["../src/app.config.ts"],"names":[],"mappings":";;AAyDA,sCAGC;AAED,4BAMC;AApED,0CAA0C;AAC1C,6BAA6B;AAE7B,UAAU,CAAC,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE;IACnB,MAAM,EAAE,IAAI;CACb,CAAC,CAAC;AAGH,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AAC1E,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;AAC7E,OAAO,CAAC,GAAG,CAAC,cAAc;IACxB,OAAO,CAAC,GAAG,CAAC,cAAc;QAC1B,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAC/B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;AAE1B,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;AAC3D,OAAO,CAAC,GAAG,CAAC,aAAa;IACvB,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;AAQnE,SAAS,cAAc,CAAC,GAAG,EAAE,QAAQ;IACnC,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAE/B,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAGD,MAAM,WAAW,GAAG,GAAG;aACpB,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;aACnD,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,OAAO,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YACxB,IAAI,KAAK,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAE9B,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7D,CAAC;iBAAM,CAAC;gBAEN,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC9B,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,aAAa;IAC3B,MAAM,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,KAAK,CAAC,CAAQ,CAAC;IACpE,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAwB,SAAS;IAC/B,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAC5B,OAAO;QACL,MAAM,EAAE,EAAE;QACV,GAAG,GAAG;KACP,CAAC;AACJ,CAAC"}
File without changes
package/dist/b6.config.js DELETED
@@ -1,4 +0,0 @@
1
- module.exports = {
2
- plugin: {},
3
- };
4
- //# sourceMappingURL=b6.config.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"b6.config.js","sourceRoot":"","sources":["../src/b6.config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACf,MAAM,EAAE,EAAE;CACX,CAAC"}
@@ -1,11 +0,0 @@
1
- import { FilesService } from './files.service';
2
- import { Response } from 'express';
3
- export declare class FilesController {
4
- private readonly filesService;
5
- constructor(filesService: FilesService);
6
- uploadFile(collectionName: string, file: Express.Multer.File): Promise<object>;
7
- downloadFile(collectionName: string, fileId: string, fileName: string, res: Response): Promise<void>;
8
- presignedUrls(collectionName: string, records: string[]): Promise<{
9
- urls: string[];
10
- }>;
11
- }
@@ -1,148 +0,0 @@
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 __metadata = (this && this.__metadata) || function (k, v) {
9
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
- };
11
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
- Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.FilesController = void 0;
16
- const common_1 = require("@nestjs/common");
17
- const platform_express_1 = require("@nestjs/platform-express");
18
- const files_service_1 = require("./files.service");
19
- const swagger_1 = require("@nestjs/swagger");
20
- let FilesController = class FilesController {
21
- constructor(filesService) {
22
- this.filesService = filesService;
23
- }
24
- async uploadFile(collectionName, file) {
25
- if (!file) {
26
- throw new Error('未找到上传的文件');
27
- }
28
- const fileRecord = await this.filesService.uploadFile(collectionName, file, {});
29
- return fileRecord;
30
- }
31
- async downloadFile(collectionName, fileId, fileName, res) {
32
- try {
33
- if (this.filesService.cfsStore === 'S3') {
34
- const s3SignedUrl = await this.filesService.getPreSignedUrl(collectionName, fileId);
35
- if (s3SignedUrl) {
36
- return res.redirect(s3SignedUrl);
37
- }
38
- }
39
- const fileStream = await this.filesService.downloadFileStream(collectionName, fileId);
40
- fileStream.pipe(res).on('error', () => {
41
- throw new common_1.HttpException('文件下载失败', common_1.HttpStatus.INTERNAL_SERVER_ERROR);
42
- });
43
- }
44
- catch (error) {
45
- throw new common_1.HttpException(error.message, common_1.HttpStatus.INTERNAL_SERVER_ERROR);
46
- }
47
- }
48
- async presignedUrls(collectionName, records) {
49
- const urls = await Promise.all(records.map(async (attachmentId) => {
50
- return this.filesService.getPreSignedUrl(collectionName, attachmentId);
51
- }));
52
- return { urls };
53
- }
54
- };
55
- exports.FilesController = FilesController;
56
- __decorate([
57
- (0, common_1.Post)(':collectionName'),
58
- (0, swagger_1.ApiOperation)({ summary: 'Upload a file' }),
59
- (0, swagger_1.ApiParam)({
60
- name: 'collectionName',
61
- required: true,
62
- type: 'string',
63
- schema: {
64
- type: 'string',
65
- default: 'cfs.files.filerecord',
66
- },
67
- }),
68
- (0, swagger_1.ApiConsumes)('multipart/form-data'),
69
- (0, swagger_1.ApiBody)({
70
- schema: {
71
- type: 'object',
72
- properties: {
73
- file: {
74
- type: 'string',
75
- format: 'binary',
76
- },
77
- },
78
- },
79
- }),
80
- (0, common_1.UseInterceptors)((0, platform_express_1.FileInterceptor)('file')),
81
- __param(0, (0, common_1.Param)('collectionName')),
82
- __param(1, (0, common_1.UploadedFile)()),
83
- __metadata("design:type", Function),
84
- __metadata("design:paramtypes", [String, Object]),
85
- __metadata("design:returntype", Promise)
86
- ], FilesController.prototype, "uploadFile", null);
87
- __decorate([
88
- (0, common_1.Get)(':collectionName/:fileId/:fileName?'),
89
- (0, swagger_1.ApiOperation)({ summary: 'Download a file' }),
90
- (0, swagger_1.ApiParam)({
91
- name: 'collectionName',
92
- required: true,
93
- type: 'string',
94
- schema: {
95
- type: 'string',
96
- default: 'cfs.files.filerecord',
97
- },
98
- }),
99
- (0, swagger_1.ApiParam)({
100
- name: 'fileName',
101
- required: false,
102
- type: 'string',
103
- }),
104
- __param(0, (0, common_1.Param)('collectionName')),
105
- __param(1, (0, common_1.Param)('fileId')),
106
- __param(2, (0, common_1.Param)('fileName')),
107
- __param(3, (0, common_1.Res)()),
108
- __metadata("design:type", Function),
109
- __metadata("design:paramtypes", [String, String, String, Object]),
110
- __metadata("design:returntype", Promise)
111
- ], FilesController.prototype, "downloadFile", null);
112
- __decorate([
113
- (0, common_1.Post)(':collectionName/presigned-urls'),
114
- (0, swagger_1.ApiOperation)({ summary: 'Get presigned urls for files' }),
115
- (0, swagger_1.ApiBody)({
116
- schema: {
117
- type: 'object',
118
- description: 'Array of record id',
119
- properties: {
120
- records: {
121
- type: 'array',
122
- items: {
123
- type: 'string',
124
- },
125
- },
126
- },
127
- },
128
- }),
129
- (0, swagger_1.ApiParam)({
130
- name: 'collectionName',
131
- required: true,
132
- type: 'string',
133
- schema: {
134
- type: 'string',
135
- default: 'cfs.files.filerecord',
136
- },
137
- }),
138
- __param(0, (0, common_1.Param)('collectionName')),
139
- __param(1, (0, common_1.Body)('records')),
140
- __metadata("design:type", Function),
141
- __metadata("design:paramtypes", [String, Array]),
142
- __metadata("design:returntype", Promise)
143
- ], FilesController.prototype, "presignedUrls", null);
144
- exports.FilesController = FilesController = __decorate([
145
- (0, common_1.Controller)('api/v6/files/'),
146
- __metadata("design:paramtypes", [files_service_1.FilesService])
147
- ], FilesController);
148
- //# sourceMappingURL=files.controller.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"files.controller.js","sourceRoot":"","sources":["../../src/files/files.controller.ts"],"names":[],"mappings":"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"}
@@ -1,2 +0,0 @@
1
- export declare class FilesModule {
2
- }
@@ -1,26 +0,0 @@
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
- Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.FilesModule = void 0;
10
- const common_1 = require("@nestjs/common");
11
- const files_controller_1 = require("./files.controller");
12
- const files_service_1 = require("./files.service");
13
- const core_1 = require("@builder6/core");
14
- const files_moleculer_1 = require("./files.moleculer");
15
- let FilesModule = class FilesModule {
16
- };
17
- exports.FilesModule = FilesModule;
18
- exports.FilesModule = FilesModule = __decorate([
19
- (0, common_1.Module)({
20
- imports: [core_1.MongodbModule],
21
- controllers: [files_controller_1.FilesController],
22
- providers: [files_service_1.FilesService, files_moleculer_1.FilesMoleculer],
23
- exports: [files_service_1.FilesService],
24
- })
25
- ], FilesModule);
26
- //# sourceMappingURL=files.module.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"files.module.js","sourceRoot":"","sources":["../../src/files/files.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,yDAAqD;AACrD,mDAA+C;AAC/C,yCAA+C;AAC/C,uDAAmD;AAQ5C,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IANvB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,oBAAa,CAAC;QACxB,WAAW,EAAE,CAAC,kCAAe,CAAC;QAC9B,SAAS,EAAE,CAAC,4BAAY,EAAE,gCAAc,CAAC;QACzC,OAAO,EAAE,CAAC,4BAAY,CAAC;KACxB,CAAC;GACW,WAAW,CAAG"}