@forge/tunnel 3.5.1 → 3.5.2-next.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/CHANGELOG.md +8 -0
- package/out/command/interactors/function-change-watcher.d.ts +2 -3
- package/out/command/interactors/function-change-watcher.d.ts.map +1 -1
- package/out/command/interactors/function-change-watcher.js +2 -3
- package/out/servers/dev-server.d.ts +2 -3
- package/out/servers/dev-server.d.ts.map +1 -1
- package/out/servers/dev-server.js +3 -4
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ConfigFile,
|
|
1
|
+
import { ConfigFile, Logger } from '@forge/cli-shared';
|
|
2
2
|
import { BundlerOutput } from '@forge/bundler';
|
|
3
3
|
import { Sandbox, SandboxConfig, SnapshotCreator } from '@forge/runtime';
|
|
4
4
|
export interface FunctionChangeWatcher {
|
|
@@ -18,9 +18,8 @@ export declare class LocalFunctionHost implements FunctionChangeWatcher {
|
|
|
18
18
|
private readonly logger;
|
|
19
19
|
private readonly snapshot;
|
|
20
20
|
private readonly createSandbox;
|
|
21
|
-
private readonly featureFlags;
|
|
22
21
|
private snapshotLogs;
|
|
23
|
-
constructor(configFile: ConfigFile, logger: Logger, snapshot: SnapshotCreator | null, createSandbox: (cfg: SandboxConfig) => Promise<Sandbox
|
|
22
|
+
constructor(configFile: ConfigFile, logger: Logger, snapshot: SnapshotCreator | null, createSandbox: (cfg: SandboxConfig) => Promise<Sandbox>);
|
|
24
23
|
private generateBundleFiles;
|
|
25
24
|
startWatching(bundledCode: BundlerOutput): Promise<void>;
|
|
26
25
|
stopWatching(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function-change-watcher.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/function-change-watcher.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"function-change-watcher.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/function-change-watcher.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAA8B,MAAM,EAAqB,MAAM,mBAAmB,CAAC;AACtG,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAIL,OAAO,EACP,aAAa,EACb,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,qBAAqB;IACpC,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,MAAM;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,uBAAuB,EAAE,MAAM,CAAC;IAChC,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,YAAY,MAAM,CAAC;AAEhC,qBAAa,iBAAkB,YAAW,qBAAqB;IAI3D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa;IANhC,OAAO,CAAC,YAAY,CAA8C;gBAG/C,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,eAAe,GAAG,IAAI,EAChC,aAAa,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC;YAG5D,mBAAmB;IA2BpB,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CxD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C,OAAO,CAAC,YAAY,CAElB;YAEY,mBAAmB;CAsBlC"}
|
|
@@ -11,12 +11,11 @@ const util_1 = require("../../util");
|
|
|
11
11
|
exports.INVOCATION_TIMEOUT = 25;
|
|
12
12
|
exports.MEMORY_LIMIT = 256;
|
|
13
13
|
class LocalFunctionHost {
|
|
14
|
-
constructor(configFile, logger, snapshot, createSandbox
|
|
14
|
+
constructor(configFile, logger, snapshot, createSandbox) {
|
|
15
15
|
this.configFile = configFile;
|
|
16
16
|
this.logger = logger;
|
|
17
17
|
this.snapshot = snapshot;
|
|
18
18
|
this.createSandbox = createSandbox;
|
|
19
|
-
this.featureFlags = featureFlags;
|
|
20
19
|
this.snapshotLogs = [];
|
|
21
20
|
this.onRuntimeLog = (event) => {
|
|
22
21
|
this.logger.info((0, util_1.formatRuntimeLog)(event));
|
|
@@ -43,7 +42,7 @@ class LocalFunctionHost {
|
|
|
43
42
|
}
|
|
44
43
|
async startWatching(bundledCode) {
|
|
45
44
|
const directory = tmp_1.default.dirSync({ prefix: 'tunnel' }).name;
|
|
46
|
-
const isSnapshotEnabled = (await this.configFile.snapshotsEnabled()) && !(await this.
|
|
45
|
+
const isSnapshotEnabled = (await this.configFile.snapshotsEnabled()) && !((await this.configFile.runtimeType()) === cli_shared_1.RuntimeType.nodejs);
|
|
47
46
|
if (isSnapshotEnabled) {
|
|
48
47
|
this.logger.info('');
|
|
49
48
|
this.logger.info(cli_shared_1.Text.tunnel.preBundleTask(cli_shared_1.Text.tunnel.snapshotting));
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import express from 'express';
|
|
4
4
|
import * as http from 'http';
|
|
5
5
|
import { URL } from 'url';
|
|
6
|
-
import { ConfigFile,
|
|
6
|
+
import { ConfigFile, Logger } from '@forge/cli-shared';
|
|
7
7
|
import { ExternalRequestBody } from '@forge/runtime';
|
|
8
8
|
import { Permissions, Remotes } from '@forge/manifest';
|
|
9
9
|
import { BundlerOutput } from '@forge/bundler';
|
|
@@ -30,12 +30,11 @@ export declare class LocalDevelopmentServer implements DevelopmentServer {
|
|
|
30
30
|
private readonly invocationService;
|
|
31
31
|
private readonly logger;
|
|
32
32
|
private readonly configFile;
|
|
33
|
-
private readonly featureFlags;
|
|
34
33
|
private app;
|
|
35
34
|
private httpServer;
|
|
36
35
|
private permissions;
|
|
37
36
|
private remotes;
|
|
38
|
-
constructor(invocationService: InvocationService, logger: Logger, configFile: ConfigFile
|
|
37
|
+
constructor(invocationService: InvocationService, logger: Logger, configFile: ConfigFile);
|
|
39
38
|
start(port?: number, permissions?: Permissions, remotes?: Remotes): Promise<StartDevServerResult>;
|
|
40
39
|
stop(): Promise<void>;
|
|
41
40
|
compileAndWatch({ onBuildWillStart, onBuildFinished }: WatchHooks<BundlerOutput>): Promise<BundlerOutput | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/servers/dev-server.ts"],"names":[],"mappings":";;AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/servers/dev-server.ts"],"names":[],"mappings":";;AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAY,MAAM,EAAqB,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAe,MAAM,gBAAgB,CAAC;AAGlE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,aAAa,EAMd,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,GAAG;IACjC,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,eAAe,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE;AACD,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAClG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,iBAAiB,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACrE;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ/E;AAED,qBAAa,sBAAuB,YAAW,iBAAiB;IAO5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,OAAO,CAAsB;gBAGlB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU;IAQ5B,KAAK,CAAC,IAAI,SAAI,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAe5F,IAAI;IAIJ,eAAe,CAAC,EAC3B,gBAAgB,EAChB,eAAe,EAChB,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAsD1D,MAAM,IAAI,OAAO,CAAC,WAAW;IAI7B,gBAAgB,EAAE,OAAO,CAAC,OAAO,CA2CtC;CACH"}
|
|
@@ -19,11 +19,10 @@ async function stopServer(server) {
|
|
|
19
19
|
}
|
|
20
20
|
exports.stopServer = stopServer;
|
|
21
21
|
class LocalDevelopmentServer {
|
|
22
|
-
constructor(invocationService, logger, configFile
|
|
22
|
+
constructor(invocationService, logger, configFile) {
|
|
23
23
|
this.invocationService = invocationService;
|
|
24
24
|
this.logger = logger;
|
|
25
25
|
this.configFile = configFile;
|
|
26
|
-
this.featureFlags = featureFlags;
|
|
27
26
|
this.handleInvocation = async (req, res) => {
|
|
28
27
|
var _a, _b, _c, _d, _e, _f;
|
|
29
28
|
const request = req.body;
|
|
@@ -43,7 +42,7 @@ class LocalDevelopmentServer {
|
|
|
43
42
|
request._meta = Object.assign(Object.assign({}, request._meta), { fetchAllowList: allowList });
|
|
44
43
|
try {
|
|
45
44
|
const invokeResults = await this.invocationService.invoke(request.handler, request);
|
|
46
|
-
if ((await this.
|
|
45
|
+
if ((await this.configFile.runtimeType()) === cli_shared_1.RuntimeType.nodejs && !invokeResults.success) {
|
|
47
46
|
return res.status(500).send(invokeResults.error);
|
|
48
47
|
}
|
|
49
48
|
res.json(invokeResults);
|
|
@@ -82,7 +81,7 @@ class LocalDevelopmentServer {
|
|
|
82
81
|
if (!entryPoints.length) {
|
|
83
82
|
return;
|
|
84
83
|
}
|
|
85
|
-
const getConfig = (await this.
|
|
84
|
+
const getConfig = (await this.configFile.runtimeType()) === cli_shared_1.RuntimeType.nodejs
|
|
86
85
|
? bundler_2.getNodeRuntimeBuildConfig
|
|
87
86
|
: bundler_2.getSandboxedRuntimeBuildConfig;
|
|
88
87
|
const config = getConfig(entryPoints, {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/tunnel",
|
|
3
|
-
"version": "3.5.
|
|
3
|
+
"version": "3.5.2-next.0",
|
|
4
4
|
"description": "Tunnel functionality for Forge CLI",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
"compile": "tsc -b -v"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@forge/bundler": "4.9.0",
|
|
15
|
-
"@forge/cli-shared": "3.
|
|
14
|
+
"@forge/bundler": "4.9.1-next.0",
|
|
15
|
+
"@forge/cli-shared": "3.14.0-next.0",
|
|
16
16
|
"@forge/csp": "2.1.3",
|
|
17
17
|
"@forge/runtime": "4.4.1",
|
|
18
18
|
"express": "^4.17.1",
|