ntfy-reverse-proxy 2.2.1 → 2.4.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/README.md +1 -1
- package/build/config.sample.json +4 -1
- package/build/src/cli/commands/context.d.ts +3 -2
- package/build/src/cli/commands/context.d.ts.map +1 -1
- package/build/src/cli/commands/context.js +13 -1
- package/build/src/cli/commands/context.js.map +1 -1
- package/build/src/cli/commands/deploy.d.ts.map +1 -1
- package/build/src/cli/commands/deploy.js +34 -26
- package/build/src/cli/commands/deploy.js.map +1 -1
- package/build/src/cli/commands/generate.d.ts +3 -2
- package/build/src/cli/commands/generate.d.ts.map +1 -1
- package/build/src/cli/commands/generate.js +33 -23
- package/build/src/cli/commands/generate.js.map +1 -1
- package/build/src/cli/commands/server.d.ts.map +1 -1
- package/build/src/cli/commands/server.js +3 -0
- package/build/src/cli/commands/server.js.map +1 -1
- package/build/src/cli/commands/settings.d.ts.map +1 -1
- package/build/src/cli/commands/settings.js +7 -4
- package/build/src/cli/commands/settings.js.map +1 -1
- package/build/src/cli/index.d.ts.map +1 -1
- package/build/src/cli/index.js +5 -4
- package/build/src/cli/index.js.map +1 -1
- package/build/src/cli/menu/interactive.d.ts.map +1 -1
- package/build/src/cli/menu/interactive.js +137 -19
- package/build/src/cli/menu/interactive.js.map +1 -1
- package/build/src/lib/package-runtime.d.ts +3 -2
- package/build/src/lib/package-runtime.d.ts.map +1 -1
- package/build/src/lib/package-runtime.js +5 -1
- package/build/src/lib/package-runtime.js.map +1 -1
- package/build/src/lib/regex.d.ts +2 -1
- package/build/src/lib/regex.d.ts.map +1 -1
- package/build/src/lib/regex.js +2 -1
- package/build/src/lib/regex.js.map +1 -1
- package/build/src/lib/schema.d.ts +51 -1
- package/build/src/lib/schema.d.ts.map +1 -1
- package/build/src/lib/schema.js +23 -4
- package/build/src/lib/schema.js.map +1 -1
- package/build/src/types/cli/commands/context.d.ts +7 -0
- package/build/src/types/cli/commands/deploy.d.ts +9 -5
- package/build/src/types/cli/commands/generate.d.ts +19 -17
- package/build/src/types/cli/commands/settings.d.ts +2 -0
- package/build/src/types/cli/menu/interactive.d.ts +19 -3
- package/build/src/types/lib/package-runtime.d.ts +7 -0
- package/build/src/types/lib/schema.d.ts +16 -1
- package/build/src/types/tests/cli/commands/context.test.d.ts +59 -0
- package/build/src/types/tests/cli/commands/generate.test.d.ts +42 -14
- package/build/src/types/tests/cli/commands/server.test.d.ts +7 -0
- package/build/src/types/tests/cli/menu/interactive.test.d.ts +25 -0
- package/build/src/types/tests/lib/schema.test.d.ts +58 -0
- package/build/src/types/tests/worker/durable-objects/delivery-outbox.test.d.ts +413 -0
- package/build/src/types/tests/worker/index.test.d.ts +175 -1
- package/build/src/types/tests/worker/interpreters/app-payload.test.d.ts +77 -0
- package/build/src/types/tests/worker/interpreters/discord-stonker-bot.test.d.ts +23 -0
- package/build/src/types/tests/worker/interpreters/mailmask.test.d.ts +103 -0
- package/build/src/types/tests/worker/interpreters/ntfy-json.test.d.ts +7 -15
- package/build/src/types/tests/worker/interpreters/outpost.test.d.ts +23 -0
- package/build/src/types/tests/worker/interpreters/pfsense-actions.test.d.ts +23 -0
- package/build/src/types/tests/worker/interpreters/plain-text.test.d.ts +20 -20
- package/build/src/types/tests/worker/interpreters/statuspage.test.d.ts +7 -0
- package/build/src/types/tests/worker/interpreters/transmission-vpn.test.d.ts +23 -0
- package/build/src/types/tests/worker/landing/page.test.d.ts +11 -0
- package/build/src/types/tests/worker/pipeline/deliver.test.d.ts +2 -2
- package/build/src/types/tests/worker/pipeline/drain-fifo.test.d.ts +146 -2
- package/build/src/types/tests/worker/pipeline/interpret.test.d.ts +2 -0
- package/build/src/types/tests/worker/pipeline/session.test.d.ts +140 -0
- package/build/src/types/worker/durable-objects/delivery-outbox.d.ts +394 -19
- package/build/src/types/worker/handlers.d.ts +15 -1
- package/build/src/types/worker/index.d.ts +53 -69
- package/build/src/types/worker/interpreters/app-payload.d.ts +76 -0
- package/build/src/types/worker/interpreters/discord-stonker-bot.d.ts +29 -0
- package/build/src/types/worker/interpreters/mailmask.d.ts +91 -0
- package/build/src/types/worker/interpreters/ntfy-json.d.ts +1 -1
- package/build/src/types/worker/interpreters/outpost.d.ts +29 -0
- package/build/src/types/worker/interpreters/pfsense-actions.d.ts +29 -0
- package/build/src/types/worker/interpreters/plain-text.d.ts +0 -2
- package/build/src/types/worker/interpreters/transmission-vpn.d.ts +29 -0
- package/build/src/types/worker/pipeline/deliver.d.ts +21 -2
- package/build/src/types/worker/pipeline/drain-fifo.d.ts +29 -5
- package/build/src/types/worker/pipeline/session.d.ts +228 -0
- package/build/src/worker/durable-objects/delivery-outbox.d.ts +4 -2
- package/build/src/worker/durable-objects/delivery-outbox.d.ts.map +1 -1
- package/build/src/worker/durable-objects/delivery-outbox.js +216 -21
- package/build/src/worker/durable-objects/delivery-outbox.js.map +1 -1
- package/build/src/worker/handlers.d.ts.map +1 -1
- package/build/src/worker/handlers.js +64 -8
- package/build/src/worker/handlers.js.map +1 -1
- package/build/src/worker/index.d.ts +3 -4
- package/build/src/worker/index.d.ts.map +1 -1
- package/build/src/worker/index.js +46 -79
- package/build/src/worker/index.js.map +1 -1
- package/build/src/worker/interpreters/app-payload.d.ts +4 -0
- package/build/src/worker/interpreters/app-payload.d.ts.map +1 -0
- package/build/src/worker/interpreters/app-payload.js +63 -0
- package/build/src/worker/interpreters/app-payload.js.map +1 -0
- package/build/src/worker/interpreters/discord-stonker-bot.d.ts +4 -0
- package/build/src/worker/interpreters/discord-stonker-bot.d.ts.map +1 -0
- package/build/src/worker/interpreters/discord-stonker-bot.js +10 -0
- package/build/src/worker/interpreters/discord-stonker-bot.js.map +1 -0
- package/build/src/worker/interpreters/mailmask.d.ts +4 -0
- package/build/src/worker/interpreters/mailmask.d.ts.map +1 -0
- package/build/src/worker/interpreters/mailmask.js +49 -0
- package/build/src/worker/interpreters/mailmask.js.map +1 -0
- package/build/src/worker/interpreters/ntfy-json.d.ts.map +1 -1
- package/build/src/worker/interpreters/ntfy-json.js +2 -12
- package/build/src/worker/interpreters/ntfy-json.js.map +1 -1
- package/build/src/worker/interpreters/outpost.d.ts +4 -0
- package/build/src/worker/interpreters/outpost.d.ts.map +1 -0
- package/build/src/worker/interpreters/outpost.js +10 -0
- package/build/src/worker/interpreters/outpost.js.map +1 -0
- package/build/src/worker/interpreters/pfsense-actions.d.ts +4 -0
- package/build/src/worker/interpreters/pfsense-actions.d.ts.map +1 -0
- package/build/src/worker/interpreters/pfsense-actions.js +10 -0
- package/build/src/worker/interpreters/pfsense-actions.js.map +1 -0
- package/build/src/worker/interpreters/plain-text.d.ts.map +1 -1
- package/build/src/worker/interpreters/plain-text.js +6 -4
- package/build/src/worker/interpreters/plain-text.js.map +1 -1
- package/build/src/worker/interpreters/statuspage.d.ts.map +1 -1
- package/build/src/worker/interpreters/statuspage.js +2 -12
- package/build/src/worker/interpreters/statuspage.js.map +1 -1
- package/build/src/worker/interpreters/transmission-vpn.d.ts +4 -0
- package/build/src/worker/interpreters/transmission-vpn.d.ts.map +1 -0
- package/build/src/worker/interpreters/transmission-vpn.js +10 -0
- package/build/src/worker/interpreters/transmission-vpn.js.map +1 -0
- package/build/src/worker/landing/page.d.ts.map +1 -1
- package/build/src/worker/landing/page.js +151 -107
- package/build/src/worker/landing/page.js.map +1 -1
- package/build/src/worker/pipeline/deliver.d.ts.map +1 -1
- package/build/src/worker/pipeline/deliver.js +3 -0
- package/build/src/worker/pipeline/deliver.js.map +1 -1
- package/build/src/worker/pipeline/drain-fifo.d.ts.map +1 -1
- package/build/src/worker/pipeline/drain-fifo.js +33 -7
- package/build/src/worker/pipeline/drain-fifo.js.map +1 -1
- package/build/src/worker/pipeline/interpret.d.ts.map +1 -1
- package/build/src/worker/pipeline/interpret.js +10 -0
- package/build/src/worker/pipeline/interpret.js.map +1 -1
- package/build/src/worker/pipeline/session.d.ts +6 -0
- package/build/src/worker/pipeline/session.d.ts.map +1 -0
- package/build/src/worker/pipeline/session.js +192 -0
- package/build/src/worker/pipeline/session.js.map +1 -0
- package/package.json +8 -4
package/README.md
CHANGED
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
<!-- nova-region: introduction -->
|
|
44
44
|
## Introduction
|
|
45
45
|
|
|
46
|
-
Webhook and email notification gateway with built-in interpreters (Statuspage.io, Synology DSM, Seerr, pfSense, UniFi, ntfy JSON, plain text), automatic primary/fallback server failover, and smart message splitting, powered by Cloudflare Workers and Cloudflare Email Routing. Interactive CLI for configuration, validation, and deployment.
|
|
46
|
+
Webhook and email notification gateway with built-in interpreters (Statuspage.io, Synology DSM, Seerr, pfSense, UniFi, Transmission VPN, pfSense Actions, Discord Stonker Bot, Outpost, ntfy JSON, plain text), automatic primary/fallback server failover, and smart message splitting, powered by Cloudflare Workers and Cloudflare Email Routing. Interactive CLI for configuration, validation, and deployment.
|
|
47
47
|
<!-- nova-region-end: introduction -->
|
|
48
48
|
|
|
49
49
|
<!-- nova-region: documentation -->
|
package/build/config.sample.json
CHANGED
|
@@ -58,7 +58,10 @@
|
|
|
58
58
|
"mode": "send-once",
|
|
59
59
|
"show_visitor_info": true,
|
|
60
60
|
"primary_server": "primary",
|
|
61
|
-
"servers": ["primary"]
|
|
61
|
+
"servers": ["primary"],
|
|
62
|
+
"session": {
|
|
63
|
+
"secret": "replace_with_a_session_secret_of_32_or_more_characters"
|
|
64
|
+
}
|
|
62
65
|
},
|
|
63
66
|
{
|
|
64
67
|
"id": "pfsense",
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import type { Cli_Commands_Context_AddContext_ConfigPath, Cli_Commands_Context_AddContext_Context, Cli_Commands_Context_AddContext_Returns, Cli_Commands_Context_EditContext_ConfigPath, Cli_Commands_Context_EditContext_Name, Cli_Commands_Context_EditContext_Returns, Cli_Commands_Context_EditContext_Updates, Cli_Commands_Context_GenerateId_Returns, Cli_Commands_Context_GenerateToken_Returns, Cli_Commands_Context_ListContexts_ConfigPath, Cli_Commands_Context_ListContexts_Returns, Cli_Commands_Context_RemoveContext_ConfigPath, Cli_Commands_Context_RemoveContext_Name, Cli_Commands_Context_RemoveContext_Returns } from '../../types/cli/commands/context.d.ts';
|
|
1
|
+
import type { Cli_Commands_Context_AddContext_ConfigPath, Cli_Commands_Context_AddContext_Context, Cli_Commands_Context_AddContext_Returns, Cli_Commands_Context_EditContext_ConfigPath, Cli_Commands_Context_EditContext_Name, Cli_Commands_Context_EditContext_Returns, Cli_Commands_Context_EditContext_Updates, Cli_Commands_Context_GenerateId_Returns, Cli_Commands_Context_GenerateSessionSecret_Returns, Cli_Commands_Context_GenerateToken_Returns, Cli_Commands_Context_ListContexts_ConfigPath, Cli_Commands_Context_ListContexts_Returns, Cli_Commands_Context_RemoveContext_ConfigPath, Cli_Commands_Context_RemoveContext_Name, Cli_Commands_Context_RemoveContext_Returns } from '../../types/cli/commands/context.d.ts';
|
|
2
2
|
declare function addContext(configPath: Cli_Commands_Context_AddContext_ConfigPath, context: Cli_Commands_Context_AddContext_Context): Cli_Commands_Context_AddContext_Returns;
|
|
3
3
|
declare function listContexts(configPath: Cli_Commands_Context_ListContexts_ConfigPath): Cli_Commands_Context_ListContexts_Returns;
|
|
4
4
|
declare function editContext(configPath: Cli_Commands_Context_EditContext_ConfigPath, name: Cli_Commands_Context_EditContext_Name, updates: Cli_Commands_Context_EditContext_Updates): Cli_Commands_Context_EditContext_Returns;
|
|
5
5
|
declare function removeContext(configPath: Cli_Commands_Context_RemoveContext_ConfigPath, name: Cli_Commands_Context_RemoveContext_Name): Cli_Commands_Context_RemoveContext_Returns;
|
|
6
6
|
declare function generateId(): Cli_Commands_Context_GenerateId_Returns;
|
|
7
|
+
declare function generateSessionSecret(): Cli_Commands_Context_GenerateSessionSecret_Returns;
|
|
7
8
|
declare function generateToken(): Cli_Commands_Context_GenerateToken_Returns;
|
|
8
|
-
export { addContext, editContext, generateId, generateToken, listContexts, removeContext, };
|
|
9
|
+
export { addContext, editContext, generateId, generateSessionSecret, generateToken, listContexts, removeContext, };
|
|
9
10
|
//# sourceMappingURL=context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/context.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAEV,0CAA0C,EAC1C,uCAAuC,EAOvC,uCAAuC,EAGvC,2CAA2C,EAI3C,qCAAqC,EAGrC,wCAAwC,EAExC,wCAAwC,EACxC,uCAAuC,EAMvC,0CAA0C,EAC1C,4CAA4C,EAC5C,yCAAyC,EAQzC,6CAA6C,EAE7C,uCAAuC,EACvC,0CAA0C,EAC3C,MAAM,uCAAuC,CAAC;AAY/C,iBAAS,UAAU,CAAC,UAAU,EAAE,0CAA0C,EAAE,OAAO,EAAE,uCAAuC,GAAG,uCAAuC,
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/context.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAEV,0CAA0C,EAC1C,uCAAuC,EAOvC,uCAAuC,EAGvC,2CAA2C,EAI3C,qCAAqC,EAGrC,wCAAwC,EAExC,wCAAwC,EACxC,uCAAuC,EAMvC,kDAAkD,EAClD,0CAA0C,EAC1C,4CAA4C,EAC5C,yCAAyC,EAQzC,6CAA6C,EAE7C,uCAAuC,EACvC,0CAA0C,EAC3C,MAAM,uCAAuC,CAAC;AAY/C,iBAAS,UAAU,CAAC,UAAU,EAAE,0CAA0C,EAAE,OAAO,EAAE,uCAAuC,GAAG,uCAAuC,CA8CrK;AAYD,iBAAS,YAAY,CAAC,UAAU,EAAE,4CAA4C,GAAG,yCAAyC,CAEzH;AAYD,iBAAS,WAAW,CAAC,UAAU,EAAE,2CAA2C,EAAE,IAAI,EAAE,qCAAqC,EAAE,OAAO,EAAE,wCAAwC,GAAG,wCAAwC,CA8CtN;AAYD,iBAAS,aAAa,CAAC,UAAU,EAAE,6CAA6C,EAAE,IAAI,EAAE,uCAAuC,GAAG,0CAA0C,CAa3K;AAgED,iBAAS,UAAU,IAAI,uCAAuC,CAE7D;AAYD,iBAAS,qBAAqB,IAAI,kDAAkD,CAEnF;AAYD,iBAAS,aAAa,IAAI,0CAA0C,CAEnE;AAED,OAAO,EACL,UAAU,EACV,WAAW,EACX,UAAU,EACV,qBAAqB,EACrB,aAAa,EACb,YAAY,EACZ,aAAa,GACd,CAAC"}
|
|
@@ -12,6 +12,9 @@ function addContext(configPath, context) {
|
|
|
12
12
|
let currentContext = context;
|
|
13
13
|
const existingIds = new Set(config['contexts'].map((existingContext) => existingContext['id']));
|
|
14
14
|
if (existingIds.has(currentContext['id']) === true) {
|
|
15
|
+
if (currentContext['type'] === 'email') {
|
|
16
|
+
throw new Error(`Context with id "${currentContext['id']}" already exists.`);
|
|
17
|
+
}
|
|
15
18
|
let newId = generateId();
|
|
16
19
|
while (existingIds.has(newId) === true) {
|
|
17
20
|
newId = generateId();
|
|
@@ -48,6 +51,9 @@ function editContext(configPath, name, updates) {
|
|
|
48
51
|
let newId = updatedUpdates['id'];
|
|
49
52
|
const existingIds = new Set(config['contexts'].filter((_context, i) => i !== index).map((context) => context['id']));
|
|
50
53
|
if (existingIds.has(newId) === true) {
|
|
54
|
+
if (config['contexts'][index]['type'] === 'email') {
|
|
55
|
+
throw new Error(`Context with id "${newId}" already exists.`);
|
|
56
|
+
}
|
|
51
57
|
newId = generateId();
|
|
52
58
|
while (existingIds.has(newId) === true) {
|
|
53
59
|
newId = generateId();
|
|
@@ -70,6 +76,9 @@ function editContext(configPath, name, updates) {
|
|
|
70
76
|
function removeContext(configPath, name) {
|
|
71
77
|
const config = configSchema.parse(loadConfig(configPath));
|
|
72
78
|
const filtered = config['contexts'].filter((context) => context['name'] !== name);
|
|
79
|
+
if (filtered['length'] === config['contexts']['length']) {
|
|
80
|
+
throw new Error(`Context with name "${name}" not found.`);
|
|
81
|
+
}
|
|
73
82
|
Reflect.set(config, 'contexts', filtered);
|
|
74
83
|
saveConfig(configPath, config);
|
|
75
84
|
return;
|
|
@@ -102,8 +111,11 @@ function generateRandomString(length, lowercase = false) {
|
|
|
102
111
|
function generateId() {
|
|
103
112
|
return generateRandomString(20, true);
|
|
104
113
|
}
|
|
114
|
+
function generateSessionSecret() {
|
|
115
|
+
return generateRandomString(64);
|
|
116
|
+
}
|
|
105
117
|
function generateToken() {
|
|
106
118
|
return generateRandomString(64);
|
|
107
119
|
}
|
|
108
|
-
export { addContext, editContext, generateId, generateToken, listContexts, removeContext, };
|
|
120
|
+
export { addContext, editContext, generateId, generateSessionSecret, generateToken, listContexts, removeContext, };
|
|
109
121
|
//# sourceMappingURL=context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../src/cli/commands/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../src/cli/commands/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/deploy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/deploy.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAoBV,qCAAqC,EAGrC,sCAAsC,EAGtC,kCAAkC,EA+GnC,MAAM,sCAAsC,CAAC;AAoD9C,iBAAe,MAAM,CAAC,UAAU,EAAE,qCAAqC,EAAE,WAAW,GAAE,sCAA8C,GAAG,kCAAkC,CAwFxK;AAivBD,OAAO,EACL,MAAM,GACP,CAAC"}
|
|
@@ -5,9 +5,10 @@ import { Bootstrap, Logger } from '@cbnventures/nova/toolkit';
|
|
|
5
5
|
import chalk from 'chalk';
|
|
6
6
|
import prompts from 'prompts';
|
|
7
7
|
import { APP_NAME } from '../../lib/item.js';
|
|
8
|
+
import { getWranglerCliPath } from '../../lib/package-runtime.js';
|
|
8
9
|
import { LIB_REGEX_SURROUNDING_QUOTES } from '../../lib/regex.js';
|
|
9
10
|
import { listContexts } from './context.js';
|
|
10
|
-
import { generateWranglerToml } from './generate.js';
|
|
11
|
+
import { generateWranglerToml, getWranglerTomlPath } from './generate.js';
|
|
11
12
|
import { listServers } from './server.js';
|
|
12
13
|
import { getSettings } from './settings.js';
|
|
13
14
|
import { validateConfig } from './validate.js';
|
|
@@ -27,6 +28,7 @@ async function deploy(configPath, interactive = false) {
|
|
|
27
28
|
for (const error of result['errors']) {
|
|
28
29
|
Logger.error(` - ${error}`);
|
|
29
30
|
}
|
|
31
|
+
process.exitCode = 1;
|
|
30
32
|
return;
|
|
31
33
|
}
|
|
32
34
|
Logger.info('Config is valid.');
|
|
@@ -45,12 +47,11 @@ async function deploy(configPath, interactive = false) {
|
|
|
45
47
|
const kvNamespaceId = await ensureKvNamespace(token, accountId, workerName);
|
|
46
48
|
Logger.info('KV namespace ready.');
|
|
47
49
|
Logger.info('Generating wrangler.toml...');
|
|
48
|
-
const
|
|
49
|
-
const wranglerTomlPath = resolve(projectRoot, 'wrangler.toml');
|
|
50
|
+
const wranglerTomlPath = getWranglerTomlPath(configPath);
|
|
50
51
|
generateWranglerToml(configPath, wranglerTomlPath, accountId, kvNamespaceId);
|
|
51
|
-
Logger.info(
|
|
52
|
+
Logger.info(`Generated "wrangler.toml" at "${wranglerTomlPath}".`);
|
|
52
53
|
Logger.info('Deploying worker...');
|
|
53
|
-
deployWorker();
|
|
54
|
+
deployWorker(wranglerTomlPath);
|
|
54
55
|
Logger.info('Worker deployed.');
|
|
55
56
|
if (hasEmailContexts === true) {
|
|
56
57
|
await setupEmailRouting(configPath, token);
|
|
@@ -75,7 +76,7 @@ async function resolveApiToken(interactive) {
|
|
|
75
76
|
}
|
|
76
77
|
else {
|
|
77
78
|
if (interactive === false) {
|
|
78
|
-
throw new Error('No API token found. Create a .env file with CLOUDFLARE_API_TOKEN=<your-token> or run
|
|
79
|
+
throw new Error('No API token found. Create a .env file with CLOUDFLARE_API_TOKEN=<your-token> or run the CLI without a command for guided setup.');
|
|
79
80
|
}
|
|
80
81
|
Logger.warn('No API token found. Let\'s set one up.');
|
|
81
82
|
}
|
|
@@ -225,11 +226,10 @@ async function promptForApiToken() {
|
|
|
225
226
|
Logger.info('API token saved to .env file.');
|
|
226
227
|
return token;
|
|
227
228
|
}
|
|
228
|
-
function deployWorker() {
|
|
229
|
-
const
|
|
230
|
-
const
|
|
231
|
-
|
|
232
|
-
'wrangler',
|
|
229
|
+
function deployWorker(wranglerTomlPath) {
|
|
230
|
+
const wranglerCliPath = getWranglerCliPath();
|
|
231
|
+
const deployResult = spawnSync(process.execPath, [
|
|
232
|
+
wranglerCliPath,
|
|
233
233
|
'deploy',
|
|
234
234
|
'--config',
|
|
235
235
|
wranglerTomlPath,
|
|
@@ -328,22 +328,30 @@ async function getZoneInfo(token, baseDomain) {
|
|
|
328
328
|
throw new Error(`Failed to find Cloudflare zone for "${baseDomain}". Is the domain added to your Cloudflare account?`);
|
|
329
329
|
}
|
|
330
330
|
async function listEmailRoutingRules(token, zoneId) {
|
|
331
|
-
const
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
let errorDetails = 'Unknown error';
|
|
341
|
-
if (dataErrors !== undefined) {
|
|
342
|
-
errorDetails = dataErrors.map((e) => `${String(e['code'])}: ${e['message']}`).join(', ');
|
|
331
|
+
const allRules = [];
|
|
332
|
+
let page = 1;
|
|
333
|
+
let pageRules = [];
|
|
334
|
+
do {
|
|
335
|
+
const response = await fetch(`${CLOUDFLARE_API_BASE}/zones/${zoneId}/email/routing/rules?page=${String(page)}&per_page=50`, {
|
|
336
|
+
headers: { Authorization: `Bearer ${token}` },
|
|
337
|
+
});
|
|
338
|
+
if (response['ok'] === false) {
|
|
339
|
+
throw new Error(`Failed to list email routing rules: HTTP ${String(response['status'])}`);
|
|
343
340
|
}
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
341
|
+
const data = await response.json();
|
|
342
|
+
if (data['success'] === false) {
|
|
343
|
+
const dataErrors = data['errors'];
|
|
344
|
+
let errorDetails = 'Unknown error';
|
|
345
|
+
if (dataErrors !== undefined) {
|
|
346
|
+
errorDetails = dataErrors.map((e) => `${String(e['code'])}: ${e['message']}`).join(', ');
|
|
347
|
+
}
|
|
348
|
+
throw new Error(`Failed to list email routing rules: ${errorDetails}`);
|
|
349
|
+
}
|
|
350
|
+
pageRules = data['result'];
|
|
351
|
+
allRules.push(...pageRules);
|
|
352
|
+
page += 1;
|
|
353
|
+
} while (pageRules.length === 50);
|
|
354
|
+
return allRules;
|
|
347
355
|
}
|
|
348
356
|
async function createEmailRoutingRule(token, zoneId, email, contextId, workerName) {
|
|
349
357
|
const response = await fetch(`${CLOUDFLARE_API_BASE}/zones/${zoneId}/email/routing/rules`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/cli/commands/deploy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/cli/commands/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { Cli_Commands_Generate_GenerateWranglerToml_AccountId, Cli_Commands_Generate_GenerateWranglerToml_ConfigPath, Cli_Commands_Generate_GenerateWranglerToml_KvNamespaceId, Cli_Commands_Generate_GenerateWranglerToml_OutputPath, Cli_Commands_Generate_GenerateWranglerToml_Returns } from '../../types/cli/commands/generate.d.ts';
|
|
1
|
+
import type { Cli_Commands_Generate_GenerateWranglerToml_AccountId, Cli_Commands_Generate_GenerateWranglerToml_ConfigPath, Cli_Commands_Generate_GenerateWranglerToml_KvNamespaceId, Cli_Commands_Generate_GenerateWranglerToml_OutputPath, Cli_Commands_Generate_GenerateWranglerToml_Returns, Cli_Commands_Generate_GetWranglerTomlPath_ConfigPath, Cli_Commands_Generate_GetWranglerTomlPath_Returns } from '../../types/cli/commands/generate.d.ts';
|
|
2
|
+
declare function getWranglerTomlPath(configPath: Cli_Commands_Generate_GetWranglerTomlPath_ConfigPath): Cli_Commands_Generate_GetWranglerTomlPath_Returns;
|
|
2
3
|
declare function generateWranglerToml(configPath: Cli_Commands_Generate_GenerateWranglerToml_ConfigPath, outputPath?: Cli_Commands_Generate_GenerateWranglerToml_OutputPath, accountId?: Cli_Commands_Generate_GenerateWranglerToml_AccountId, kvNamespaceId?: Cli_Commands_Generate_GenerateWranglerToml_KvNamespaceId): Cli_Commands_Generate_GenerateWranglerToml_Returns;
|
|
3
|
-
export { generateWranglerToml, };
|
|
4
|
+
export { generateWranglerToml, getWranglerTomlPath, };
|
|
4
5
|
//# sourceMappingURL=generate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/generate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/generate.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,oDAAoD,EAMpD,qDAAqD,EAKrD,wDAAwD,EAGxD,qDAAqD,EAErD,kDAAkD,EAOlD,oDAAoD,EACpD,iDAAiD,EAClD,MAAM,wCAAwC,CAAC;AAwBhD,iBAAS,mBAAmB,CAAC,UAAU,EAAE,oDAAoD,GAAG,iDAAiD,CAEhJ;AAYD,iBAAS,oBAAoB,CAAC,UAAU,EAAE,qDAAqD,EAAE,UAAU,GAAE,qDAAuF,EAAE,SAAS,CAAC,EAAE,oDAAoD,EAAE,aAAa,CAAC,EAAE,wDAAwD,GAAG,kDAAkD,CAkGpY;AAED,OAAO,EACL,oBAAoB,EACpB,mBAAmB,GACpB,CAAC"}
|
|
@@ -1,22 +1,37 @@
|
|
|
1
|
-
import { mkdirSync, writeFileSync } from 'node:fs';
|
|
1
|
+
import { mkdirSync, realpathSync, writeFileSync } from 'node:fs';
|
|
2
2
|
import { dirname, relative, resolve, sep, } from 'node:path';
|
|
3
|
-
import { Bootstrap } from '@cbnventures/nova/toolkit';
|
|
4
3
|
import { getWorkerEntryPath } from '../../lib/package-runtime.js';
|
|
5
4
|
import { configSchema } from '../../lib/schema.js';
|
|
6
5
|
import { loadConfig } from './config-io.js';
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
6
|
+
const BUNDLE_DIRECTORY = '.wrangler/ntfy-reverse-proxy';
|
|
7
|
+
function getWranglerTomlPath(configPath) {
|
|
8
|
+
return resolve(dirname(configPath), 'wrangler.toml');
|
|
9
|
+
}
|
|
10
|
+
function generateWranglerToml(configPath, outputPath = getWranglerTomlPath(configPath), accountId, kvNamespaceId) {
|
|
10
11
|
const config = configSchema.parse(loadConfig(configPath));
|
|
11
12
|
const settings = config['settings'];
|
|
12
|
-
const servers = config['servers'];
|
|
13
13
|
const contexts = config['contexts'];
|
|
14
14
|
const compatibilityDate = new Date().toISOString().slice(0, 10);
|
|
15
15
|
const outputDir = dirname(outputPath);
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
-
const
|
|
19
|
-
|
|
16
|
+
const bundleDir = resolve(outputDir, BUNDLE_DIRECTORY);
|
|
17
|
+
const bundleConfigPath = resolve(bundleDir, 'config.json');
|
|
18
|
+
const bundleEntryPath = resolve(bundleDir, 'worker.js');
|
|
19
|
+
mkdirSync(bundleDir, { recursive: true });
|
|
20
|
+
const realBundleDir = realpathSync(bundleDir);
|
|
21
|
+
const workerEntryPath = realpathSync(getWorkerEntryPath());
|
|
22
|
+
const workerEntryRelativePath = relative(realBundleDir, workerEntryPath);
|
|
23
|
+
const workerEntryImportPath = workerEntryRelativePath.split(sep).join('/');
|
|
24
|
+
const workerEntryImport = JSON.stringify((workerEntryImportPath.startsWith('.') === true) ? workerEntryImportPath : `./${workerEntryImportPath}`);
|
|
25
|
+
const entryLines = [
|
|
26
|
+
'// Generated by Reverse Proxy for ntfy. "nrp generate" and "nrp deploy" rewrite this file.',
|
|
27
|
+
`import { createWorker } from ${workerEntryImport};`,
|
|
28
|
+
'',
|
|
29
|
+
'import config from "./config.json";',
|
|
30
|
+
'',
|
|
31
|
+
'export default createWorker(config);',
|
|
32
|
+
'',
|
|
33
|
+
`export { DeliveryOutbox } from ${workerEntryImport};`,
|
|
34
|
+
];
|
|
20
35
|
const httpContexts = contexts.filter((context) => context['type'] === 'http');
|
|
21
36
|
const emailContexts = contexts.filter((context) => context['type'] === 'email');
|
|
22
37
|
const routeLines = httpContexts.map((context) => {
|
|
@@ -24,7 +39,7 @@ function generateWranglerToml(configPath, outputPath = defaultWranglerTomlPath,
|
|
|
24
39
|
});
|
|
25
40
|
const lines = [
|
|
26
41
|
`name = "${settings['worker_name']}"`,
|
|
27
|
-
`main = ${
|
|
42
|
+
`main = "${BUNDLE_DIRECTORY}/worker.js"`,
|
|
28
43
|
`compatibility_date = "${compatibilityDate}"`,
|
|
29
44
|
...((accountId !== undefined) ? [`account_id = "${accountId}"`] : []),
|
|
30
45
|
'',
|
|
@@ -57,16 +72,10 @@ function generateWranglerToml(configPath, outputPath = defaultWranglerTomlPath,
|
|
|
57
72
|
lines.push('tag = "v1"');
|
|
58
73
|
lines.push('new_sqlite_classes = ["DeliveryOutbox"]');
|
|
59
74
|
lines.push('');
|
|
60
|
-
lines.push('
|
|
61
|
-
lines.push('####
|
|
62
|
-
lines.push('
|
|
63
|
-
lines.push(
|
|
64
|
-
const settingsJson = JSON.stringify(settings);
|
|
65
|
-
lines.push(`SETTINGS = ${JSON.stringify(settingsJson)}`);
|
|
66
|
-
const serversJson = JSON.stringify(servers);
|
|
67
|
-
lines.push(`SERVERS = ${JSON.stringify(serversJson)}`);
|
|
68
|
-
const contextsJson = JSON.stringify(contexts);
|
|
69
|
-
lines.push(`CONTEXTS = ${JSON.stringify(contextsJson)}`);
|
|
75
|
+
lines.push('################');
|
|
76
|
+
lines.push('#### Config ####');
|
|
77
|
+
lines.push('################');
|
|
78
|
+
lines.push(`# The config ships inside the Worker from ${BUNDLE_DIRECTORY}/config.json, not as vars.`);
|
|
70
79
|
if (kvNamespaceId !== undefined) {
|
|
71
80
|
lines.push('');
|
|
72
81
|
lines.push('########################');
|
|
@@ -76,9 +85,10 @@ function generateWranglerToml(configPath, outputPath = defaultWranglerTomlPath,
|
|
|
76
85
|
lines.push('binding = "KV"');
|
|
77
86
|
lines.push(`id = "${kvNamespaceId}"`);
|
|
78
87
|
}
|
|
79
|
-
|
|
88
|
+
writeFileSync(bundleConfigPath, `${JSON.stringify(config, null, 2)}\n`);
|
|
89
|
+
writeFileSync(bundleEntryPath, `${entryLines.join('\n')}\n`);
|
|
80
90
|
writeFileSync(outputPath, `${lines.join('\n')}\n`);
|
|
81
91
|
return;
|
|
82
92
|
}
|
|
83
|
-
export { generateWranglerToml, };
|
|
93
|
+
export { generateWranglerToml, getWranglerTomlPath, };
|
|
84
94
|
//# sourceMappingURL=generate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/cli/commands/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/cli/commands/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/server.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,wCAAwC,EAExC,qCAAqC,EACrC,oCAAoC,EAEpC,yCAAyC,EAGzC,mCAAmC,EACnC,sCAAsC,EACtC,sCAAsC,EACtC,0CAA0C,EAC1C,uCAAuC,EAEvC,2CAA2C,EAG3C,qCAAqC,EAErC,wCAAwC,EACzC,MAAM,sCAAsC,CAAC;AAY9C,iBAAS,SAAS,CAAC,UAAU,EAAE,wCAAwC,EAAE,MAAM,EAAE,oCAAoC,GAAG,qCAAqC,CAa5J;AAYD,iBAAS,WAAW,CAAC,UAAU,EAAE,0CAA0C,GAAG,uCAAuC,CAEpH;AAYD,iBAAS,UAAU,CAAC,UAAU,EAAE,yCAAyC,EAAE,IAAI,EAAE,mCAAmC,EAAE,OAAO,EAAE,sCAAsC,GAAG,sCAAsC,CAkB7M;AAYD,iBAAS,YAAY,CAAC,UAAU,EAAE,2CAA2C,EAAE,IAAI,EAAE,qCAAqC,GAAG,wCAAwC,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/server.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,wCAAwC,EAExC,qCAAqC,EACrC,oCAAoC,EAEpC,yCAAyC,EAGzC,mCAAmC,EACnC,sCAAsC,EACtC,sCAAsC,EACtC,0CAA0C,EAC1C,uCAAuC,EAEvC,2CAA2C,EAG3C,qCAAqC,EAErC,wCAAwC,EACzC,MAAM,sCAAsC,CAAC;AAY9C,iBAAS,SAAS,CAAC,UAAU,EAAE,wCAAwC,EAAE,MAAM,EAAE,oCAAoC,GAAG,qCAAqC,CAa5J;AAYD,iBAAS,WAAW,CAAC,UAAU,EAAE,0CAA0C,GAAG,uCAAuC,CAEpH;AAYD,iBAAS,UAAU,CAAC,UAAU,EAAE,yCAAyC,EAAE,IAAI,EAAE,mCAAmC,EAAE,OAAO,EAAE,sCAAsC,GAAG,sCAAsC,CAkB7M;AAYD,iBAAS,YAAY,CAAC,UAAU,EAAE,2CAA2C,EAAE,IAAI,EAAE,qCAAqC,GAAG,wCAAwC,CAuBpK;AAED,OAAO,EACL,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,GACb,CAAC"}
|
|
@@ -35,6 +35,9 @@ function removeServer(configPath, name) {
|
|
|
35
35
|
throw new Error(`Server "${name}" is referenced by the following contexts: ${contextNames}.`);
|
|
36
36
|
}
|
|
37
37
|
const filtered = config['servers'].filter((server) => server['name'] !== name);
|
|
38
|
+
if (filtered['length'] === config['servers']['length']) {
|
|
39
|
+
throw new Error(`Server with name "${name}" not found.`);
|
|
40
|
+
}
|
|
38
41
|
Reflect.set(config, 'servers', filtered);
|
|
39
42
|
saveConfig(configPath, config);
|
|
40
43
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/cli/commands/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/cli/commands/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/settings.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,4CAA4C,EAC5C,yCAAyC,EAEzC,+CAA+C,EAC/C,4CAA4C,
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/settings.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,4CAA4C,EAC5C,yCAAyC,EAEzC,+CAA+C,EAC/C,4CAA4C,EAE5C,4CAA4C,EAC7C,MAAM,wCAAwC,CAAC;AAYhD,iBAAS,WAAW,CAAC,UAAU,EAAE,4CAA4C,GAAG,yCAAyC,CAExH;AAYD,iBAAS,cAAc,CAAC,UAAU,EAAE,+CAA+C,EAAE,OAAO,EAAE,4CAA4C,GAAG,4CAA4C,CAaxL;AAED,OAAO,EACL,WAAW,EACX,cAAc,GACf,CAAC"}
|
|
@@ -5,11 +5,14 @@ function getSettings(configPath) {
|
|
|
5
5
|
}
|
|
6
6
|
function updateSettings(configPath, updates) {
|
|
7
7
|
const config = configSchema.parse(loadConfig(configPath));
|
|
8
|
-
|
|
9
|
-
...config
|
|
10
|
-
|
|
8
|
+
const updatedConfig = configSchema.parse({
|
|
9
|
+
...config,
|
|
10
|
+
settings: {
|
|
11
|
+
...config['settings'],
|
|
12
|
+
...updates,
|
|
13
|
+
},
|
|
11
14
|
});
|
|
12
|
-
saveConfig(configPath,
|
|
15
|
+
saveConfig(configPath, updatedConfig);
|
|
13
16
|
return;
|
|
14
17
|
}
|
|
15
18
|
export { getSettings, updateSettings, };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/cli/commands/settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/cli/commands/settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAsBxD,SAAS,WAAW,CAAC,UAAwD;IAC3E,OAAO,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;AAChE,CAAC;AAYD,SAAS,cAAc,CAAC,UAA2D,EAAE,OAAqD;IACxI,MAAM,MAAM,GAAgD,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;IACvG,MAAM,aAAa,GAAuD,YAAY,CAAC,KAAK,CAAC;QAC3F,GAAG,MAAM;QACT,QAAQ,EAAE;YACR,GAAG,MAAM,CAAC,UAAU,CAAC;YACrB,GAAG,OAAO;SACX;KACF,CAAC,CAAC;IAEH,UAAU,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAEtC,OAAO;AACT,CAAC;AAED,OAAO,EACL,WAAW,EACX,cAAc,GACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":";AAgBA,OAAO,KAAK,EAaV,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AA4DjC,QAAA,MAAM,OAAO,EAAE,iBAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":";AAgBA,OAAO,KAAK,EAaV,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AA4DjC,QAAA,MAAM,OAAO,EAAE,iBAAiC,CAAC;AA0HjD,OAAO,EACL,OAAO,GACR,CAAC"}
|
package/build/src/cli/index.js
CHANGED
|
@@ -7,7 +7,7 @@ import { APP_NAME } from '../lib/item.js';
|
|
|
7
7
|
import { getConfigSamplePath, getPackageVersion } from '../lib/package-runtime.js';
|
|
8
8
|
import { removeContext } from './commands/context.js';
|
|
9
9
|
import { deploy } from './commands/deploy.js';
|
|
10
|
-
import { generateWranglerToml } from './commands/generate.js';
|
|
10
|
+
import { generateWranglerToml, getWranglerTomlPath } from './commands/generate.js';
|
|
11
11
|
import { removeServer } from './commands/server.js';
|
|
12
12
|
import { validateConfig } from './commands/validate.js';
|
|
13
13
|
import { interactiveMenu } from './menu/interactive.js';
|
|
@@ -56,7 +56,7 @@ async function main() {
|
|
|
56
56
|
.description('Remove a server by name')
|
|
57
57
|
.action((name) => {
|
|
58
58
|
removeServer(configPath, name);
|
|
59
|
-
Logger.info(`Server "${name}" removed.`);
|
|
59
|
+
Logger.info(`Server "${name}" removed. Run "nrp deploy" to apply.`);
|
|
60
60
|
return;
|
|
61
61
|
});
|
|
62
62
|
const contextCommand = new Command('context').description('Manage contexts');
|
|
@@ -65,7 +65,7 @@ async function main() {
|
|
|
65
65
|
.description('Remove a context by name')
|
|
66
66
|
.action((name) => {
|
|
67
67
|
removeContext(configPath, name);
|
|
68
|
-
Logger.info(`Context "${name}" removed.`);
|
|
68
|
+
Logger.info(`Context "${name}" removed. Run "nrp deploy" to apply.`);
|
|
69
69
|
return;
|
|
70
70
|
});
|
|
71
71
|
program.addCommand(serverCommand);
|
|
@@ -84,6 +84,7 @@ async function main() {
|
|
|
84
84
|
const message = error;
|
|
85
85
|
Logger.error(` - ${message}`);
|
|
86
86
|
}
|
|
87
|
+
process.exitCode = 1;
|
|
87
88
|
}
|
|
88
89
|
return;
|
|
89
90
|
});
|
|
@@ -92,7 +93,7 @@ async function main() {
|
|
|
92
93
|
.description('Generate wrangler.toml')
|
|
93
94
|
.action(() => {
|
|
94
95
|
generateWranglerToml(configPath);
|
|
95
|
-
Logger.info(
|
|
96
|
+
Logger.info(`Generated "wrangler.toml" at "${getWranglerTomlPath(configPath)}".`);
|
|
96
97
|
return;
|
|
97
98
|
});
|
|
98
99
|
program
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interactive.d.ts","sourceRoot":"","sources":["../../../../src/cli/menu/interactive.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"interactive.d.ts","sourceRoot":"","sources":["../../../../src/cli/menu/interactive.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAiIV,+CAA+C,EAM/C,4CAA4C,EAiD7C,MAAM,uCAAuC,CAAC;AAY/C,iBAAe,eAAe,CAAC,UAAU,EAAE,+CAA+C,GAAG,4CAA4C,CAiGxI;AA6yCD,OAAO,EACL,eAAe,GAChB,CAAC"}
|