@naturalcycles/backend-lib 4.8.0 → 4.8.2

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 (6) hide show
  1. package/dist/deploy/deployGae.js +6 -0
  2. package/dist/index.d.ts +17 -19
  3. package/dist/index.js +17 -29
  4. package/package.json +1 -1
  5. package/src/deploy/deployGae.ts +6 -0
  6. package/src/index.ts +17 -92
package/dist/deploy/deployGae.js CHANGED
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.deployGae = void 0;
4
4
  const dev_lib_1 = require("@naturalcycles/dev-lib");
5
+ const js_lib_1 = require("@naturalcycles/js-lib");
5
6
  const exec_1 = require("@naturalcycles/nodejs-lib/dist/exec");
6
7
  const deployHealthCheck_1 = require("./deployHealthCheck");
7
8
  const deployPrepare_1 = require("./deployPrepare");
@@ -16,6 +17,11 @@ async function deployGae(opt = {}) {
16
17
  const targetDir = './tmp/deploy';
17
18
  const appYamlPath = `${targetDir}/app.yaml`;
18
19
  const { gaeProject, gaeService, gaeVersion, versionUrl, serviceUrl } = deployInfo;
20
+ (0, js_lib_1._objectAssign)(opt, {
21
+ gaeProject,
22
+ gaeService,
23
+ gaeVersion,
24
+ });
19
25
  // gcloud app deploy ./tmp/deploy/app.yaml --project $deployInfo_gaeProject --version $deployInfo_gaeVersion --quiet --no-promote
20
26
  await (0, exec_1.execCommand)(`gcloud app deploy ${appYamlPath} --project ${gaeProject} --version ${gaeVersion} --quiet --no-promote`).catch(async (err) => {
21
27
  if (logOnFailure) {
package/dist/index.d.ts CHANGED
@@ -1,36 +1,34 @@
1
1
  import onFinished = require('on-finished');
2
- import { AdminMiddleware, createAdminMiddleware, loginHtml, RequireAdminCfg } from './admin/adminMiddleware';
3
- import { AdminInfo, AdminServiceCfg, BaseAdminService } from './admin/base.admin.service';
4
- import { FirebaseSharedService } from './admin/firebase.shared.service';
5
- import { createSecureHeaderMiddleware, SecureHeaderMiddlewareCfg } from './admin/secureHeaderMiddleware';
6
- import { BaseEnv } from './env/env.model';
7
- import { EnvSharedService, EnvSharedServiceCfg } from './env/env.shared.service';
2
+ export * from './admin/adminMiddleware';
3
+ export * from './admin/base.admin.service';
4
+ export * from './admin/firebase.shared.service';
5
+ export * from './admin/secureHeaderMiddleware';
6
+ export * from './env/env.model';
7
+ export * from './env/env.shared.service';
8
8
  export * from './gae/appEngine.util';
9
- import { SentrySharedService, SentrySharedServiceCfg } from './sentry/sentry.shared.service';
9
+ export * from './sentry/sentry.shared.service';
10
10
  export * from './server/catchWrapper';
11
11
  export * from './server/createDefaultApp';
12
- import { DefaultAppCfg, BackendRequestHandlerCfg, BackendRequestHandlerWithPath } from './server/createDefaultApp.model';
12
+ export * from './server/createDefaultApp.model';
13
13
  export * from './server/deployInfo.util';
14
14
  export * from './server/getDefaultRouter';
15
- import { bodyParserTimeoutMiddleware, BodyParserTimeoutMiddlewareCfg, clearBodyParserTimeout } from './server/bodyParserTimeoutMiddleware';
15
+ export * from './server/bodyParserTimeoutMiddleware';
16
16
  export * from './server/genericErrorMiddleware';
17
17
  export * from './server/serverStatsMiddleware';
18
- import { methodOverrideMiddleware, MethodOverrideMiddlewareCfg } from './server/methodOverrideMiddleware';
18
+ export * from './server/methodOverrideMiddleware';
19
19
  export * from './server/notFoundMiddleware';
20
20
  export * from './server/okMiddleware';
21
- import { RequestTimeoutMiddlewareCfg } from './server/requestTimeoutMiddleware';
22
21
  export * from './server/requestTimeoutMiddleware';
23
- import { reqValidation, ReqValidationOptions } from './server/reqValidationMiddleware';
24
- import { simpleRequestLoggerMiddleware, SimpleRequestLoggerMiddlewareCfg } from './server/simpleRequestLoggerMiddleware';
25
- import { serverStatusMiddleware, getServerStatusData } from './server/serverStatusMiddleware';
22
+ export * from './server/reqValidationMiddleware';
23
+ export * from './server/simpleRequestLoggerMiddleware';
24
+ export * from './server/serverStatusMiddleware';
26
25
  export * from './server/validateMiddleware';
27
26
  export * from './server/request.log.util';
28
- import { BackendServer, startServer } from './server/startServer';
29
- import { StartServerCfg, StartServerData } from './server/startServer.model';
27
+ export * from './server/startServer';
28
+ export * from './server/startServer.model';
30
29
  export * from './server/asyncLocalStorageMiddleware';
31
- import type { BackendRequest, BackendRequestHandler, BackendResponse, BackendErrorRequestHandler, BackendRouter, BackendApplication } from './server/server.model';
30
+ export * from './server/server.model';
32
31
  export * from './server/appEngineLogMiddleware';
33
32
  export * from './server/safeJsonMiddleware';
34
33
  export * from './server/request.util';
35
- export type { MethodOverrideMiddlewareCfg, SentrySharedServiceCfg, BackendRequestHandlerWithPath, BackendRequestHandlerCfg, DefaultAppCfg, StartServerCfg, StartServerData, EnvSharedServiceCfg, BaseEnv, AdminMiddleware, AdminServiceCfg, AdminInfo, RequireAdminCfg, SecureHeaderMiddlewareCfg, BodyParserTimeoutMiddlewareCfg, RequestTimeoutMiddlewareCfg, SimpleRequestLoggerMiddlewareCfg, ReqValidationOptions, BackendRequest, BackendRequestHandler, BackendResponse, BackendErrorRequestHandler, BackendRouter, BackendApplication, };
36
- export { BackendServer, SentrySharedService, EnvSharedService, reqValidation, methodOverrideMiddleware, startServer, serverStatusMiddleware, getServerStatusData, onFinished, FirebaseSharedService, createAdminMiddleware, BaseAdminService, loginHtml, createSecureHeaderMiddleware, bodyParserTimeoutMiddleware, clearBodyParserTimeout, simpleRequestLoggerMiddleware, };
34
+ export { onFinished };
package/dist/index.js CHANGED
@@ -1,50 +1,38 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.simpleRequestLoggerMiddleware = exports.clearBodyParserTimeout = exports.bodyParserTimeoutMiddleware = exports.createSecureHeaderMiddleware = exports.loginHtml = exports.BaseAdminService = exports.createAdminMiddleware = exports.FirebaseSharedService = exports.onFinished = exports.getServerStatusData = exports.serverStatusMiddleware = exports.startServer = exports.methodOverrideMiddleware = exports.reqValidation = exports.EnvSharedService = exports.SentrySharedService = exports.BackendServer = void 0;
3
+ exports.onFinished = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const onFinished = require("on-finished");
6
6
  exports.onFinished = onFinished;
7
- const adminMiddleware_1 = require("./admin/adminMiddleware");
8
- Object.defineProperty(exports, "createAdminMiddleware", { enumerable: true, get: function () { return adminMiddleware_1.createAdminMiddleware; } });
9
- Object.defineProperty(exports, "loginHtml", { enumerable: true, get: function () { return adminMiddleware_1.loginHtml; } });
10
- const base_admin_service_1 = require("./admin/base.admin.service");
11
- Object.defineProperty(exports, "BaseAdminService", { enumerable: true, get: function () { return base_admin_service_1.BaseAdminService; } });
12
- const firebase_shared_service_1 = require("./admin/firebase.shared.service");
13
- Object.defineProperty(exports, "FirebaseSharedService", { enumerable: true, get: function () { return firebase_shared_service_1.FirebaseSharedService; } });
14
- const secureHeaderMiddleware_1 = require("./admin/secureHeaderMiddleware");
15
- Object.defineProperty(exports, "createSecureHeaderMiddleware", { enumerable: true, get: function () { return secureHeaderMiddleware_1.createSecureHeaderMiddleware; } });
16
- const env_shared_service_1 = require("./env/env.shared.service");
17
- Object.defineProperty(exports, "EnvSharedService", { enumerable: true, get: function () { return env_shared_service_1.EnvSharedService; } });
7
+ tslib_1.__exportStar(require("./admin/adminMiddleware"), exports);
8
+ tslib_1.__exportStar(require("./admin/base.admin.service"), exports);
9
+ tslib_1.__exportStar(require("./admin/firebase.shared.service"), exports);
10
+ tslib_1.__exportStar(require("./admin/secureHeaderMiddleware"), exports);
11
+ tslib_1.__exportStar(require("./env/env.model"), exports);
12
+ tslib_1.__exportStar(require("./env/env.shared.service"), exports);
18
13
  tslib_1.__exportStar(require("./gae/appEngine.util"), exports);
19
- const sentry_shared_service_1 = require("./sentry/sentry.shared.service");
20
- Object.defineProperty(exports, "SentrySharedService", { enumerable: true, get: function () { return sentry_shared_service_1.SentrySharedService; } });
14
+ tslib_1.__exportStar(require("./sentry/sentry.shared.service"), exports);
21
15
  tslib_1.__exportStar(require("./server/catchWrapper"), exports);
22
16
  tslib_1.__exportStar(require("./server/createDefaultApp"), exports);
17
+ tslib_1.__exportStar(require("./server/createDefaultApp.model"), exports);
23
18
  tslib_1.__exportStar(require("./server/deployInfo.util"), exports);
24
19
  tslib_1.__exportStar(require("./server/getDefaultRouter"), exports);
25
- const bodyParserTimeoutMiddleware_1 = require("./server/bodyParserTimeoutMiddleware");
26
- Object.defineProperty(exports, "bodyParserTimeoutMiddleware", { enumerable: true, get: function () { return bodyParserTimeoutMiddleware_1.bodyParserTimeoutMiddleware; } });
27
- Object.defineProperty(exports, "clearBodyParserTimeout", { enumerable: true, get: function () { return bodyParserTimeoutMiddleware_1.clearBodyParserTimeout; } });
20
+ tslib_1.__exportStar(require("./server/bodyParserTimeoutMiddleware"), exports);
28
21
  tslib_1.__exportStar(require("./server/genericErrorMiddleware"), exports);
29
22
  tslib_1.__exportStar(require("./server/serverStatsMiddleware"), exports);
30
- const methodOverrideMiddleware_1 = require("./server/methodOverrideMiddleware");
31
- Object.defineProperty(exports, "methodOverrideMiddleware", { enumerable: true, get: function () { return methodOverrideMiddleware_1.methodOverrideMiddleware; } });
23
+ tslib_1.__exportStar(require("./server/methodOverrideMiddleware"), exports);
32
24
  tslib_1.__exportStar(require("./server/notFoundMiddleware"), exports);
33
25
  tslib_1.__exportStar(require("./server/okMiddleware"), exports);
34
26
  tslib_1.__exportStar(require("./server/requestTimeoutMiddleware"), exports);
35
- const reqValidationMiddleware_1 = require("./server/reqValidationMiddleware");
36
- Object.defineProperty(exports, "reqValidation", { enumerable: true, get: function () { return reqValidationMiddleware_1.reqValidation; } });
37
- const simpleRequestLoggerMiddleware_1 = require("./server/simpleRequestLoggerMiddleware");
38
- Object.defineProperty(exports, "simpleRequestLoggerMiddleware", { enumerable: true, get: function () { return simpleRequestLoggerMiddleware_1.simpleRequestLoggerMiddleware; } });
39
- const serverStatusMiddleware_1 = require("./server/serverStatusMiddleware");
40
- Object.defineProperty(exports, "serverStatusMiddleware", { enumerable: true, get: function () { return serverStatusMiddleware_1.serverStatusMiddleware; } });
41
- Object.defineProperty(exports, "getServerStatusData", { enumerable: true, get: function () { return serverStatusMiddleware_1.getServerStatusData; } });
27
+ tslib_1.__exportStar(require("./server/reqValidationMiddleware"), exports);
28
+ tslib_1.__exportStar(require("./server/simpleRequestLoggerMiddleware"), exports);
29
+ tslib_1.__exportStar(require("./server/serverStatusMiddleware"), exports);
42
30
  tslib_1.__exportStar(require("./server/validateMiddleware"), exports);
43
31
  tslib_1.__exportStar(require("./server/request.log.util"), exports);
44
- const startServer_1 = require("./server/startServer");
45
- Object.defineProperty(exports, "BackendServer", { enumerable: true, get: function () { return startServer_1.BackendServer; } });
46
- Object.defineProperty(exports, "startServer", { enumerable: true, get: function () { return startServer_1.startServer; } });
32
+ tslib_1.__exportStar(require("./server/startServer"), exports);
33
+ tslib_1.__exportStar(require("./server/startServer.model"), exports);
47
34
  tslib_1.__exportStar(require("./server/asyncLocalStorageMiddleware"), exports);
35
+ tslib_1.__exportStar(require("./server/server.model"), exports);
48
36
  tslib_1.__exportStar(require("./server/appEngineLogMiddleware"), exports);
49
37
  tslib_1.__exportStar(require("./server/safeJsonMiddleware"), exports);
50
38
  tslib_1.__exportStar(require("./server/request.util"), exports);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@naturalcycles/backend-lib",
3
- "version": "4.8.0",
3
+ "version": "4.8.2",
4
4
  "scripts": {
5
5
  "prepare": "husky install && patch-package",
6
6
  "serve": "APP_ENV=dev nodemon",
package/src/deploy/deployGae.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import { buildProdCommand } from '@naturalcycles/dev-lib'
2
+ import { _objectAssign } from '@naturalcycles/js-lib'
2
3
  import { execCommand } from '@naturalcycles/nodejs-lib/dist/exec'
3
4
  import { deployHealthCheck, DeployHealthCheckOptions } from './deployHealthCheck'
4
5
  import { deployPrepare, DeployPrepareOptions } from './deployPrepare'
@@ -22,6 +23,11 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
22
23
  const appYamlPath = `${targetDir}/app.yaml`
23
24
 
24
25
  const { gaeProject, gaeService, gaeVersion, versionUrl, serviceUrl } = deployInfo
26
+ _objectAssign(opt, {
27
+ gaeProject,
28
+ gaeService,
29
+ gaeVersion,
30
+ })
25
31
 
26
32
  // gcloud app deploy ./tmp/deploy/app.yaml --project $deployInfo_gaeProject --version $deployInfo_gaeVersion --quiet --no-promote
27
33
  await execCommand(
package/src/index.ts CHANGED
@@ -1,110 +1,35 @@
1
1
  import onFinished = require('on-finished')
2
- import {
3
- AdminMiddleware,
4
- createAdminMiddleware,
5
- loginHtml,
6
- RequireAdminCfg,
7
- } from './admin/adminMiddleware'
8
- import { AdminInfo, AdminServiceCfg, BaseAdminService } from './admin/base.admin.service'
9
- import { FirebaseSharedService } from './admin/firebase.shared.service'
10
- import {
11
- createSecureHeaderMiddleware,
12
- SecureHeaderMiddlewareCfg,
13
- } from './admin/secureHeaderMiddleware'
14
- import { BaseEnv } from './env/env.model'
15
- import { EnvSharedService, EnvSharedServiceCfg } from './env/env.shared.service'
2
+ export * from './admin/adminMiddleware'
3
+ export * from './admin/base.admin.service'
4
+ export * from './admin/firebase.shared.service'
5
+ export * from './admin/secureHeaderMiddleware'
6
+ export * from './env/env.model'
7
+ export * from './env/env.shared.service'
16
8
  export * from './gae/appEngine.util'
17
- import { SentrySharedService, SentrySharedServiceCfg } from './sentry/sentry.shared.service'
9
+ export * from './sentry/sentry.shared.service'
18
10
  export * from './server/catchWrapper'
19
11
  export * from './server/createDefaultApp'
20
- import {
21
- DefaultAppCfg,
22
- BackendRequestHandlerCfg,
23
- BackendRequestHandlerWithPath,
24
- } from './server/createDefaultApp.model'
12
+ export * from './server/createDefaultApp.model'
25
13
  export * from './server/deployInfo.util'
26
14
  export * from './server/getDefaultRouter'
27
- import {
28
- bodyParserTimeoutMiddleware,
29
- BodyParserTimeoutMiddlewareCfg,
30
- clearBodyParserTimeout,
31
- } from './server/bodyParserTimeoutMiddleware'
15
+ export * from './server/bodyParserTimeoutMiddleware'
32
16
  export * from './server/genericErrorMiddleware'
33
17
  export * from './server/serverStatsMiddleware'
34
- import {
35
- methodOverrideMiddleware,
36
- MethodOverrideMiddlewareCfg,
37
- } from './server/methodOverrideMiddleware'
18
+ export * from './server/methodOverrideMiddleware'
38
19
  export * from './server/notFoundMiddleware'
39
20
  export * from './server/okMiddleware'
40
- import { RequestTimeoutMiddlewareCfg } from './server/requestTimeoutMiddleware'
41
21
  export * from './server/requestTimeoutMiddleware'
42
- import { reqValidation, ReqValidationOptions } from './server/reqValidationMiddleware'
43
- import {
44
- simpleRequestLoggerMiddleware,
45
- SimpleRequestLoggerMiddlewareCfg,
46
- } from './server/simpleRequestLoggerMiddleware'
47
- import { serverStatusMiddleware, getServerStatusData } from './server/serverStatusMiddleware'
22
+ export * from './server/reqValidationMiddleware'
23
+ export * from './server/simpleRequestLoggerMiddleware'
24
+ export * from './server/serverStatusMiddleware'
48
25
  export * from './server/validateMiddleware'
49
26
  export * from './server/request.log.util'
50
- import { BackendServer, startServer } from './server/startServer'
51
- import { StartServerCfg, StartServerData } from './server/startServer.model'
27
+ export * from './server/startServer'
28
+ export * from './server/startServer.model'
52
29
  export * from './server/asyncLocalStorageMiddleware'
53
- import type {
54
- BackendRequest,
55
- BackendRequestHandler,
56
- BackendResponse,
57
- BackendErrorRequestHandler,
58
- BackendRouter,
59
- BackendApplication,
60
- } from './server/server.model'
30
+ export * from './server/server.model'
61
31
  export * from './server/appEngineLogMiddleware'
62
32
  export * from './server/safeJsonMiddleware'
63
33
  export * from './server/request.util'
64
34
 
65
- export type {
66
- MethodOverrideMiddlewareCfg,
67
- SentrySharedServiceCfg,
68
- BackendRequestHandlerWithPath,
69
- BackendRequestHandlerCfg,
70
- DefaultAppCfg,
71
- StartServerCfg,
72
- StartServerData,
73
- EnvSharedServiceCfg,
74
- BaseEnv,
75
- AdminMiddleware,
76
- AdminServiceCfg,
77
- AdminInfo,
78
- RequireAdminCfg,
79
- SecureHeaderMiddlewareCfg,
80
- BodyParserTimeoutMiddlewareCfg,
81
- RequestTimeoutMiddlewareCfg,
82
- SimpleRequestLoggerMiddlewareCfg,
83
- ReqValidationOptions,
84
- BackendRequest,
85
- BackendRequestHandler,
86
- BackendResponse,
87
- BackendErrorRequestHandler,
88
- BackendRouter,
89
- BackendApplication,
90
- }
91
-
92
- export {
93
- BackendServer,
94
- SentrySharedService,
95
- EnvSharedService,
96
- reqValidation,
97
- methodOverrideMiddleware,
98
- startServer,
99
- serverStatusMiddleware,
100
- getServerStatusData,
101
- onFinished,
102
- FirebaseSharedService,
103
- createAdminMiddleware,
104
- BaseAdminService,
105
- loginHtml,
106
- createSecureHeaderMiddleware,
107
- bodyParserTimeoutMiddleware,
108
- clearBodyParserTimeout,
109
- simpleRequestLoggerMiddleware,
110
- }
35
+ export { onFinished }