@waiaas/push-relay 2.10.0-rc → 2.10.0-rc.10
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 -0
- package/config.example.toml +1 -0
- package/dist/bin.d.ts.map +1 -1
- package/dist/bin.js +41 -19
- package/dist/bin.js.map +1 -1
- package/dist/config.d.ts +12 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +1 -0
- package/dist/config.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/logger.d.ts +6 -0
- package/dist/logger.d.ts.map +1 -0
- package/dist/logger.js +20 -0
- package/dist/logger.js.map +1 -0
- package/dist/middleware/api-key-auth.d.ts.map +1 -1
- package/dist/middleware/api-key-auth.js +3 -0
- package/dist/middleware/api-key-auth.js.map +1 -1
- package/dist/providers/pushwoosh-provider.d.ts +1 -0
- package/dist/providers/pushwoosh-provider.d.ts.map +1 -1
- package/dist/providers/pushwoosh-provider.js +3 -2
- package/dist/providers/pushwoosh-provider.js.map +1 -1
- package/dist/registry/device-routes.d.ts.map +1 -1
- package/dist/registry/device-routes.js +4 -0
- package/dist/registry/device-routes.js.map +1 -1
- package/dist/relay/sign-response-routes.d.ts.map +1 -1
- package/dist/relay/sign-response-routes.js +4 -0
- package/dist/relay/sign-response-routes.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +13 -0
- package/dist/server.js.map +1 -1
- package/dist/subscriber/ntfy-subscriber.d.ts.map +1 -1
- package/dist/subscriber/ntfy-subscriber.js +7 -0
- package/dist/subscriber/ntfy-subscriber.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
**Wallet-as-a-Service for AI Agents**
|
|
4
4
|
|
|
5
|
+
[](https://www.npmjs.com/package/@waiaas/core)
|
|
5
6
|
[](LICENSE)
|
|
6
7
|
[](https://nodejs.org/)
|
|
7
8
|
[](#)
|
package/config.example.toml
CHANGED
package/dist/bin.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin.d.ts","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"bin.d.ts","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";AAmBA,eAAO,MAAM,OAAO,EAAE,MAAoB,CAAC"}
|
package/dist/bin.js
CHANGED
|
@@ -10,6 +10,7 @@ import { FcmProvider } from './providers/fcm-provider.js';
|
|
|
10
10
|
import { ConfigurablePayloadTransformer } from './transformer/payload-transformer.js';
|
|
11
11
|
import { createServer } from './server.js';
|
|
12
12
|
import { routeByTopic } from './message-router.js';
|
|
13
|
+
import { info, error, debug, setDebug, isDebug } from './logger.js';
|
|
13
14
|
const require = createRequire(import.meta.url);
|
|
14
15
|
const pkg = require('../package.json');
|
|
15
16
|
export const VERSION = pkg.version;
|
|
@@ -18,34 +19,49 @@ if (process.argv.includes('--version')) {
|
|
|
18
19
|
console.log(VERSION);
|
|
19
20
|
process.exit(0);
|
|
20
21
|
}
|
|
22
|
+
// --debug flag or DEBUG=1 env
|
|
23
|
+
if (process.argv.includes('--debug') || process.env['DEBUG'] === '1') {
|
|
24
|
+
setDebug(true);
|
|
25
|
+
}
|
|
21
26
|
const CONFIG_PATH = process.env['RELAY_CONFIG'] ?? resolve(process.cwd(), 'config.toml');
|
|
22
27
|
const DB_PATH = process.env['RELAY_DB'] ?? resolve(process.cwd(), 'relay.db');
|
|
23
28
|
async function main() {
|
|
24
|
-
|
|
29
|
+
info('Loading config from', CONFIG_PATH);
|
|
25
30
|
const config = loadConfig(CONFIG_PATH);
|
|
31
|
+
if (isDebug()) {
|
|
32
|
+
debug('Config loaded:', JSON.stringify({
|
|
33
|
+
ntfy_server: config.relay.ntfy_server,
|
|
34
|
+
sign_topic_prefix: config.relay.sign_topic_prefix,
|
|
35
|
+
notify_topic_prefix: config.relay.notify_topic_prefix,
|
|
36
|
+
wallet_names: config.relay.wallet_names,
|
|
37
|
+
server: { host: config.relay.server.host, port: config.relay.server.port },
|
|
38
|
+
push_provider: config.relay.push.provider,
|
|
39
|
+
}, null, 2));
|
|
40
|
+
}
|
|
26
41
|
// Initialize device registry
|
|
27
42
|
const registry = new DeviceRegistry(DB_PATH);
|
|
43
|
+
debug('Device registry initialized at', DB_PATH);
|
|
28
44
|
// Initialize push provider
|
|
29
45
|
let provider;
|
|
30
46
|
if (config.relay.push.provider === 'pushwoosh') {
|
|
31
47
|
provider = new PushwooshProvider(config.relay.push.pushwoosh);
|
|
32
|
-
|
|
48
|
+
info('Push provider: Pushwoosh');
|
|
33
49
|
}
|
|
34
50
|
else {
|
|
35
51
|
provider = new FcmProvider(config.relay.push.fcm);
|
|
36
|
-
|
|
52
|
+
info('Push provider: FCM');
|
|
37
53
|
}
|
|
38
54
|
// Validate provider config
|
|
39
55
|
const valid = await provider.validateConfig();
|
|
40
56
|
if (!valid) {
|
|
41
|
-
|
|
57
|
+
error('Push provider config validation failed');
|
|
42
58
|
process.exit(1);
|
|
43
59
|
}
|
|
44
60
|
// Initialize payload transformer (optional)
|
|
45
61
|
let transformer;
|
|
46
62
|
if (config.relay.push.payload) {
|
|
47
63
|
transformer = new ConfigurablePayloadTransformer(config.relay.push.payload);
|
|
48
|
-
|
|
64
|
+
info('Payload transformer: enabled (static_fields + category_map)');
|
|
49
65
|
}
|
|
50
66
|
// Initialize ntfy subscriber
|
|
51
67
|
const subscriber = new NtfySubscriber({
|
|
@@ -55,39 +71,41 @@ async function main() {
|
|
|
55
71
|
walletNames: config.relay.wallet_names,
|
|
56
72
|
transformer,
|
|
57
73
|
onMessage: async (walletName, payload, topic) => {
|
|
58
|
-
|
|
74
|
+
info(`Received ${payload.category} for wallet "${walletName}" on topic "${topic}" (title=${payload.title ?? 'none'})`);
|
|
75
|
+
debug('Message payload:', JSON.stringify(payload));
|
|
59
76
|
const route = routeByTopic(walletName, topic, config.relay.sign_topic_prefix, config.relay.notify_topic_prefix, (token) => registry.getBySubscriptionToken(token));
|
|
60
77
|
if (route.action === 'skip_base') {
|
|
61
|
-
|
|
78
|
+
info(`Base topic "${topic}" — skipping push (no broadcast)`);
|
|
62
79
|
return;
|
|
63
80
|
}
|
|
64
81
|
if (route.action === 'skip_unknown') {
|
|
65
|
-
|
|
82
|
+
info(`Cannot extract subscriptionToken from topic "${topic}", skipping`);
|
|
66
83
|
return;
|
|
67
84
|
}
|
|
68
85
|
if (route.action === 'skip_no_device') {
|
|
69
|
-
|
|
86
|
+
info(`No device found for subscriptionToken "${route.subscriptionToken}", skipping`);
|
|
70
87
|
return;
|
|
71
88
|
}
|
|
72
89
|
try {
|
|
90
|
+
debug(`Sending push to device: pushToken=${route.device.pushToken.slice(0, 8)}...`);
|
|
73
91
|
const result = await provider.send([route.device.pushToken], payload);
|
|
74
92
|
if (result.invalidTokens.length > 0) {
|
|
75
93
|
registry.removeTokens(result.invalidTokens);
|
|
76
|
-
|
|
94
|
+
info(`Removed ${result.invalidTokens.length} invalid token(s)`);
|
|
77
95
|
}
|
|
78
|
-
|
|
96
|
+
info(`${payload.category} → ${walletName} (device=${route.subscriptionToken}): sent=${result.sent}, failed=${result.failed}`);
|
|
79
97
|
}
|
|
80
98
|
catch (sendErr) {
|
|
81
|
-
|
|
99
|
+
error(`Failed to send push to ${walletName} (device=${route.subscriptionToken}):`, sendErr.message);
|
|
82
100
|
}
|
|
83
101
|
},
|
|
84
102
|
onError: (err) => {
|
|
85
|
-
|
|
103
|
+
error('Error:', err.message);
|
|
86
104
|
},
|
|
87
105
|
});
|
|
88
106
|
// Start ntfy subscription
|
|
89
107
|
subscriber.start();
|
|
90
|
-
|
|
108
|
+
info(`Subscribing to ${config.relay.wallet_names.length} wallet(s): ${config.relay.wallet_names.join(', ')}`);
|
|
91
109
|
// Restore subscription-token-based topics from DB
|
|
92
110
|
const devices = registry.listAll();
|
|
93
111
|
let restoredTopics = 0;
|
|
@@ -95,10 +113,11 @@ async function main() {
|
|
|
95
113
|
if (device.subscriptionToken) {
|
|
96
114
|
subscriber.addTopics(device.walletName, `${config.relay.sign_topic_prefix}-${device.walletName}-${device.subscriptionToken}`, `${config.relay.notify_topic_prefix}-${device.walletName}-${device.subscriptionToken}`);
|
|
97
115
|
restoredTopics++;
|
|
116
|
+
debug(`Restored topics for device: wallet=${device.walletName}, token=${device.subscriptionToken}`);
|
|
98
117
|
}
|
|
99
118
|
}
|
|
100
119
|
if (restoredTopics > 0) {
|
|
101
|
-
|
|
120
|
+
info(`Restored ${restoredTopics} device topic(s) from DB`);
|
|
102
121
|
}
|
|
103
122
|
// Create and start HTTP server
|
|
104
123
|
const app = createServer({
|
|
@@ -116,13 +135,16 @@ async function main() {
|
|
|
116
135
|
port: config.relay.server.port,
|
|
117
136
|
hostname: config.relay.server.host,
|
|
118
137
|
});
|
|
119
|
-
|
|
138
|
+
info(`v${VERSION} listening on ${config.relay.server.host}:${config.relay.server.port}`);
|
|
139
|
+
if (isDebug()) {
|
|
140
|
+
info('Debug mode enabled');
|
|
141
|
+
}
|
|
120
142
|
// Graceful shutdown
|
|
121
143
|
const SHUTDOWN_TIMEOUT_MS = 10_000;
|
|
122
144
|
async function shutdown(signal) {
|
|
123
|
-
|
|
145
|
+
info(`${signal} received, shutting down...`);
|
|
124
146
|
const shutdownTimer = setTimeout(() => {
|
|
125
|
-
|
|
147
|
+
error('Shutdown timeout, forcing exit');
|
|
126
148
|
process.exit(1);
|
|
127
149
|
}, SHUTDOWN_TIMEOUT_MS);
|
|
128
150
|
shutdownTimer.unref();
|
|
@@ -133,7 +155,7 @@ async function main() {
|
|
|
133
155
|
// 3. Close database
|
|
134
156
|
registry.close();
|
|
135
157
|
clearTimeout(shutdownTimer);
|
|
136
|
-
|
|
158
|
+
info('Shutdown complete');
|
|
137
159
|
process.exit(0);
|
|
138
160
|
}
|
|
139
161
|
process.on('SIGTERM', () => void shutdown('SIGTERM'));
|
package/dist/bin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -2,12 +2,15 @@ import { z } from 'zod';
|
|
|
2
2
|
declare const PushwooshConfigSchema: z.ZodObject<{
|
|
3
3
|
api_token: z.ZodString;
|
|
4
4
|
application_code: z.ZodString;
|
|
5
|
+
api_url: z.ZodDefault<z.ZodString>;
|
|
5
6
|
}, "strip", z.ZodTypeAny, {
|
|
6
7
|
api_token: string;
|
|
7
8
|
application_code: string;
|
|
9
|
+
api_url: string;
|
|
8
10
|
}, {
|
|
9
11
|
api_token: string;
|
|
10
12
|
application_code: string;
|
|
13
|
+
api_url?: string | undefined;
|
|
11
14
|
}>;
|
|
12
15
|
declare const FcmConfigSchema: z.ZodObject<{
|
|
13
16
|
project_id: z.ZodString;
|
|
@@ -40,12 +43,15 @@ export declare const ConfigSchema: z.ZodObject<{
|
|
|
40
43
|
pushwoosh: z.ZodOptional<z.ZodObject<{
|
|
41
44
|
api_token: z.ZodString;
|
|
42
45
|
application_code: z.ZodString;
|
|
46
|
+
api_url: z.ZodDefault<z.ZodString>;
|
|
43
47
|
}, "strip", z.ZodTypeAny, {
|
|
44
48
|
api_token: string;
|
|
45
49
|
application_code: string;
|
|
50
|
+
api_url: string;
|
|
46
51
|
}, {
|
|
47
52
|
api_token: string;
|
|
48
53
|
application_code: string;
|
|
54
|
+
api_url?: string | undefined;
|
|
49
55
|
}>>;
|
|
50
56
|
fcm: z.ZodOptional<z.ZodObject<{
|
|
51
57
|
project_id: z.ZodString;
|
|
@@ -72,6 +78,7 @@ export declare const ConfigSchema: z.ZodObject<{
|
|
|
72
78
|
pushwoosh?: {
|
|
73
79
|
api_token: string;
|
|
74
80
|
application_code: string;
|
|
81
|
+
api_url: string;
|
|
75
82
|
} | undefined;
|
|
76
83
|
fcm?: {
|
|
77
84
|
project_id: string;
|
|
@@ -86,6 +93,7 @@ export declare const ConfigSchema: z.ZodObject<{
|
|
|
86
93
|
pushwoosh?: {
|
|
87
94
|
api_token: string;
|
|
88
95
|
application_code: string;
|
|
96
|
+
api_url?: string | undefined;
|
|
89
97
|
} | undefined;
|
|
90
98
|
fcm?: {
|
|
91
99
|
project_id: string;
|
|
@@ -115,6 +123,7 @@ export declare const ConfigSchema: z.ZodObject<{
|
|
|
115
123
|
pushwoosh?: {
|
|
116
124
|
api_token: string;
|
|
117
125
|
application_code: string;
|
|
126
|
+
api_url: string;
|
|
118
127
|
} | undefined;
|
|
119
128
|
fcm?: {
|
|
120
129
|
project_id: string;
|
|
@@ -140,6 +149,7 @@ export declare const ConfigSchema: z.ZodObject<{
|
|
|
140
149
|
pushwoosh?: {
|
|
141
150
|
api_token: string;
|
|
142
151
|
application_code: string;
|
|
152
|
+
api_url?: string | undefined;
|
|
143
153
|
} | undefined;
|
|
144
154
|
fcm?: {
|
|
145
155
|
project_id: string;
|
|
@@ -167,6 +177,7 @@ export declare const ConfigSchema: z.ZodObject<{
|
|
|
167
177
|
pushwoosh?: {
|
|
168
178
|
api_token: string;
|
|
169
179
|
application_code: string;
|
|
180
|
+
api_url: string;
|
|
170
181
|
} | undefined;
|
|
171
182
|
fcm?: {
|
|
172
183
|
project_id: string;
|
|
@@ -194,6 +205,7 @@ export declare const ConfigSchema: z.ZodObject<{
|
|
|
194
205
|
pushwoosh?: {
|
|
195
206
|
api_token: string;
|
|
196
207
|
application_code: string;
|
|
208
|
+
api_url?: string | undefined;
|
|
197
209
|
} | undefined;
|
|
198
210
|
fcm?: {
|
|
199
211
|
project_id: string;
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,QAAA,MAAM,qBAAqB
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,QAAA,MAAM,qBAAqB;;;;;;;;;;;;EAIzB,CAAC;AAEH,QAAA,MAAM,eAAe;;;;;;;;;EAGnB,CAAC;AAIH,QAAA,MAAM,mBAAmB;;;;;;;;;EAGvB,CAAC;AAwBH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAEvB,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AACvD,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AACxD,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAcpD"}
|
package/dist/config.js
CHANGED
|
@@ -4,6 +4,7 @@ import { parse as parseToml } from 'smol-toml';
|
|
|
4
4
|
const PushwooshConfigSchema = z.object({
|
|
5
5
|
api_token: z.string().min(1),
|
|
6
6
|
application_code: z.string().min(1),
|
|
7
|
+
api_url: z.string().url().default('https://api.pushwoosh.com/json/1.3/createMessage'),
|
|
7
8
|
});
|
|
8
9
|
const FcmConfigSchema = z.object({
|
|
9
10
|
project_id: z.string().min(1),
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,WAAW,CAAC;AAE/C,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5B,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export type { PushPayload } from './subscriber/message-parser.js';
|
|
|
8
8
|
export { PushwooshProvider } from './providers/pushwoosh-provider.js';
|
|
9
9
|
export { FcmProvider } from './providers/fcm-provider.js';
|
|
10
10
|
export { createServer } from './server.js';
|
|
11
|
+
export { info, error, debug, setDebug, isDebug } from './logger.js';
|
|
11
12
|
export { createSignResponseRoutes } from './relay/sign-response-routes.js';
|
|
12
13
|
export { ConfigurablePayloadTransformer } from './transformer/payload-transformer.js';
|
|
13
14
|
export type { IPayloadTransformer } from './transformer/payload-transformer.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,YAAY,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC9E,YAAY,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,YAAY,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,YAAY,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC9E,YAAY,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,YAAY,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -4,6 +4,7 @@ export { DeviceRegistry } from './registry/device-registry.js';
|
|
|
4
4
|
export { PushwooshProvider } from './providers/pushwoosh-provider.js';
|
|
5
5
|
export { FcmProvider } from './providers/fcm-provider.js';
|
|
6
6
|
export { createServer } from './server.js';
|
|
7
|
+
export { info, error, debug, setDebug, isDebug } from './logger.js';
|
|
7
8
|
export { createSignResponseRoutes } from './relay/sign-response-routes.js';
|
|
8
9
|
export { ConfigurablePayloadTransformer } from './transformer/payload-transformer.js';
|
|
9
10
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAG/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAG/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC"}
|
package/dist/logger.d.ts
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export declare function setDebug(enabled: boolean): void;
|
|
2
|
+
export declare function isDebug(): boolean;
|
|
3
|
+
export declare function info(...args: unknown[]): void;
|
|
4
|
+
export declare function error(...args: unknown[]): void;
|
|
5
|
+
export declare function debug(...args: unknown[]): void;
|
|
6
|
+
//# sourceMappingURL=logger.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAIA,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAE/C;AAED,wBAAgB,OAAO,IAAI,OAAO,CAEjC;AAED,wBAAgB,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAE7C;AAED,wBAAgB,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAE9C;AAED,wBAAgB,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAI9C"}
|
package/dist/logger.js
ADDED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
const PREFIX = '[push-relay]';
|
|
2
|
+
let debugEnabled = false;
|
|
3
|
+
export function setDebug(enabled) {
|
|
4
|
+
debugEnabled = enabled;
|
|
5
|
+
}
|
|
6
|
+
export function isDebug() {
|
|
7
|
+
return debugEnabled;
|
|
8
|
+
}
|
|
9
|
+
export function info(...args) {
|
|
10
|
+
console.log(PREFIX, ...args);
|
|
11
|
+
}
|
|
12
|
+
export function error(...args) {
|
|
13
|
+
console.error(PREFIX, ...args);
|
|
14
|
+
}
|
|
15
|
+
export function debug(...args) {
|
|
16
|
+
if (debugEnabled) {
|
|
17
|
+
console.log(`${PREFIX} [DEBUG]`, ...args);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,cAAc,CAAC;AAE9B,IAAI,YAAY,GAAG,KAAK,CAAC;AAEzB,MAAM,UAAU,QAAQ,CAAC,OAAgB;IACvC,YAAY,GAAG,OAAO,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,OAAO;IACrB,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,GAAG,IAAe;IACrC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,GAAG,IAAe;IACtC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,GAAG,IAAe;IACtC,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key-auth.d.ts","sourceRoot":"","sources":["../../src/middleware/api-key-auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"api-key-auth.d.ts","sourceRoot":"","sources":["../../src/middleware/api-key-auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG1C,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,IACzB,GAAG,OAAO,EAAE,MAAM,IAAI,KAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAShE"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
+
import { debug } from '../logger.js';
|
|
1
2
|
export function apiKeyAuth(apiKey) {
|
|
2
3
|
return async (c, next) => {
|
|
3
4
|
const provided = c.req.header('X-API-Key');
|
|
4
5
|
if (!provided || provided !== apiKey) {
|
|
6
|
+
debug(`API key auth failed: header=${provided ? `${provided.slice(0, 4)}...` : 'missing'}, path=${c.req.path}`);
|
|
5
7
|
return c.json({ error: 'Unauthorized' }, 401);
|
|
6
8
|
}
|
|
9
|
+
debug(`API key auth passed: path=${c.req.path}`);
|
|
7
10
|
await next();
|
|
8
11
|
};
|
|
9
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key-auth.js","sourceRoot":"","sources":["../../src/middleware/api-key-auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api-key-auth.js","sourceRoot":"","sources":["../../src/middleware/api-key-auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,MAAM,UAAU,UAAU,CAAC,MAAc;IACvC,OAAO,KAAK,EAAE,CAAU,EAAE,IAAU,EAA4B,EAAE;QAChE,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACrC,KAAK,CAAC,+BAA+B,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YAChH,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,GAAG,CAAC,CAAC;QAChD,CAAC;QACD,KAAK,CAAC,6BAA6B,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QACjD,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -5,6 +5,7 @@ export declare class PushwooshProvider implements IPushProvider {
|
|
|
5
5
|
readonly name = "pushwoosh";
|
|
6
6
|
private readonly apiToken;
|
|
7
7
|
private readonly applicationCode;
|
|
8
|
+
private readonly apiUrl;
|
|
8
9
|
constructor(config: PushwooshConfig);
|
|
9
10
|
send(tokens: string[], payload: PushPayload): Promise<PushResult>;
|
|
10
11
|
validateConfig(): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pushwoosh-provider.d.ts","sourceRoot":"","sources":["../../src/providers/pushwoosh-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"pushwoosh-provider.d.ts","sourceRoot":"","sources":["../../src/providers/pushwoosh-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,qBAAa,iBAAkB,YAAW,aAAa;IACrD,QAAQ,CAAC,IAAI,eAAe;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAEpB,MAAM,EAAE,eAAe;IAM7B,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAoEjE,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;CAGzC"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { withRetry, isRetryableHttpError } from './push-provider.js';
|
|
2
|
-
const PUSHWOOSH_API_URL = 'https://cp.pushwoosh.com/json/1.3/createMessage';
|
|
3
2
|
export class PushwooshProvider {
|
|
4
3
|
name = 'pushwoosh';
|
|
5
4
|
apiToken;
|
|
6
5
|
applicationCode;
|
|
6
|
+
apiUrl;
|
|
7
7
|
constructor(config) {
|
|
8
8
|
this.apiToken = config.api_token;
|
|
9
9
|
this.applicationCode = config.application_code;
|
|
10
|
+
this.apiUrl = config.api_url;
|
|
10
11
|
}
|
|
11
12
|
async send(tokens, payload) {
|
|
12
13
|
if (tokens.length === 0) {
|
|
@@ -38,7 +39,7 @@ export class PushwooshProvider {
|
|
|
38
39
|
},
|
|
39
40
|
};
|
|
40
41
|
const result = await withRetry(async () => {
|
|
41
|
-
const res = await fetch(
|
|
42
|
+
const res = await fetch(this.apiUrl, {
|
|
42
43
|
method: 'POST',
|
|
43
44
|
headers: { 'Content-Type': 'application/json' },
|
|
44
45
|
body: JSON.stringify(body),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pushwoosh-provider.js","sourceRoot":"","sources":["../../src/providers/pushwoosh-provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAGrE,MAAM,
|
|
1
|
+
{"version":3,"file":"pushwoosh-provider.js","sourceRoot":"","sources":["../../src/providers/pushwoosh-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-routes.d.ts","sourceRoot":"","sources":["../../src/registry/device-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"device-routes.d.ts","sourceRoot":"","sources":["../../src/registry/device-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AASnE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,cAAc,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAgF/D"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
2
|
import { z } from 'zod';
|
|
3
|
+
import { debug } from '../logger.js';
|
|
3
4
|
const DeviceRegistrationSchema = z.object({
|
|
4
5
|
walletName: z.string().min(1),
|
|
5
6
|
pushToken: z.string().min(1),
|
|
@@ -16,8 +17,10 @@ export function createDeviceRoutes(opts) {
|
|
|
16
17
|
return c.json({ error: 'Invalid request', details: parsed.error.issues }, 400);
|
|
17
18
|
}
|
|
18
19
|
const { walletName, pushToken, platform } = parsed.data;
|
|
20
|
+
debug(`POST /devices: wallet=${walletName}, platform=${platform}, pushToken=${pushToken.slice(0, 8)}...`);
|
|
19
21
|
const result = registry.register(walletName, pushToken, platform);
|
|
20
22
|
const token = result.subscriptionToken;
|
|
23
|
+
debug(`Device registered: subscriptionToken=${token}`);
|
|
21
24
|
// Dynamically subscribe to subscription-token-based topics
|
|
22
25
|
subscriber.addTopics(walletName, `${signTopicPrefix}-${walletName}-${token}`, `${notifyTopicPrefix}-${walletName}-${token}`);
|
|
23
26
|
return c.json({ status: 'registered', subscription_token: token }, 201);
|
|
@@ -34,6 +37,7 @@ export function createDeviceRoutes(opts) {
|
|
|
34
37
|
// DELETE /devices/:token — unregister device token
|
|
35
38
|
app.delete('/devices/:token', (c) => {
|
|
36
39
|
const pushToken = c.req.param('token');
|
|
40
|
+
debug(`DELETE /devices/${pushToken.slice(0, 8)}...`);
|
|
37
41
|
// Look up device before deletion to get topic info
|
|
38
42
|
const device = registry.getByPushToken(pushToken);
|
|
39
43
|
const removed = registry.unregister(pushToken);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-routes.js","sourceRoot":"","sources":["../../src/registry/device-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"device-routes.js","sourceRoot":"","sources":["../../src/registry/device-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sign-response-routes.d.ts","sourceRoot":"","sources":["../../src/relay/sign-response-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"sign-response-routes.d.ts","sourceRoot":"","sources":["../../src/relay/sign-response-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAY5B,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,GAAG,IAAI,CA+C3E"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
2
|
import { z } from 'zod';
|
|
3
|
+
import { debug } from '../logger.js';
|
|
3
4
|
const SignResponseRelaySchema = z.object({
|
|
4
5
|
requestId: z.string().uuid(),
|
|
5
6
|
action: z.enum(['approve', 'reject']),
|
|
@@ -17,6 +18,7 @@ export function createSignResponseRoutes(opts) {
|
|
|
17
18
|
return c.json({ error: 'Invalid request', details: parsed.error.issues }, 400);
|
|
18
19
|
}
|
|
19
20
|
const { requestId, action, signature, signerAddress, responseTopic } = parsed.data;
|
|
21
|
+
debug(`POST /v1/sign-response: requestId=${requestId}, action=${action}, topic=${responseTopic}`);
|
|
20
22
|
// Build a full SignResponse object
|
|
21
23
|
const signResponse = {
|
|
22
24
|
version: '1',
|
|
@@ -35,8 +37,10 @@ export function createSignResponseRoutes(opts) {
|
|
|
35
37
|
body: encoded,
|
|
36
38
|
});
|
|
37
39
|
if (!ntfyRes.ok) {
|
|
40
|
+
debug(`ntfy relay failed: HTTP ${ntfyRes.status}, url=${ntfyUrl}`);
|
|
38
41
|
return c.json({ error: 'Failed to relay response to ntfy', status: ntfyRes.status }, 502);
|
|
39
42
|
}
|
|
43
|
+
debug(`Sign response relayed: requestId=${requestId}`);
|
|
40
44
|
return c.json({ status: 'relayed', requestId }, 200);
|
|
41
45
|
});
|
|
42
46
|
return app;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sign-response-routes.js","sourceRoot":"","sources":["../../src/relay/sign-response-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"sign-response-routes.js","sourceRoot":"","sources":["../../src/relay/sign-response-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;IAC5B,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACrC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CACjC,CAAC,CAAC;AAMH,MAAM,UAAU,wBAAwB,CAAC,IAA4B;IACnE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAEvB,4DAA4D;IAC5D,GAAG,CAAC,IAAI,CAAC,mBAAmB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACxC,MAAM,IAAI,GAAY,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,uBAAuB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;QACjF,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;QACnF,KAAK,CAAC,qCAAqC,SAAS,YAAY,MAAM,WAAW,aAAa,EAAE,CAAC,CAAC;QAElG,mCAAmC;QACnC,MAAM,YAAY,GAAG;YACnB,OAAO,EAAE,GAAY;YACrB,SAAS;YACT,MAAM;YACN,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjD,aAAa;YACb,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACnC,CAAC;QAEF,mDAAmD;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,aAAa,EAAE,CAAC;QAEtD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE;YACnC,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,OAAO;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;YAChB,KAAK,CAAC,2BAA2B,OAAO,CAAC,MAAM,SAAS,OAAO,EAAE,CAAC,CAAC;YACnE,OAAO,CAAC,CAAC,IAAI,CACX,EAAE,KAAK,EAAE,kCAAkC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,EACrE,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,KAAK,CAAC,oCAAoC,SAAS,EAAE,CAAC,CAAC;QACvD,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,GAAG,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAM5B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,cAAc,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CA+BnD"}
|
package/dist/server.js
CHANGED
|
@@ -1,10 +1,23 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
|
+
import { cors } from 'hono/cors';
|
|
2
3
|
import { apiKeyAuth } from './middleware/api-key-auth.js';
|
|
4
|
+
import { debug } from './logger.js';
|
|
3
5
|
import { createDeviceRoutes } from './registry/device-routes.js';
|
|
4
6
|
import { createSignResponseRoutes } from './relay/sign-response-routes.js';
|
|
5
7
|
export function createServer(opts) {
|
|
6
8
|
const app = new Hono();
|
|
7
9
|
const { registry, subscriber, provider, apiKey, ntfyServer, signTopicPrefix, notifyTopicPrefix, version } = opts;
|
|
10
|
+
// Request logging (debug mode)
|
|
11
|
+
app.use('/*', async (c, next) => {
|
|
12
|
+
debug(`→ ${c.req.method} ${c.req.path}`);
|
|
13
|
+
await next();
|
|
14
|
+
});
|
|
15
|
+
// CORS — allow cross-origin requests from wallet apps
|
|
16
|
+
app.use('/*', cors({
|
|
17
|
+
origin: '*',
|
|
18
|
+
allowHeaders: ['Content-Type', 'X-API-Key'],
|
|
19
|
+
allowMethods: ['GET', 'POST', 'DELETE', 'OPTIONS'],
|
|
20
|
+
}));
|
|
8
21
|
// Health check is public
|
|
9
22
|
const deviceRoutes = createDeviceRoutes({ registry, subscriber, provider, signTopicPrefix, notifyTopicPrefix, version });
|
|
10
23
|
// Sign response relay (public — wallet apps call this without API key)
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAgB3E,MAAM,UAAU,YAAY,CAAC,IAAgB;IAC3C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEjH,yBAAyB;IACzB,MAAM,YAAY,GAAG,kBAAkB,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAC,CAAC;IAEzH,uEAAuE;IACvE,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAEpE,oEAAoE;IACpE,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1C,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAEzC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC7B,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;IAEnC,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAgB3E,MAAM,UAAU,YAAY,CAAC,IAAgB;IAC3C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEjH,+BAA+B;IAC/B,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;QAC9B,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QACzC,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,sDAAsD;IACtD,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,MAAM,EAAE,GAAG;QACX,YAAY,EAAE,CAAC,cAAc,EAAE,WAAW,CAAC;QAC3C,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC;KACnD,CAAC,CAAC,CAAC;IAEJ,yBAAyB;IACzB,MAAM,YAAY,GAAG,kBAAkB,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAC,CAAC;IAEzH,uEAAuE;IACvE,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAEpE,oEAAoE;IACpE,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1C,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAEzC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC7B,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;IAEnC,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ntfy-subscriber.d.ts","sourceRoot":"","sources":["../../src/subscriber/ntfy-subscriber.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAqB,MAAM,qBAAqB,CAAC;AAE1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"ntfy-subscriber.d.ts","sourceRoot":"","sources":["../../src/subscriber/ntfy-subscriber.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAqB,MAAM,qBAAqB,CAAC;AAE1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAUjF,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtF,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAClC,2GAA2G;IAC3G,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC1E;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAqB;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAsC;IACvE,0CAA0C;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6B;IAC5D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAsB;IACnD,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAK;gBAEZ,IAAI,EAAE,kBAAkB;IAKpC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,KAAK,IAAI,IAAI;IAab,yEAAyE;IACzE,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAW3E,iEAAiE;IACjE,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAepD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAS3B,OAAO,CAAC,cAAc;YAQR,UAAU;IA8HxB;;;;OAIG;YACW,yBAAyB;IA2CvC,OAAO,CAAC,KAAK;CAQd"}
|
|
@@ -2,6 +2,7 @@ import { buildPushPayload, determineMessageType } from './message-parser.js';
|
|
|
2
2
|
import { get as httpsGet } from 'node:https';
|
|
3
3
|
import { get as httpGet } from 'node:http';
|
|
4
4
|
import { createUnzip, createBrotliDecompress } from 'node:zlib';
|
|
5
|
+
import { debug } from '../logger.js';
|
|
5
6
|
const MAX_RECONNECT_DELAY_MS = 60_000;
|
|
6
7
|
const INITIAL_RECONNECT_DELAY_MS = 1_000;
|
|
7
8
|
export class NtfySubscriber {
|
|
@@ -68,6 +69,7 @@ export class NtfySubscriber {
|
|
|
68
69
|
this.topicWalletMap.clear();
|
|
69
70
|
}
|
|
70
71
|
subscribeTopic(topic, walletName) {
|
|
72
|
+
debug(`Subscribing to topic: ${topic} (wallet=${walletName})`);
|
|
71
73
|
const controller = new AbortController();
|
|
72
74
|
this.abortControllers.set(topic, controller);
|
|
73
75
|
this.topicWalletMap.set(topic, walletName);
|
|
@@ -78,6 +80,7 @@ export class NtfySubscriber {
|
|
|
78
80
|
return;
|
|
79
81
|
try {
|
|
80
82
|
const url = `${this.opts.ntfyServer}/${topic}/sse`;
|
|
83
|
+
debug(`SSE connecting: ${url}`);
|
|
81
84
|
const isHttps = url.startsWith('https');
|
|
82
85
|
const getter = isHttps ? httpsGet : httpGet;
|
|
83
86
|
const res = await new Promise((resolve, reject) => {
|
|
@@ -96,6 +99,7 @@ export class NtfySubscriber {
|
|
|
96
99
|
}
|
|
97
100
|
// Reset reconnect delay on successful connection
|
|
98
101
|
const nextDelay = INITIAL_RECONNECT_DELAY_MS;
|
|
102
|
+
debug(`SSE connected: ${topic} (HTTP ${res.statusCode}, encoding=${res.headers['content-encoding'] ?? 'none'})`);
|
|
99
103
|
// Explicit decompression based on Content-Encoding header.
|
|
100
104
|
// node:http does NOT auto-decompress, giving us full control.
|
|
101
105
|
const encoding = res.headers['content-encoding'];
|
|
@@ -132,6 +136,7 @@ export class NtfySubscriber {
|
|
|
132
136
|
// ntfy converts messages exceeding size limit to file attachments.
|
|
133
137
|
// Download the attachment to recover the original message. (#243)
|
|
134
138
|
if (ntfyMsg.attachment?.url) {
|
|
139
|
+
debug(`Message has attachment, downloading: ${ntfyMsg.attachment.url}`);
|
|
135
140
|
void this.fetchAttachmentAndProcess(ntfyMsg, walletName, topic);
|
|
136
141
|
continue;
|
|
137
142
|
}
|
|
@@ -157,6 +162,7 @@ export class NtfySubscriber {
|
|
|
157
162
|
});
|
|
158
163
|
// Stream ended normally — reconnect
|
|
159
164
|
if (!controller.signal.aborted) {
|
|
165
|
+
debug(`SSE stream ended for ${topic}, reconnecting in ${nextDelay}ms`);
|
|
160
166
|
await this.delay(nextDelay);
|
|
161
167
|
return this.connectSse(topic, walletName, controller, nextDelay);
|
|
162
168
|
}
|
|
@@ -167,6 +173,7 @@ export class NtfySubscriber {
|
|
|
167
173
|
this.opts.onError?.(_err instanceof Error ? _err : new Error(String(_err)));
|
|
168
174
|
// Exponential backoff reconnect
|
|
169
175
|
const nextDelay = Math.min(reconnectDelay * 2, MAX_RECONNECT_DELAY_MS);
|
|
176
|
+
debug(`SSE error for ${topic}, reconnecting in ${reconnectDelay}ms (next=${nextDelay}ms)`);
|
|
170
177
|
await this.delay(reconnectDelay);
|
|
171
178
|
return this.connectSse(topic, walletName, controller, nextDelay);
|
|
172
179
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ntfy-subscriber.js","sourceRoot":"","sources":["../../src/subscriber/ntfy-subscriber.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE7E,OAAO,EAAE,GAAG,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,GAAG,IAAI,OAAO,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"ntfy-subscriber.js","sourceRoot":"","sources":["../../src/subscriber/ntfy-subscriber.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@waiaas/push-relay",
|
|
3
|
-
"version": "2.10.0-rc",
|
|
3
|
+
"version": "2.10.0-rc.10",
|
|
4
4
|
"description": "WAIaaS Push Relay Server - bridge ntfy topics to push notification services (Pushwoosh, FCM)",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"hono": "^4.5.0",
|
|
42
42
|
"smol-toml": "^1.3.0",
|
|
43
43
|
"zod": "^3.24.0",
|
|
44
|
-
"@waiaas/core": "2.10.0-rc"
|
|
44
|
+
"@waiaas/core": "2.10.0-rc.10"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@types/better-sqlite3": "^7.6.8",
|