zcatalyst-cli 1.21.0 → 1.22.0
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/lib/api-timer.d.ts +17 -0
- package/lib/api-timer.js +2 -2
- package/lib/apig-utils.d.ts +41 -0
- package/lib/apig-utils.js +32 -32
- package/lib/appsail-utils.d.ts +3 -0
- package/lib/appsail-utils.js +116 -12
- package/lib/archiver.d.ts +47 -0
- package/lib/archiver.js +6 -6
- package/lib/authentication/constants/auth.d.ts +21 -0
- package/lib/authentication/constants/auth.js +37 -0
- package/lib/authentication/constants/scopes.d.ts +81 -0
- package/lib/{util_modules/constants/lib → authentication/constants}/scopes.js +1 -0
- package/lib/authentication/credential.d.ts +39 -0
- package/lib/{internal → authentication}/credential.js +63 -46
- package/lib/authentication/crypt.d.ts +13 -0
- package/lib/authentication/error.d.ts +4 -0
- package/lib/authentication/error.js +14 -0
- package/lib/authentication/index.d.ts +5 -0
- package/lib/authentication/index.js +65 -63
- package/lib/authentication/login.d.ts +46 -0
- package/lib/authentication/login.js +147 -105
- package/lib/authentication/revoke.d.ts +9 -0
- package/lib/bin/catalyst.d.ts +2 -0
- package/lib/bin/catalyst.js +80 -36
- package/lib/cli_table/index.js +3 -2
- package/lib/client-utils.d.ts +16 -0
- package/lib/client-utils.js +57 -50
- package/lib/client.d.ts +21 -0
- package/lib/client.js +93 -6
- package/lib/code-deck.d.ts +21 -0
- package/lib/command_needs/auth.d.ts +2 -0
- package/lib/command_needs/auth.js +25 -24
- package/lib/command_needs/config.d.ts +4 -0
- package/lib/command_needs/rc.d.ts +8 -0
- package/lib/command_needs/rc.js +24 -24
- package/lib/commands/apig/disable.d.ts +3 -0
- package/lib/commands/apig/disable.js +8 -8
- package/lib/commands/apig/enable.d.ts +3 -0
- package/lib/commands/apig/enable.js +8 -8
- package/lib/commands/apig/status.d.ts +18 -0
- package/lib/commands/apig/status.js +12 -12
- package/lib/commands/appsail/add.d.ts +3 -0
- package/lib/commands/appsail/add.js +7 -6
- package/lib/commands/appsail/unlink.d.ts +3 -0
- package/lib/commands/appsail/unlink.js +43 -0
- package/lib/commands/client/delete.d.ts +3 -0
- package/lib/commands/client/delete.js +19 -19
- package/lib/commands/client/setup.d.ts +3 -0
- package/lib/commands/client/setup.js +6 -5
- package/lib/commands/codelib/install.d.ts +3 -0
- package/lib/commands/codelib/install.js +15 -15
- package/lib/commands/config/delete.d.ts +3 -0
- package/lib/commands/config/delete.js +2 -2
- package/lib/commands/config/get.d.ts +3 -0
- package/lib/commands/config/get.js +2 -2
- package/lib/commands/config/list.d.ts +3 -0
- package/lib/commands/config/list.js +2 -2
- package/lib/commands/config/set.d.ts +3 -0
- package/lib/commands/config/set.js +2 -2
- package/lib/commands/deploy/appsail.d.ts +3 -0
- package/lib/commands/deploy/appsail.js +11 -9
- package/lib/commands/deploy/index.d.ts +3 -0
- package/lib/commands/deploy/index.js +43 -25
- package/lib/commands/deploy/slate.d.ts +3 -0
- package/lib/commands/deploy/slate.js +1 -1
- package/lib/commands/ds/export.d.ts +3 -0
- package/lib/commands/ds/export.js +9 -9
- package/lib/commands/ds/import.d.ts +3 -0
- package/lib/commands/ds/import.js +13 -13
- package/lib/commands/ds/status.d.ts +23 -0
- package/lib/commands/ds/status.js +12 -11
- package/lib/commands/event/generate/index.d.ts +3 -0
- package/lib/commands/event/generate/index.js +5 -186
- package/lib/commands/event/generate/integ.d.ts +3 -0
- package/lib/commands/event/generate/integ.js +4 -4
- package/lib/commands/event/generate/job.d.ts +3 -0
- package/lib/commands/functions/add.d.ts +3 -0
- package/lib/commands/functions/add.js +6 -5
- package/lib/commands/functions/config.d.ts +3 -0
- package/lib/commands/functions/config.js +5 -5
- package/lib/commands/functions/delete.d.ts +3 -0
- package/lib/commands/functions/delete.js +19 -18
- package/lib/commands/functions/execute.d.ts +3 -0
- package/lib/commands/functions/execute.js +202 -0
- package/lib/commands/functions/setup.d.ts +3 -0
- package/lib/commands/functions/setup.js +6 -5
- package/lib/commands/functions/shell.d.ts +3 -0
- package/lib/commands/functions/shell.js +32 -28
- package/lib/commands/help.d.ts +3 -0
- package/lib/commands/help.js +4 -4
- package/lib/commands/iac/export.d.ts +3 -0
- package/lib/commands/iac/export.js +9 -8
- package/lib/commands/iac/import.d.ts +6 -0
- package/lib/commands/iac/import.js +23 -22
- package/lib/commands/iac/pack.d.ts +3 -0
- package/lib/commands/iac/pack.js +13 -13
- package/lib/commands/iac/status.d.ts +3 -0
- package/lib/commands/iac/status.js +4 -4
- package/lib/commands/index.d.ts +3 -0
- package/lib/commands/index.js +74 -64
- package/lib/commands/init.d.ts +3 -0
- package/lib/commands/init.js +13 -11
- package/lib/commands/login.d.ts +3 -0
- package/lib/commands/login.js +2 -2
- package/lib/commands/logout.d.ts +3 -0
- package/lib/commands/logout.js +1 -1
- package/lib/commands/project/list.d.ts +3 -0
- package/lib/commands/project/list.js +7 -6
- package/lib/commands/project/reset.d.ts +3 -0
- package/lib/commands/project/reset.js +5 -5
- package/lib/commands/project/use.d.ts +3 -0
- package/lib/commands/project/use.js +13 -11
- package/lib/commands/pull.d.ts +3 -0
- package/lib/commands/pull.js +16 -15
- package/lib/commands/run.d.ts +3 -0
- package/lib/commands/run.js +9 -9
- package/lib/commands/serve.d.ts +3 -0
- package/lib/commands/signals/generate/index.d.ts +3 -0
- package/lib/commands/slate/create.d.ts +3 -0
- package/lib/commands/slate/link.d.ts +3 -0
- package/lib/commands/slate/unlink.d.ts +3 -0
- package/lib/commands/slate/unlink.js +1 -1
- package/lib/commands/token/generate.d.ts +3 -0
- package/lib/commands/token/generate.js +4 -3
- package/lib/commands/token/list.d.ts +3 -0
- package/lib/commands/token/list.js +4 -3
- package/lib/commands/token/revoke.d.ts +3 -0
- package/lib/commands/token/revoke.js +3 -3
- package/lib/commands/whoami.d.ts +3 -0
- package/lib/commands/whoami.js +8 -8
- package/lib/commands/zest/generate/index.d.ts +14 -0
- package/lib/commands/zest/generate/index.js +1 -2
- package/lib/deploy/features/apig.d.ts +2 -0
- package/lib/deploy/features/apig.js +11 -11
- package/lib/deploy/features/appsail/index.d.ts +3 -0
- package/lib/deploy/features/appsail/index.js +82 -194
- package/lib/deploy/features/appsail/pack.d.ts +14 -0
- package/lib/deploy/features/appsail/pack.js +130 -0
- package/lib/deploy/features/appsail/utils.d.ts +15 -0
- package/lib/deploy/features/appsail/utils.js +163 -17
- package/lib/deploy/features/client.d.ts +2 -0
- package/lib/deploy/features/client.js +5 -4
- package/lib/deploy/features/functions/index.d.ts +2 -0
- package/lib/deploy/features/functions/index.js +41 -32
- package/lib/deploy/features/functions/languages/index.d.ts +4 -0
- package/lib/deploy/features/functions/languages/index.js +14 -1
- package/lib/deploy/features/functions/utils.d.ts +1 -0
- package/lib/deploy/features/functions/utils.js +136 -0
- package/lib/deploy/features/index.d.ts +8 -0
- package/lib/deploy/features/slate.d.ts +5 -0
- package/lib/deploy/features/slate.js +5 -5
- package/lib/deploy/index.d.ts +6 -0
- package/lib/deploy/index.js +12 -11
- package/lib/deploy/util.d.ts +7 -0
- package/lib/deploy/util.js +22 -0
- package/lib/docs/commands/functions/execute.toml +29 -0
- package/lib/docs/endpoints/lib/git-hub.toml +3 -0
- package/lib/docs/fn-utils/lib/java/classpath.toml +9 -0
- package/lib/docs/fn-utils/lib/java/ensure-java-userconfig.toml +24 -0
- package/lib/docs/fn-utils/lib/java/index.toml +15 -0
- package/{docs → lib/docs}/option-filter.toml +12 -3
- package/lib/docs/util_modules/container.toml +6 -0
- package/{docs → lib/docs}/util_modules/project.toml +1 -1
- package/lib/endpoints/index.d.ts +119 -0
- package/lib/endpoints/index.js +32 -25
- package/lib/endpoints/lib/apig.d.ts +17 -0
- package/lib/endpoints/lib/apig.js +12 -12
- package/lib/endpoints/lib/applogic.d.ts +21 -0
- package/lib/endpoints/lib/applogic.js +10 -10
- package/lib/endpoints/lib/appsail.d.ts +64 -0
- package/lib/endpoints/lib/appsail.js +94 -5
- package/lib/endpoints/lib/cache.d.ts +12 -0
- package/lib/endpoints/lib/cache.js +8 -8
- package/lib/endpoints/lib/catalyst-details.d.ts +8 -0
- package/lib/endpoints/lib/catalyst-details.js +2 -2
- package/lib/endpoints/lib/client.d.ts +16 -0
- package/lib/endpoints/lib/client.js +12 -12
- package/lib/endpoints/lib/code-deck.d.ts +10 -0
- package/lib/endpoints/lib/code-deck.js +3 -3
- package/lib/endpoints/lib/common.d.ts +5 -0
- package/lib/endpoints/lib/common.js +2 -2
- package/lib/endpoints/lib/datastore.d.ts +11 -0
- package/lib/endpoints/lib/datastore.js +6 -6
- package/lib/endpoints/lib/ds-bulk.d.ts +46 -0
- package/lib/endpoints/lib/ds-bulk.js +12 -12
- package/lib/endpoints/lib/env.d.ts +8 -0
- package/lib/endpoints/lib/env.js +5 -5
- package/lib/endpoints/lib/event-bus.d.ts +10 -0
- package/lib/endpoints/lib/event-bus.js +4 -4
- package/lib/endpoints/lib/filestore.d.ts +13 -0
- package/lib/endpoints/lib/filestore.js +6 -6
- package/lib/endpoints/lib/functions.d.ts +24 -0
- package/lib/endpoints/lib/functions.js +14 -14
- package/lib/endpoints/lib/git-hub.d.ts +16 -0
- package/lib/endpoints/lib/git-hub.js +15 -2
- package/lib/endpoints/lib/iac.d.ts +43 -0
- package/lib/endpoints/lib/iac.js +20 -20
- package/lib/endpoints/lib/job-scheduling.d.ts +43 -0
- package/lib/endpoints/lib/job-scheduling.js +2 -2
- package/lib/endpoints/lib/log.d.ts +10 -0
- package/lib/endpoints/lib/org.d.ts +13 -0
- package/lib/endpoints/lib/org.js +2 -2
- package/lib/endpoints/lib/project.d.ts +18 -0
- package/lib/endpoints/lib/project.js +11 -11
- package/lib/endpoints/lib/queue.d.ts +14 -0
- package/lib/endpoints/lib/queue.js +8 -8
- package/lib/endpoints/lib/sdk.d.ts +10 -0
- package/lib/endpoints/lib/sdk.js +5 -5
- package/lib/endpoints/lib/slate.d.ts +16 -0
- package/lib/endpoints/lib/stratus.d.ts +15 -0
- package/lib/endpoints/lib/tunnel.d.ts +38 -0
- package/lib/endpoints/lib/tunnel.js +5 -5
- package/lib/endpoints/lib/user.d.ts +8 -0
- package/lib/endpoints/lib/user.js +46 -0
- package/lib/endpoints/lib/zcql.d.ts +12 -0
- package/lib/endpoints/lib/zcql.js +4 -4
- package/lib/endpoints/lib/zest.d.ts +73 -0
- package/lib/error/context-help.d.ts +1 -0
- package/lib/{util_modules → error}/context-help.js +15 -18
- package/lib/error/index.d.ts +27 -0
- package/lib/{error.js → error/index.js} +18 -14
- package/lib/error/utils.d.ts +2 -0
- package/lib/error/utils.js +8 -0
- package/lib/errorOut.d.ts +3 -0
- package/lib/errorOut.js +10 -9
- package/lib/errorResponse.d.ts +4 -0
- package/lib/event_generate/cache.d.ts +2 -0
- package/lib/event_generate/cache.js +3 -3
- package/lib/event_generate/custom.d.ts +1 -0
- package/lib/event_generate/custom.js +2 -2
- package/lib/event_generate/datastore.d.ts +7 -0
- package/lib/event_generate/datastore.js +6 -6
- package/lib/event_generate/filestore.d.ts +2 -0
- package/lib/event_generate/filestore.js +2 -2
- package/lib/event_generate/github.d.ts +2 -0
- package/lib/event_generate/index.d.ts +2 -0
- package/lib/event_generate/index.js +196 -0
- package/lib/event_generate/integration/cliq.d.ts +2 -0
- package/lib/event_generate/integration/cliq.js +4 -4
- package/lib/event_generate/stratus.d.ts +2 -0
- package/lib/event_generate/user.d.ts +2 -0
- package/lib/event_generate/webapp.d.ts +2 -0
- package/lib/execute/caller.d.ts +14 -0
- package/lib/execute/caller.js +155 -0
- package/lib/execute/index.d.ts +3 -0
- package/lib/execute/index.js +87 -0
- package/lib/execute-script.d.ts +6 -0
- package/lib/execute-script.js +62 -32
- package/lib/express_middlewares/apig-matcher.d.ts +3 -0
- package/lib/express_middlewares/auth-checker.d.ts +3 -0
- package/lib/express_middlewares/authenticator.d.ts +3 -0
- package/lib/express_middlewares/authenticator.js +3 -2
- package/lib/express_middlewares/cookie-parser.d.ts +3 -0
- package/lib/express_middlewares/error-handler.d.ts +3 -0
- package/lib/express_middlewares/logger.d.ts +5 -0
- package/lib/express_middlewares/logger.js +3 -2
- package/lib/express_middlewares/project.d.ts +6 -0
- package/lib/express_middlewares/url-rewriter.d.ts +3 -0
- package/lib/fn-utils/index.d.ts +10 -0
- package/lib/fn-utils/lib/browserLogic.d.ts +2 -0
- package/lib/fn-utils/lib/browserLogic.js +7 -6
- package/lib/fn-utils/lib/common.d.ts +85 -0
- package/lib/fn-utils/lib/common.js +79 -90
- package/lib/fn-utils/lib/integ.d.ts +2 -0
- package/lib/fn-utils/lib/integ.js +10 -4
- package/lib/fn-utils/lib/java/classpath.d.ts +2 -0
- package/lib/fn-utils/lib/java/classpath.js +107 -0
- package/lib/fn-utils/lib/java/compile.d.ts +4 -0
- package/lib/fn-utils/lib/java/compile.js +222 -0
- package/lib/fn-utils/lib/java/ensure-java-userconfig.d.ts +22 -0
- package/lib/fn-utils/lib/java/ensure-java-userconfig.js +264 -0
- package/lib/fn-utils/lib/java/index.d.ts +16 -0
- package/lib/fn-utils/lib/java/index.js +254 -0
- package/lib/fn-utils/lib/java/keywords.d.ts +2 -0
- package/lib/fn-utils/lib/java/keywords.js +71 -0
- package/lib/fn-utils/lib/node.d.ts +5 -0
- package/lib/fn-utils/lib/node.js +30 -10
- package/lib/fn-utils/lib/python.d.ts +3 -0
- package/lib/fn-utils/lib/python.js +9 -4
- package/lib/fn-watcher.d.ts +8 -0
- package/lib/fn-watcher.js +18 -23
- package/lib/iac/status/bundle.d.ts +2 -0
- package/lib/iac/status/bundle.js +10 -7
- package/lib/iac/status/deploy.d.ts +2 -0
- package/lib/iac/status/deploy.js +10 -10
- package/lib/iac/status/util/index.d.ts +2 -0
- package/lib/index.d.ts +2 -0
- package/lib/index.js +15 -4
- package/lib/init/dependencies/npm-install.d.ts +3 -0
- package/lib/init/dependencies/npm-install.js +4 -3
- package/lib/init/dependencies/package-json.d.ts +2 -0
- package/lib/init/dependencies/package-json.js +3 -3
- package/lib/init/dependencies/python/ensure-python.d.ts +2 -0
- package/lib/init/dependencies/python/pip-install.d.ts +7 -0
- package/lib/init/dependencies/python/pip-install.js +3 -3
- package/lib/init/features/appsail/index.d.ts +2 -0
- package/lib/init/features/appsail/index.js +48 -124
- package/lib/init/features/appsail/utils.d.ts +16 -0
- package/lib/init/features/appsail/utils.js +264 -0
- package/lib/init/features/client/index.d.ts +2 -0
- package/lib/init/features/client/index.js +1 -0
- package/lib/init/features/client/initializers/angular.d.ts +2 -0
- package/lib/init/features/client/initializers/angular.js +42 -12
- package/lib/init/features/client/initializers/basic.d.ts +2 -0
- package/lib/init/features/client/initializers/basic.js +2 -2
- package/lib/init/features/client/initializers/lyte.d.ts +2 -0
- package/lib/init/features/client/initializers/lyte.js +1 -1
- package/lib/init/features/client/initializers/react.d.ts +2 -0
- package/lib/init/features/client/initializers/react.js +5 -4
- package/lib/init/features/client/types.d.ts +10 -0
- package/lib/init/features/client/types.js +2 -0
- package/lib/init/features/functions/index.d.ts +17 -0
- package/lib/init/features/functions/index.js +60 -8
- package/lib/init/features/functions/languages/index.d.ts +6 -0
- package/lib/init/features/functions/languages/java.d.ts +2 -0
- package/lib/init/features/functions/languages/java.js +9 -7
- package/lib/init/features/functions/languages/node.d.ts +2 -0
- package/lib/init/features/functions/languages/node.js +6 -4
- package/lib/init/features/functions/languages/python.d.ts +2 -0
- package/lib/init/features/functions/languages/python.js +9 -7
- package/lib/init/features/index.d.ts +14 -0
- package/lib/init/features/index.js +13 -13
- package/lib/init/features/project.d.ts +2 -0
- package/lib/init/features/project.js +19 -22
- package/lib/init/features/slate/index.d.ts +2 -0
- package/lib/init/features/slate/index.js +2 -2
- package/lib/init/index.d.ts +2 -0
- package/lib/init/index.js +5 -5
- package/lib/init/util/client.d.ts +8 -0
- package/lib/init/util/client.js +10 -10
- package/lib/init/util/common.d.ts +12 -0
- package/lib/init/util/common.js +17 -16
- package/lib/init/util/functions.d.ts +7 -0
- package/lib/init/util/functions.js +3 -3
- package/lib/init/util/project.d.ts +3 -0
- package/lib/init/util/project.js +4 -4
- package/lib/internal/api.d.ts +78 -0
- package/lib/internal/api.js +32 -22
- package/lib/internal/command.d.ts +40 -0
- package/lib/internal/command.js +27 -11
- package/lib/internal/config.d.ts +19 -0
- package/lib/internal/config.js +4 -5
- package/lib/internal/rc.d.ts +44 -0
- package/lib/internal/rc.js +9 -9
- package/lib/migration/global/1.4.0.d.ts +2 -0
- package/lib/migration/global/1.4.0.js +4 -4
- package/lib/migration/global/1.6.2.d.ts +2 -0
- package/lib/migration/global/1.6.2.js +13 -13
- package/lib/migration/index.d.ts +6 -0
- package/lib/migration/index.js +19 -18
- package/lib/option-filter.d.ts +5 -0
- package/lib/option-filter.js +57 -30
- package/lib/optional-import.d.ts +2 -0
- package/lib/optional-import.js +3 -3
- package/lib/plugin-loader.d.ts +6 -0
- package/lib/plugin-loader.js +2 -2
- package/lib/port-resolver.d.ts +24 -0
- package/lib/port-resolver.js +14 -13
- package/lib/progress.d.ts +34 -0
- package/lib/prompt/index.d.ts +34 -0
- package/lib/prompt/index.js +49 -9
- package/lib/prompt/types/file-path.d.ts +25 -0
- package/lib/prompt/types/search-box.d.ts +56 -0
- package/lib/prompt/types/search-box.js +84 -46
- package/lib/prompt/types/tree.d.ts +65 -0
- package/lib/prompt/types/with-description.d.ts +15 -0
- package/lib/prompt/types/with-description.js +74 -0
- package/lib/pull/features/apig.d.ts +2 -0
- package/lib/pull/features/apig.js +10 -10
- package/lib/pull/features/client.d.ts +2 -0
- package/lib/pull/features/client.js +11 -10
- package/lib/pull/features/functions/index.d.ts +2 -0
- package/lib/pull/features/functions/index.js +38 -41
- package/lib/pull/features/functions/languages.d.ts +4 -0
- package/lib/pull/features/functions/languages.js +3 -3
- package/lib/pull/features/index.d.ts +6 -0
- package/lib/pull/index.d.ts +2 -0
- package/lib/pull/index.js +8 -8
- package/lib/repl-server.d.ts +32 -0
- package/lib/repl-server.js +8 -8
- package/lib/runtime-store.d.ts +3 -0
- package/lib/runtime-store.js +6 -12
- package/lib/serve/features/apig.d.ts +3 -0
- package/lib/serve/features/apig.js +3 -3
- package/lib/serve/features/appsail.d.ts +16 -0
- package/lib/serve/features/appsail.js +52 -10
- package/lib/serve/features/client.d.ts +2 -0
- package/lib/serve/features/client.js +1 -1
- package/lib/serve/features/index.d.ts +7 -0
- package/lib/serve/features/index.js +4 -4
- package/lib/serve/features/slate.d.ts +12 -0
- package/lib/serve/index.d.ts +2 -0
- package/lib/serve/index.js +65 -67
- package/lib/serve/server/index.d.ts +37 -0
- package/lib/serve/server/index.js +215 -121
- package/lib/serve/server/lib/appsail/index.d.ts +6 -0
- package/lib/serve/server/lib/appsail/index.js +214 -117
- package/lib/serve/server/lib/appsail/start.js +14 -5
- package/lib/serve/server/lib/java/index.d.ts +6 -0
- package/lib/serve/server/lib/java/index.js +52 -22
- package/lib/serve/server/lib/master/appsail.d.ts +5 -0
- package/lib/serve/server/lib/master/appsail.js +16 -5
- package/lib/serve/server/lib/master/functions.d.ts +5 -0
- package/lib/serve/server/lib/master/functions.js +27 -0
- package/lib/serve/server/lib/master/index.d.ts +10 -0
- package/lib/serve/server/lib/master/index.js +11 -3
- package/lib/serve/server/lib/master/slate.d.ts +5 -0
- package/lib/serve/server/lib/master/slate.js +3 -0
- package/lib/serve/server/lib/master/unknown-req-proxy.d.ts +4 -0
- package/lib/serve/server/lib/master/unknown-req-proxy.js +3 -5
- package/lib/serve/server/lib/master/utils.d.ts +24 -0
- package/lib/serve/server/lib/master/utils.js +8 -4
- package/lib/serve/server/lib/master/web-client.d.ts +5 -0
- package/lib/serve/server/lib/node/index.d.ts +6 -0
- package/lib/serve/server/lib/node/index.js +54 -43
- package/lib/serve/server/lib/node/server/bio.js +133 -0
- package/lib/serve/server/lib/node/server/browserlogic/browserlogic-puppeteer.js +1 -1
- package/lib/serve/server/lib/node/server/index.js +22 -1
- package/lib/serve/server/lib/python/index.d.ts +6 -0
- package/lib/serve/server/lib/python/index.js +63 -8
- package/lib/serve/server/lib/slate/index.d.ts +6 -0
- package/lib/serve/server/lib/slate/static-server.d.ts +7 -0
- package/lib/serve/server/lib/slate/static-server.js +24 -24
- package/lib/serve/server/lib/web_client/index.d.ts +5 -0
- package/lib/serve/server/lib/web_client/index.js +11 -8
- package/lib/serve/server/lib/web_client/server.d.ts +7 -0
- package/lib/serve/server/lib/web_client/server.js +22 -22
- package/lib/serve/server/lib/web_client/types.d.ts +15 -0
- package/lib/serve/server/lib/web_client/types.js +2 -0
- package/lib/shell/dependencies/http-functions.d.ts +35 -0
- package/lib/shell/dependencies/http-functions.js +59 -26
- package/lib/shell/dependencies/invoker/cron/java/JavacronInvoker.java +1 -1
- package/lib/shell/dependencies/invoker/job/java/JavajobInvoker.java +51 -10
- package/lib/shell/dependencies/invoker/job/node.mjs +2 -2
- package/lib/shell/dependencies/non-http-function/fn-execution-handler.d.ts +13 -0
- package/lib/shell/dependencies/non-http-function/fn-execution-handler.js +260 -0
- package/lib/shell/dependencies/non-http-function/fn-handler.d.ts +30 -0
- package/lib/shell/dependencies/non-http-function/fn-handler.js +258 -0
- package/lib/shell/dependencies/non-http-function/index.d.ts +20 -0
- package/lib/shell/dependencies/non-http-function/index.js +62 -0
- package/lib/shell/dependencies/non-http-function/java.d.ts +9 -0
- package/lib/shell/dependencies/non-http-function/java.js +42 -0
- package/lib/shell/dependencies/non-http-function/node.d.ts +8 -0
- package/lib/shell/dependencies/non-http-function/node.js +36 -0
- package/lib/shell/dependencies/non-http-function/python.d.ts +5 -0
- package/lib/shell/dependencies/non-http-function/python.js +47 -0
- package/lib/shell/dependencies/non-http-function/slave-manager.d.ts +23 -0
- package/lib/shell/dependencies/non-http-function/slave-manager.js +173 -0
- package/lib/shell/dependencies/tunnel-server.d.ts +23 -0
- package/lib/shell/dependencies/tunnel-server.js +4 -4
- package/lib/shell/index.d.ts +2 -0
- package/lib/shell/index.js +31 -25
- package/lib/shell/prepare/index.d.ts +4 -0
- package/lib/shell/prepare/index.js +9 -27
- package/lib/shell/prepare/languages/index.d.ts +6 -0
- package/lib/shell/prepare/languages/index.js +20 -5
- package/lib/shell/prepare/languages/java.d.ts +3 -0
- package/lib/shell/prepare/languages/java.js +6 -14
- package/lib/shell/prepare/languages/node.d.ts +3 -0
- package/lib/shell/prepare/languages/node.js +14 -1
- package/lib/shell/prepare/languages/python.d.ts +3 -0
- package/lib/shell/prepare/languages/python.js +13 -2
- package/lib/slate-utils.d.ts +12 -0
- package/lib/throbber/index.d.ts +36 -0
- package/lib/throbber/index.js +11 -7
- package/lib/throbber/utils.d.ts +23 -0
- package/lib/track.d.ts +2 -0
- package/lib/track.js +13 -13
- package/lib/userConfig.d.ts +22 -0
- package/lib/userConfig.js +18 -8
- package/lib/util_modules/config/index.d.ts +6 -0
- package/lib/util_modules/config/lib/apig.d.ts +15 -0
- package/lib/util_modules/config/lib/apig.js +4 -4
- package/lib/util_modules/config/lib/appsail.d.ts +50 -0
- package/lib/util_modules/config/lib/appsail.js +96 -26
- package/lib/util_modules/config/lib/client.d.ts +20 -0
- package/lib/util_modules/config/lib/client.js +19 -6
- package/lib/util_modules/config/lib/functions.d.ts +48 -0
- package/lib/util_modules/config/lib/functions.js +27 -16
- package/lib/util_modules/config/lib/slate.d.ts +106 -0
- package/lib/util_modules/config/lib/slate.js +1 -1
- package/lib/util_modules/config-store.d.ts +12 -0
- package/lib/util_modules/config-store.js +55 -0
- package/lib/util_modules/constants/index.d.ts +24 -0
- package/lib/util_modules/constants/index.js +1 -5
- package/lib/util_modules/constants/lib/apig-rules.d.ts +3 -0
- package/lib/util_modules/constants/lib/apig-rules.js +1 -1
- package/lib/util_modules/constants/lib/browserLogic.d.ts +20 -0
- package/lib/util_modules/constants/lib/cliq-handlers.d.ts +32 -0
- package/lib/util_modules/constants/lib/dc-type.d.ts +59 -0
- package/lib/util_modules/constants/lib/default.d.ts +48 -0
- package/lib/util_modules/constants/lib/default.js +4 -0
- package/lib/util_modules/constants/lib/env-path.d.ts +6 -0
- package/lib/util_modules/constants/lib/event-action.d.ts +11 -0
- package/lib/util_modules/constants/lib/event-source.d.ts +11 -0
- package/lib/util_modules/constants/lib/file-names.d.ts +37 -0
- package/lib/util_modules/constants/lib/file-names.js +1 -0
- package/lib/util_modules/constants/lib/fn-type.d.ts +11 -0
- package/lib/util_modules/constants/lib/folder-names.d.ts +9 -0
- package/lib/util_modules/constants/lib/iac.d.ts +7 -0
- package/lib/util_modules/constants/lib/integ.d.ts +13 -0
- package/lib/util_modules/constants/lib/needed-scopes.d.ts +4 -0
- package/lib/util_modules/constants/lib/needed-scopes.js +3 -4
- package/lib/util_modules/constants/lib/placeholders.d.ts +65 -0
- package/lib/util_modules/constants/lib/placeholders.js +2 -1
- package/lib/util_modules/constants/lib/plugin.d.ts +27 -0
- package/lib/util_modules/constants/lib/ref-mapping.d.ts +15 -0
- package/lib/util_modules/constants/lib/regex.d.ts +20 -0
- package/lib/util_modules/constants/lib/regex.js +3 -0
- package/lib/util_modules/constants/lib/remote-mapping.d.ts +15 -0
- package/lib/util_modules/constants/lib/runtime.d.ts +18 -0
- package/lib/util_modules/constants/lib/signals-api-names.d.ts +9 -0
- package/lib/util_modules/constants/lib/signals-publishers-type.d.ts +7 -0
- package/lib/util_modules/constants/lib/signals-publishers.d.ts +9 -0
- package/lib/util_modules/constants/lib/template.d.ts +65 -0
- package/lib/util_modules/constants/lib/urls.d.ts +26 -0
- package/lib/util_modules/constants/lib/urls.js +12 -1
- package/lib/util_modules/constants/project.d.ts +4 -0
- package/lib/util_modules/container.d.ts +3 -0
- package/lib/util_modules/container.js +176 -0
- package/lib/util_modules/dc.d.ts +10 -0
- package/lib/{dc.js → util_modules/dc.js} +14 -18
- package/lib/util_modules/env.d.ts +7 -0
- package/lib/util_modules/env.js +3 -2
- package/lib/util_modules/fs/index.d.ts +3 -0
- package/lib/util_modules/fs/lib/async.d.ts +53 -0
- package/lib/util_modules/fs/lib/async.js +30 -1
- package/lib/util_modules/fs/lib/sync.d.ts +39 -0
- package/lib/util_modules/fs/lib/sync.js +24 -16
- package/lib/util_modules/fs/utils.d.ts +1 -0
- package/lib/util_modules/global-space.d.ts +1 -0
- package/lib/util_modules/js.d.ts +10 -0
- package/lib/util_modules/logger/index.d.ts +19 -0
- package/lib/util_modules/logger/index.js +80 -0
- package/lib/util_modules/logger/utils.d.ts +29 -0
- package/lib/util_modules/logger/utils.js +66 -0
- package/lib/util_modules/logger/winston.d.ts +9 -0
- package/lib/util_modules/logger/winston.js +90 -0
- package/lib/util_modules/option.d.ts +5 -0
- package/lib/util_modules/option.js +5 -5
- package/lib/util_modules/project.d.ts +70 -0
- package/lib/util_modules/project.js +26 -20
- package/lib/util_modules/runtime-store.d.ts +11 -0
- package/lib/util_modules/runtime-store.js +16 -0
- package/lib/util_modules/server.d.ts +13 -0
- package/lib/util_modules/server.js +78 -1
- package/lib/util_modules/shell.d.ts +21 -0
- package/lib/util_modules/shell.js +19 -4
- package/lib/util_modules/toml.d.ts +2 -0
- package/lib/util_modules/{parser/toml.js → toml.js} +3 -3
- package/package.json +6 -5
- package/templates/init/functions/java/event/sample.java +5 -8
- package/templates/init/functions/node/cron/types/cron.d.ts +1 -1
- package/templates/init/functions/node/event/sample.js +1 -12
- package/templates/init/functions/python/event/sample.py +0 -9
- package/templates/init/functions/python/integ/cliq/sample.py +1 -12
- package/docs/commands/signals/generate/index.toml +0 -19
- package/docs/commands/slate/unlink.toml +0 -9
- package/docs/commands/zest/generate/index.toml +0 -4
- package/docs/fn-utils/lib/ensure-java-userconfig.toml +0 -15
- package/docs/fn-utils/lib/java.toml +0 -34
- package/docs/serve/server/lib/slate/index.toml +0 -15
- package/docs/slate-utils.toml +0 -9
- package/lib/config-store.js +0 -10
- package/lib/fn-utils/lib/ensure-java-userconfig.js +0 -145
- package/lib/fn-utils/lib/java.js +0 -512
- package/lib/shell/dependencies/local-function.js +0 -483
- package/lib/util_modules/char.js +0 -12
- package/lib/util_modules/constants/lib/auth.js +0 -37
- package/lib/util_modules/logger.js +0 -51
- package/lib/winston.js +0 -75
- /package/lib/{internal → authentication}/crypt.js +0 -0
- /package/{docs/internal → lib/authentication/docs}/credential.toml +0 -0
- /package/{docs/authentication → lib/authentication/docs}/index.toml +0 -0
- /package/{docs/authentication → lib/authentication/docs}/login.toml +0 -0
- /package/{docs → lib/docs}/apig-utils.toml +0 -0
- /package/{docs → lib/docs}/client-utils.toml +0 -0
- /package/{docs → lib/docs}/command_needs/auth.toml +0 -0
- /package/{docs → lib/docs}/command_needs/rc.toml +0 -0
- /package/{docs → lib/docs}/commands/apig/disable.toml +0 -0
- /package/{docs → lib/docs}/commands/apig/enable.toml +0 -0
- /package/{docs → lib/docs}/commands/apig/status.toml +0 -0
- /package/{docs → lib/docs}/commands/client/delete.toml +0 -0
- /package/{docs → lib/docs}/commands/ds/export.toml +0 -0
- /package/{docs → lib/docs}/commands/ds/import.toml +0 -0
- /package/{docs → lib/docs}/commands/ds/status.toml +0 -0
- /package/{docs → lib/docs}/commands/event/generate/index.toml +0 -0
- /package/{docs → lib/docs}/commands/event/generate/integ.toml +0 -0
- /package/{docs → lib/docs}/commands/event/generate/job.toml +0 -0
- /package/{docs → lib/docs}/commands/functions/config.toml +0 -0
- /package/{docs → lib/docs}/commands/functions/delete.toml +0 -0
- /package/{docs → lib/docs}/commands/functions/shell.toml +0 -0
- /package/{docs → lib/docs}/commands/iac/export.toml +0 -0
- /package/{docs → lib/docs}/commands/iac/import.toml +0 -0
- /package/{docs → lib/docs}/commands/iac/status.toml +0 -0
- /package/{docs → lib/docs}/commands/project/use.toml +0 -0
- /package/{docs → lib/docs}/dc.toml +0 -0
- /package/{docs → lib/docs}/deploy/features/apig.toml +0 -0
- /package/{docs → lib/docs}/deploy/features/functions/index.toml +0 -0
- /package/{docs → lib/docs}/endpoints/lib/env.toml +0 -0
- /package/{docs → lib/docs}/endpoints/lib/job-scheduling.toml +0 -0
- /package/{docs → lib/docs}/event_generate/cache.toml +0 -0
- /package/{docs → lib/docs}/event_generate/custom.toml +0 -0
- /package/{docs → lib/docs}/event_generate/datastore.toml +0 -0
- /package/{docs → lib/docs}/event_generate/filestore.toml +0 -0
- /package/{docs → lib/docs}/event_generate/integration/cliq.toml +0 -0
- /package/{docs → lib/docs}/execute-script.toml +0 -0
- /package/{docs → lib/docs}/fn-utils/lib/common.toml +0 -0
- /package/{docs → lib/docs}/fn-utils/lib/node.toml +0 -0
- /package/{docs → lib/docs}/fn-utils/lib/python.toml +0 -0
- /package/{docs → lib/docs}/iac/status/bundle.toml +0 -0
- /package/{docs → lib/docs}/init/dependencies/python/ensure-python.toml +0 -0
- /package/{docs → lib/docs}/init/dependencies/python/pip-install.toml +0 -0
- /package/{docs → lib/docs}/init/index.toml +0 -0
- /package/{docs → lib/docs}/internal/command.toml +0 -0
- /package/{docs → lib/docs}/internal/config.toml +0 -0
- /package/{docs → lib/docs}/optional-import.toml +0 -0
- /package/{docs → lib/docs}/plugin-loader.toml +0 -0
- /package/{docs → lib/docs}/port-resolver.toml +0 -0
- /package/{docs → lib/docs}/pull/index.toml +0 -0
- /package/{docs → lib/docs}/serve/index.toml +0 -0
- /package/{docs → lib/docs}/serve/server/index.toml +0 -0
- /package/{docs → lib/docs}/serve/server/lib/appsail/index.toml +0 -0
- /package/{docs → lib/docs}/serve/server/lib/web_client/server.toml +0 -0
- /package/{docs → lib/docs}/shell/dependencies/tunnel-server.toml +0 -0
- /package/{docs → lib/docs}/shell/index.toml +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/playwright/.classpath +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/playwright/.project +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/playwright/catalyst-config.json +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/playwright/sample.java +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/selenium/.classpath +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/selenium/.project +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/selenium/catalyst-config.json +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/selenium/sample.java +0 -0
|
@@ -3,14 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addFnRoutes = void 0;
|
|
4
4
|
const constants_1 = require("../../../../util_modules/constants");
|
|
5
5
|
function addFnRoutes(app, details, proxy) {
|
|
6
|
+
if (details.isAlive === false) {
|
|
7
|
+
return;
|
|
8
|
+
}
|
|
6
9
|
const fnTarget = details.target;
|
|
7
10
|
app.use(`/server/${fnTarget.name}`, (req, res) => {
|
|
11
|
+
var _a;
|
|
12
|
+
if (!((_a = details.target) === null || _a === void 0 ? void 0 : _a.valid)) {
|
|
13
|
+
res.status(503);
|
|
14
|
+
res.write(JSON.stringify({ data: 'Error connecting with the function' }));
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
8
17
|
proxy.web(req, res, {
|
|
9
18
|
target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.name}/execute` : ''}`,
|
|
10
19
|
ws: true
|
|
11
20
|
});
|
|
12
21
|
});
|
|
13
22
|
app.use(`/baas/v1/project/:projectId/function/${fnTarget.name}`, (req, res) => {
|
|
23
|
+
var _a;
|
|
24
|
+
if (!((_a = details.target) === null || _a === void 0 ? void 0 : _a.valid)) {
|
|
25
|
+
res.status(503);
|
|
26
|
+
res.write(JSON.stringify({ data: 'Error connecting with the function' }));
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
14
29
|
proxy.web(req, res, {
|
|
15
30
|
target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.name}/execute` : ''}`,
|
|
16
31
|
ws: true
|
|
@@ -18,12 +33,24 @@ function addFnRoutes(app, details, proxy) {
|
|
|
18
33
|
});
|
|
19
34
|
if (fnTarget.id) {
|
|
20
35
|
app.use(`/server/${fnTarget.id}`, (req, res) => {
|
|
36
|
+
var _a;
|
|
37
|
+
if (!((_a = details.target) === null || _a === void 0 ? void 0 : _a.valid)) {
|
|
38
|
+
res.status(503);
|
|
39
|
+
res.write(JSON.stringify({ data: 'Error connecting with the function' }));
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
21
42
|
proxy.web(req, res, {
|
|
22
43
|
target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.id}/execute` : ''}`,
|
|
23
44
|
ws: true
|
|
24
45
|
});
|
|
25
46
|
});
|
|
26
47
|
app.use(`/baas/v1/project/:projectId/function/${fnTarget.id}`, (req, res) => {
|
|
48
|
+
var _a;
|
|
49
|
+
if (!((_a = details.target) === null || _a === void 0 ? void 0 : _a.valid)) {
|
|
50
|
+
res.status(503);
|
|
51
|
+
res.write(JSON.stringify({ data: 'Error connecting with the function' }));
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
27
54
|
proxy.web(req, res, {
|
|
28
55
|
target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.id}/execute` : ''}`,
|
|
29
56
|
ws: true
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { Server } from 'http';
|
|
3
|
+
import { IServerDetails, TServerTargets } from '../../index';
|
|
4
|
+
import { TAppSailServerDetails } from '../../../features/appsail';
|
|
5
|
+
import { TSlateServerDetails } from '../../../features/slate';
|
|
6
|
+
export default function spinUpMaster(listenPort: number, { otherServerDetails, appSailDetails, slateDetails }: {
|
|
7
|
+
otherServerDetails?: Partial<TServerTargets>;
|
|
8
|
+
appSailDetails?: IServerDetails<TAppSailServerDetails>;
|
|
9
|
+
slateDetails?: IServerDetails<TSlateServerDetails>;
|
|
10
|
+
}): Promise<Server>;
|
|
@@ -26,7 +26,7 @@ const url_rewriter_1 = __importDefault(require("../../../../express_middlewares/
|
|
|
26
26
|
const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
|
|
27
27
|
const constants_1 = require("../../../../util_modules/constants");
|
|
28
28
|
const js_1 = require("../../../../util_modules/js");
|
|
29
|
-
const
|
|
29
|
+
const index_1 = require("../../../../util_modules/logger/index");
|
|
30
30
|
const project_2 = require("../../../../util_modules/project");
|
|
31
31
|
const option_1 = require("../../../../util_modules/option");
|
|
32
32
|
const server_js_1 = require("../../../../util_modules/server.js");
|
|
@@ -116,6 +116,9 @@ function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDet
|
|
|
116
116
|
case 'server': {
|
|
117
117
|
(_b = otherServerDetails.server) === null || _b === void 0 ? void 0 : _b.forEach((serverDetail) => {
|
|
118
118
|
var _a;
|
|
119
|
+
if (serverDetail.isAlive === false) {
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
119
122
|
app.use('/server/' + ((_a = serverDetail.target) === null || _a === void 0 ? void 0 : _a.name), (req, res) => {
|
|
120
123
|
proxy.web(req, res, {
|
|
121
124
|
target: `http://127.0.0.1:${serverDetail.httpPort}`
|
|
@@ -146,9 +149,14 @@ function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDet
|
|
|
146
149
|
});
|
|
147
150
|
const expressDestroyer = new server_js_1.ConnectionDestroyer(expressServer);
|
|
148
151
|
expressServer.maxConnections = 100;
|
|
149
|
-
|
|
152
|
+
const stopServer = () => expressDestroyer.destroy(!!appSailDetails);
|
|
153
|
+
utils_1.serverEvent.once('stop', () => {
|
|
154
|
+
process.removeListener('SIGINT', stopServer);
|
|
155
|
+
stopServer();
|
|
156
|
+
});
|
|
157
|
+
process.once('SIGINT', stopServer);
|
|
150
158
|
expressServer.on('close', () => __awaiter(this, void 0, void 0, function* () {
|
|
151
|
-
yield proxyDestroyer.destroy().catch((err) => (0,
|
|
159
|
+
yield proxyDestroyer.destroy().catch((err) => (0, index_1.debug)(err));
|
|
152
160
|
}));
|
|
153
161
|
expressServer.on('upgrade', (...upgradeParam) => {
|
|
154
162
|
app.emit('upgrade', ...upgradeParam);
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import Server from 'http-proxy';
|
|
2
|
+
import { IServerDetails } from '../..';
|
|
3
|
+
import { Express, Request, Response } from 'express';
|
|
4
|
+
import { TSlateServerDetails } from '../../../features/slate';
|
|
5
|
+
export declare function addSlateRoutes(app: Express, details: IServerDetails<TSlateServerDetails>, proxy: Server, unknownProxy: (req: Request, res: Response) => void): void;
|
|
@@ -11,6 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.addSlateRoutes = void 0;
|
|
13
13
|
function addSlateRoutes(app, details, proxy, unknownProxy) {
|
|
14
|
+
if (!details.isAlive === false) {
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
14
17
|
app.use(['/accounts', '/oauthorize', '/__catalyst'], (req, res) => {
|
|
15
18
|
req.url = req.originalUrl;
|
|
16
19
|
unknownProxy(req, res);
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
|
|
7
|
-
const
|
|
7
|
+
const index_1 = require("../../../../util_modules/logger/index");
|
|
8
8
|
exports.default = (proxyInstance, masterPort, customProxyUrl) => (req, res) => {
|
|
9
9
|
if (req.url.length === 1 && req.url.startsWith('/')) {
|
|
10
10
|
res.redirect('/app/');
|
|
@@ -15,16 +15,14 @@ exports.default = (proxyInstance, masterPort, customProxyUrl) => (req, res) => {
|
|
|
15
15
|
}
|
|
16
16
|
else if (typeof customProxyUrl === 'string' &&
|
|
17
17
|
!req.url.match(/^(\/baas|\/app|\/server|\/oauthorize|\/__catalyst).*/g)) {
|
|
18
|
-
(0,
|
|
18
|
+
(0, index_1.debug)(`proxying "${req.url}" to "${customProxyUrl}"`);
|
|
19
19
|
proxyInstance.web(req, res, {
|
|
20
20
|
target: customProxyUrl,
|
|
21
21
|
ws: true,
|
|
22
22
|
changeOrigin: true,
|
|
23
23
|
secure: false,
|
|
24
24
|
headers: {
|
|
25
|
-
'User-Agent': runtime_store_1.default.get('
|
|
26
|
-
'/' +
|
|
27
|
-
runtime_store_1.default.get('context.cli.package.version')
|
|
25
|
+
'User-Agent': runtime_store_1.default.get('cli.package.name') + '/' + runtime_store_1.default.get('cli.package.version')
|
|
28
26
|
}
|
|
29
27
|
});
|
|
30
28
|
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { IncomingMessage, ServerResponse } from 'http';
|
|
3
|
+
import { IAPIGLocal, IAPIGRules } from '../../../../apig-utils';
|
|
4
|
+
import Server from 'http-proxy';
|
|
5
|
+
import EventEmitter from 'events';
|
|
6
|
+
export interface IMatchRule extends IAPIGRules {
|
|
7
|
+
target_endpoint: string;
|
|
8
|
+
source_endpoint: string;
|
|
9
|
+
params: {
|
|
10
|
+
[x: string]: string;
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
declare class ServerEvent extends EventEmitter {
|
|
14
|
+
}
|
|
15
|
+
export declare const serverEvent: ServerEvent;
|
|
16
|
+
export declare const removeSecure: (str: string) => string;
|
|
17
|
+
export declare const redirectByAuth: (req: IncomingMessage, res: ServerResponse, redirectUrl: string) => void;
|
|
18
|
+
export declare const createProxyServer: (port: number) => Server;
|
|
19
|
+
export declare const proxyResponseHandler: ({ systemRoutes, signInRedirect }: {
|
|
20
|
+
systemRoutes?: IAPIGLocal | undefined;
|
|
21
|
+
signInRedirect?: string | undefined;
|
|
22
|
+
}) => (proxyRes: IncomingMessage, req: IncomingMessage, res: ServerResponse) => void;
|
|
23
|
+
export declare const appsailInitJs: () => Promise<string>;
|
|
24
|
+
export {};
|
|
@@ -12,14 +12,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.appsailInitJs = exports.proxyResponseHandler = exports.createProxyServer = exports.redirectByAuth = exports.removeSecure = void 0;
|
|
15
|
+
exports.appsailInitJs = exports.proxyResponseHandler = exports.createProxyServer = exports.redirectByAuth = exports.removeSecure = exports.serverEvent = void 0;
|
|
16
16
|
const http_1 = require("http");
|
|
17
17
|
const constants_1 = require("../../../../util_modules/constants");
|
|
18
18
|
const fs_1 = require("../../../../util_modules/fs");
|
|
19
19
|
const error_1 = __importDefault(require("../../../../error"));
|
|
20
20
|
const project_1 = require("../../../../util_modules/project");
|
|
21
21
|
const http_proxy_1 = require("http-proxy");
|
|
22
|
-
const
|
|
22
|
+
const index_1 = require("../../../../util_modules/logger/index");
|
|
23
|
+
const events_1 = __importDefault(require("events"));
|
|
24
|
+
class ServerEvent extends events_1.default {
|
|
25
|
+
}
|
|
26
|
+
exports.serverEvent = new ServerEvent();
|
|
23
27
|
const iam_cookies = [
|
|
24
28
|
'ZD_CSRF_TOKEN',
|
|
25
29
|
'_iamadt_client',
|
|
@@ -71,10 +75,10 @@ const createProxyServer = (port) => {
|
|
|
71
75
|
res.end(JSON.stringify({ error: 'unable to serve the request. ECONNRESET.' }));
|
|
72
76
|
console.log();
|
|
73
77
|
console.log('Connection reset while trying to serve the request ', req.url);
|
|
74
|
-
(0,
|
|
78
|
+
(0, index_1.debug)('Connection reset from target URL : ', targetUrl);
|
|
75
79
|
console.error(err);
|
|
76
80
|
})
|
|
77
|
-
.on('close', () => (0,
|
|
81
|
+
.on('close', () => (0, index_1.debug)('proxy closed'));
|
|
78
82
|
return proxy;
|
|
79
83
|
};
|
|
80
84
|
exports.createProxyServer = createProxyServer;
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Express, Request, Response } from 'express';
|
|
2
|
+
import { IServerDetails } from '../..';
|
|
3
|
+
import { IClientTarget } from '../web_client/types';
|
|
4
|
+
import Server from 'http-proxy';
|
|
5
|
+
export declare function addWebClientRoutes(app: Express, details: IServerDetails<IClientTarget>, proxy: Server, unknownProxy: (req: Request, res: Response) => void): void;
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ChildProcess } from 'child_process';
|
|
2
|
+
import { IFnTarget } from '../../../../fn-utils/lib/common';
|
|
3
|
+
import { IServerDetails } from '../../index.js';
|
|
4
|
+
import { ContainerEvents } from '@zcatalyst/container-plugin/';
|
|
5
|
+
declare const _default: (details: IServerDetails<IFnTarget>) => Promise<ChildProcess | ContainerEvents>;
|
|
6
|
+
export default _default;
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
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);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
26
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
27
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -23,21 +46,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
23
46
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
47
|
};
|
|
25
48
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
const ansi_colors_1 = require("ansi-colors");
|
|
27
49
|
const path_1 = require("path");
|
|
28
|
-
const stream_1 = require("stream");
|
|
29
50
|
const error_1 = __importDefault(require("../../../../error"));
|
|
30
|
-
const plugin_loader_1 = __importDefault(require("../../../../plugin-loader"));
|
|
31
51
|
const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
|
|
32
52
|
const constants_1 = require("../../../../util_modules/constants");
|
|
33
|
-
const
|
|
53
|
+
const index_1 = require("../../../../util_modules/logger/index");
|
|
34
54
|
const project_1 = require("../../../../util_modules/project");
|
|
35
55
|
const shell_1 = require("../../../../util_modules/shell");
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
56
|
+
const container_1 = require("../../../../util_modules/container");
|
|
57
|
+
const container_plugin_1 = require("@zcatalyst/container-plugin/");
|
|
58
|
+
exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
|
|
59
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
60
|
+
if (!details.target) {
|
|
61
|
+
throw new error_1.default('Invalid Node function target', { exit: 2 });
|
|
62
|
+
}
|
|
40
63
|
const projectRoot = runtime_store_1.default.get('project.root');
|
|
64
|
+
const targetSource = (_a = details.target) === null || _a === void 0 ? void 0 : _a.source;
|
|
65
|
+
const codeLocation = (_b = details.target) === null || _b === void 0 ? void 0 : _b.build;
|
|
66
|
+
if ((0, container_1.isContainer)()) {
|
|
67
|
+
(0, index_1.debug)('using container to serve the function: ' + ((_c = details.target) === null || _c === void 0 ? void 0 : _c.name));
|
|
68
|
+
const container = yield Promise.resolve().then(() => __importStar(require('@zcatalyst/container-plugin')));
|
|
69
|
+
details.target.env_var = Object.assign({ X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_d = details.target) === null || _d === void 0 ? void 0 : _d.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: '/catalyst', CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)(), X_ZOHO_ADMIN_CRED_TOKEN: 'Unknown', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[(_e = details.target) === null || _e === void 0 ? void 0 : _e.type] }, (_f = details.target) === null || _f === void 0 ? void 0 : _f.env_var);
|
|
70
|
+
return container.start({
|
|
71
|
+
details: details,
|
|
72
|
+
projectId: (0, project_1.getProjectId)(),
|
|
73
|
+
ruok: details.debugPort !== undefined && details.debugPort !== -1
|
|
74
|
+
? container_plugin_1.RUOK.SKIP
|
|
75
|
+
: container_plugin_1.RUOK.FINITE
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
const label = `${details.type}[${(_g = details.target) === null || _g === void 0 ? void 0 : _g.name}]`;
|
|
79
|
+
const _o = details.target, { ['watcher']: _ } = _o, serialisableTarget = __rest(_o, ['watcher']);
|
|
41
80
|
serialisableTarget.index = serialisableTarget.index
|
|
42
81
|
? serialisableTarget.index.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build))
|
|
43
82
|
: undefined;
|
|
@@ -45,49 +84,21 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
|
|
|
45
84
|
(0, path_1.join)(__dirname, 'server'),
|
|
46
85
|
details.httpPort + '',
|
|
47
86
|
JSON.stringify({
|
|
48
|
-
index: ((
|
|
87
|
+
index: ((_h = details.target) === null || _h === void 0 ? void 0 : _h.index)
|
|
49
88
|
? details.target.index.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build))
|
|
50
89
|
: undefined,
|
|
51
|
-
name: (
|
|
52
|
-
type: (
|
|
53
|
-
source: (
|
|
90
|
+
name: (_j = details.target) === null || _j === void 0 ? void 0 : _j.name,
|
|
91
|
+
type: (_k = details.target) === null || _k === void 0 ? void 0 : _k.type,
|
|
92
|
+
source: (_l = details.target) === null || _l === void 0 ? void 0 : _l.source
|
|
54
93
|
})
|
|
55
94
|
];
|
|
56
95
|
if (details.debugPort !== -1) {
|
|
57
|
-
(0,
|
|
96
|
+
(0, index_1.labeled)(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
|
|
58
97
|
opts.unshift('--inspect=' + details.debugPort);
|
|
59
98
|
}
|
|
60
|
-
const targetSource = (_f = details.target) === null || _f === void 0 ? void 0 : _f.source;
|
|
61
|
-
const servePlugin = yield (0, plugin_loader_1.default)('functions', 'start', targetSource).catch((err) => (0, logger_1.debug)(err));
|
|
62
|
-
if (typeof servePlugin === 'function') {
|
|
63
|
-
const logStreamPlugin = yield (0, plugin_loader_1.default)('functions', 'logs', targetSource).catch((err) => (0, logger_1.debug)(err));
|
|
64
|
-
if (typeof logStreamPlugin === 'function') {
|
|
65
|
-
const stream = yield logStreamPlugin();
|
|
66
|
-
if (stream instanceof stream_1.Stream) {
|
|
67
|
-
const streamLogFn = (chunk) => (0, logger_1.log)('info', chunk.toString(), true);
|
|
68
|
-
stream.on('data', streamLogFn);
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
const event = servePlugin(details, masterPort).catch((e) => {
|
|
72
|
-
var _a;
|
|
73
|
-
const err = error_1.default.getErrorInstance(e, {
|
|
74
|
-
fileName: __filename,
|
|
75
|
-
skipHelp: false
|
|
76
|
-
});
|
|
77
|
-
err.errorId = 'SERVE-IDX-1';
|
|
78
|
-
err.arg = [
|
|
79
|
-
'functions',
|
|
80
|
-
(0, ansi_colors_1.bold)(((_a = details.target.plugins) === null || _a === void 0 ? void 0 : _a.start)[targetSource] || 'start'),
|
|
81
|
-
(0, ansi_colors_1.bold)('Error: ') + ansi_colors_1.italic.red(err.message)
|
|
82
|
-
];
|
|
83
|
-
throw err;
|
|
84
|
-
});
|
|
85
|
-
(0, logger_1.labeled)(label, `Plugin : "${runtime_store_1.default.get(`context.functions.plugins.start${targetSource ? '.' + targetSource : ''}`)}" is used for ${details.type} serve`).MESSAGE();
|
|
86
|
-
return event;
|
|
87
|
-
}
|
|
88
99
|
return (0, shell_1.spawn)('node', opts, {
|
|
89
|
-
cwd:
|
|
100
|
+
cwd: codeLocation,
|
|
90
101
|
stdio: 'pipe',
|
|
91
|
-
env: Object.assign({ NODE_PATH: targetSource + path_1.sep + 'node_modules', X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (
|
|
102
|
+
env: Object.assign({ NODE_PATH: targetSource + path_1.sep + 'node_modules', X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_m = details.target) === null || _m === void 0 ? void 0 : _m.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), CHROME_EXECUTABLE_PATH: runtime_store_1.default.get('CHROME_EXECUTABLE', process.env.CHROME_EXECUTABLE_PATH), CHROMEDRIVER_EXECUTABLE_PATH: runtime_store_1.default.get('CHROME_DRIVER_EXECUTABLE', process.env.CHROMEDRIVER_EXECUTABLE_PATH) }, details.target.env_var)
|
|
92
103
|
}).RAW();
|
|
93
104
|
});
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
2
|
+
import { IncomingMessage, Server, ServerResponse } from 'http';
|
|
3
|
+
import { inspect } from 'util';
|
|
4
|
+
|
|
5
|
+
const endTime = 30 * 1000 + Date.now();
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
*
|
|
9
|
+
* @param {IncomingMessage} req
|
|
10
|
+
* @param {ServerResponse} res
|
|
11
|
+
* @returns
|
|
12
|
+
*/
|
|
13
|
+
function buildContext(req, res, locals) {
|
|
14
|
+
const catalystHeaders = {};
|
|
15
|
+
Object.entries(req.headers).forEach(([header, value]) => {
|
|
16
|
+
const _header = header.toLowerCase();
|
|
17
|
+
if (_header.startsWith('x-zc-')) {
|
|
18
|
+
catalystHeaders[_header] = value;
|
|
19
|
+
}
|
|
20
|
+
});
|
|
21
|
+
return {
|
|
22
|
+
catalystHeaders,
|
|
23
|
+
getMaxExecutionTimeMs: () => 30 * 1000, // 30 sec
|
|
24
|
+
getRemainingExecutionTimeMs: () => endTime - Date.now(),
|
|
25
|
+
close: () => {
|
|
26
|
+
const _finalRes = JSON.stringify({
|
|
27
|
+
output: locals.finalResponse || ''
|
|
28
|
+
});
|
|
29
|
+
res.setHeader('Content-Type', 'application/json');
|
|
30
|
+
res.setHeader('Content-Length', _finalRes.length);
|
|
31
|
+
res.write(_finalRes);
|
|
32
|
+
},
|
|
33
|
+
// eslint-disable-next-line no-console
|
|
34
|
+
log: (...params) => console.log(...params)
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
*
|
|
40
|
+
* @param {IncomingMessage} req
|
|
41
|
+
* @param {ServerResponse} res
|
|
42
|
+
* @returns
|
|
43
|
+
*/
|
|
44
|
+
async function buildBasicIO(req, res, locals) {
|
|
45
|
+
const urlParts = new URL(`http://${req.headers.host}${req.url}`).searchParams;
|
|
46
|
+
const userData = JSON.stringify(Object.fromEntries(urlParts.entries()));
|
|
47
|
+
|
|
48
|
+
const body = await new Promise((resolve, reject) => {
|
|
49
|
+
const buff = [];
|
|
50
|
+
req.on('data', (ch) => buff.push(ch));
|
|
51
|
+
req.on('end', () => {
|
|
52
|
+
try {
|
|
53
|
+
const _jsonStr = Buffer.concat(buff).toString();
|
|
54
|
+
resolve(_jsonStr ? JSON.parse(_jsonStr) : {});
|
|
55
|
+
} catch (er) {
|
|
56
|
+
reject(er);
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
req.on('error', reject);
|
|
60
|
+
});
|
|
61
|
+
const basicIO = {
|
|
62
|
+
write: (VALUE) => {
|
|
63
|
+
if (!typeof VALUE === 'string') {
|
|
64
|
+
// eslint-disable-next-line no-console
|
|
65
|
+
console.error(`Expected string but ${typeof VALUE} found!.`);
|
|
66
|
+
} else {
|
|
67
|
+
const _res = VALUE.substring(0, 1 * 1024);
|
|
68
|
+
// eslint-disable-next-line no-console
|
|
69
|
+
console.log(_res);
|
|
70
|
+
locals.finalResponse += _res;
|
|
71
|
+
}
|
|
72
|
+
},
|
|
73
|
+
getArgument: (KEY) => userData[KEY] || body[KEY],
|
|
74
|
+
getAllArguments: () => (userData && Object.keys(userData).length > 0 ? userData : body),
|
|
75
|
+
/**
|
|
76
|
+
* @deprecated use get getArgument instead.
|
|
77
|
+
*/
|
|
78
|
+
getParameter: (KEY) => {
|
|
79
|
+
// eslint-disable-next-line no-console
|
|
80
|
+
console.error(
|
|
81
|
+
'CatalystDeprecationWarning: basicIO.getParameter() is deprecated due to usability issues. Please use basicIO.getArgument() method instead.'
|
|
82
|
+
);
|
|
83
|
+
return basicIO.getArgument(KEY);
|
|
84
|
+
},
|
|
85
|
+
/**
|
|
86
|
+
* @deprecated use get getAllArgument instead.
|
|
87
|
+
*/
|
|
88
|
+
getAllParameters: () => {
|
|
89
|
+
// eslint-disable-next-line no-console
|
|
90
|
+
console.error(
|
|
91
|
+
'CatalystDeprecationWarning: basicIO.getAllParameters() is deprecated due to usability issues. Please use basicIO.getAllArgument() method instead.'
|
|
92
|
+
);
|
|
93
|
+
return basicIO.getAllArguments();
|
|
94
|
+
},
|
|
95
|
+
setStatus: (status) => {
|
|
96
|
+
res.statusCode = status;
|
|
97
|
+
}
|
|
98
|
+
};
|
|
99
|
+
return basicIO;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
/**
|
|
103
|
+
* BasicIO handler
|
|
104
|
+
*/
|
|
105
|
+
export default (index, targetName, type) => async (req, res) => {
|
|
106
|
+
try {
|
|
107
|
+
if (index === undefined) {
|
|
108
|
+
throw new Error(`index of ${type} function is undefined`);
|
|
109
|
+
}
|
|
110
|
+
const userModule = await import(index);
|
|
111
|
+
if (type !== 'bio') {
|
|
112
|
+
throw new Error('Invalid URL pattern for the functions type: ' + type);
|
|
113
|
+
}
|
|
114
|
+
if (!('default' in userModule)) {
|
|
115
|
+
throw new Error('Could not find any default export');
|
|
116
|
+
}
|
|
117
|
+
if (typeof userModule.default !== 'function') {
|
|
118
|
+
throw new Error('The default export is not a function');
|
|
119
|
+
}
|
|
120
|
+
const locals = {
|
|
121
|
+
finalResponse: ''
|
|
122
|
+
};
|
|
123
|
+
const context = buildContext(req, res, locals);
|
|
124
|
+
const basicIO = await buildBasicIO(req, res, locals);
|
|
125
|
+
await userModule.default(context, basicIO);
|
|
126
|
+
} catch (e) {
|
|
127
|
+
const errorString = inspect(e);
|
|
128
|
+
// eslint-disable-next-line no-console
|
|
129
|
+
console.error('[' + targetName + '] ' + errorString);
|
|
130
|
+
res.writeHead(500);
|
|
131
|
+
res.end(errorString);
|
|
132
|
+
}
|
|
133
|
+
};
|
|
@@ -7,7 +7,7 @@ import PUPPETEER_HANDLER from './utils/puppeteer-handler.js';
|
|
|
7
7
|
|
|
8
8
|
export const constructFunctionParameters = async (REQUEST, RESPONSE, path) => {
|
|
9
9
|
const browser = await PUPPETEER_HANDLER.getBrowser(path);
|
|
10
|
-
const context = await browser.createIncognitoBrowserContext();
|
|
10
|
+
const context = 'createIncognitoBrowserContext' in browser ? await browser.createIncognitoBrowserContext() : await browser.createBrowserContext();
|
|
11
11
|
const page = await context.newPage();
|
|
12
12
|
return [REQUEST, RESPONSE, page];
|
|
13
13
|
};
|
|
@@ -67,7 +67,28 @@ const browserLogicHandler = async (req, res) => {
|
|
|
67
67
|
}
|
|
68
68
|
};
|
|
69
69
|
|
|
70
|
-
const
|
|
70
|
+
const bioHandler = async (req, res) => {
|
|
71
|
+
return (await import('./bio.js')).default(index, targetName, type)(req, res);
|
|
72
|
+
};
|
|
73
|
+
|
|
74
|
+
function getHandler() {
|
|
75
|
+
switch (type) {
|
|
76
|
+
case 'browserlogic': {
|
|
77
|
+
return browserLogicHandler;
|
|
78
|
+
}
|
|
79
|
+
case 'aio': {
|
|
80
|
+
return aioHandler;
|
|
81
|
+
}
|
|
82
|
+
case 'bio': {
|
|
83
|
+
return bioHandler;
|
|
84
|
+
}
|
|
85
|
+
default: {
|
|
86
|
+
throw Error('Invalid function type: ', type);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
const server = createServer(getHandler());
|
|
71
92
|
|
|
72
93
|
server.listen(listenPort, '127.0.0.1').on('error', (err) => {
|
|
73
94
|
// eslint-disable-next-line no-console
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ChildProcess } from 'child_process';
|
|
2
|
+
import { IServerDetails } from '../..';
|
|
3
|
+
import { IFnTarget, PythonFn } from '../../../../fn-utils/lib/common';
|
|
4
|
+
import { ContainerEvents } from '@zcatalyst/container-plugin';
|
|
5
|
+
declare const _default: (details: IServerDetails<IFnTarget<PythonFn>>) => Promise<ChildProcess | ContainerEvents>;
|
|
6
|
+
export default _default;
|