@opendatalabs/personal-server-ts-server 0.2.0 → 1.1.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.
Files changed (177) hide show
  1. package/dist/api-auth.d.ts +16 -0
  2. package/dist/api-auth.d.ts.map +1 -0
  3. package/dist/api-auth.js +97 -0
  4. package/dist/api-auth.js.map +1 -0
  5. package/dist/api.d.ts +4 -0
  6. package/dist/api.d.ts.map +1 -1
  7. package/dist/api.js +3 -0
  8. package/dist/api.js.map +1 -1
  9. package/dist/app.d.ts +46 -1
  10. package/dist/app.d.ts.map +1 -1
  11. package/dist/app.js +102 -30
  12. package/dist/app.js.map +1 -1
  13. package/dist/bootstrap.d.ts +11 -3
  14. package/dist/bootstrap.d.ts.map +1 -1
  15. package/dist/bootstrap.js +266 -33
  16. package/dist/bootstrap.js.map +1 -1
  17. package/dist/client.d.ts +17 -0
  18. package/dist/client.d.ts.map +1 -0
  19. package/dist/client.js +368 -0
  20. package/dist/client.js.map +1 -0
  21. package/dist/config/defaults.d.ts +12 -0
  22. package/dist/config/defaults.d.ts.map +1 -0
  23. package/dist/config/defaults.js +14 -0
  24. package/dist/config/defaults.js.map +1 -0
  25. package/dist/config/index.d.ts +4 -0
  26. package/dist/config/index.d.ts.map +1 -0
  27. package/dist/config/index.js +4 -0
  28. package/dist/config/index.js.map +1 -0
  29. package/dist/config/loader.d.ts +8 -0
  30. package/dist/config/loader.d.ts.map +1 -0
  31. package/dist/config/loader.js +74 -0
  32. package/dist/config/loader.js.map +1 -0
  33. package/dist/config/paths.d.ts +9 -0
  34. package/dist/config/paths.d.ts.map +1 -0
  35. package/dist/config/paths.js +22 -0
  36. package/dist/config/paths.js.map +1 -0
  37. package/dist/hono-context.d.ts +14 -0
  38. package/dist/hono-context.d.ts.map +1 -0
  39. package/dist/hono-context.js +2 -0
  40. package/dist/hono-context.js.map +1 -0
  41. package/dist/index.js +64 -12
  42. package/dist/index.js.map +1 -1
  43. package/dist/keys/server-account.d.ts +28 -0
  44. package/dist/keys/server-account.d.ts.map +1 -0
  45. package/dist/keys/server-account.js +48 -0
  46. package/dist/keys/server-account.js.map +1 -0
  47. package/dist/logger/index.d.ts +5 -0
  48. package/dist/logger/index.d.ts.map +1 -0
  49. package/dist/logger/index.js +9 -0
  50. package/dist/logger/index.js.map +1 -0
  51. package/dist/logging/access-log.d.ts +15 -0
  52. package/dist/logging/access-log.d.ts.map +1 -0
  53. package/dist/logging/access-log.js +25 -0
  54. package/dist/logging/access-log.js.map +1 -0
  55. package/dist/logging/access-reader.d.ts +19 -0
  56. package/dist/logging/access-reader.d.ts.map +1 -0
  57. package/dist/logging/access-reader.js +50 -0
  58. package/dist/logging/access-reader.js.map +1 -0
  59. package/dist/middleware/access-log.d.ts.map +1 -1
  60. package/dist/middleware/access-log.js +8 -2
  61. package/dist/middleware/access-log.js.map +1 -1
  62. package/dist/middleware/builder-check.d.ts +2 -2
  63. package/dist/middleware/builder-check.d.ts.map +1 -1
  64. package/dist/middleware/builder-check.js +7 -2
  65. package/dist/middleware/builder-check.js.map +1 -1
  66. package/dist/middleware/owner-check.js +1 -1
  67. package/dist/middleware/owner-check.js.map +1 -1
  68. package/dist/middleware/web3-auth.d.ts +12 -0
  69. package/dist/middleware/web3-auth.d.ts.map +1 -1
  70. package/dist/middleware/web3-auth.js +27 -31
  71. package/dist/middleware/web3-auth.js.map +1 -1
  72. package/dist/migrations/local-state.d.ts +21 -0
  73. package/dist/migrations/local-state.d.ts.map +1 -0
  74. package/dist/migrations/local-state.js +106 -0
  75. package/dist/migrations/local-state.js.map +1 -0
  76. package/dist/routes/access-logs.d.ts +7 -0
  77. package/dist/routes/access-logs.d.ts.map +1 -1
  78. package/dist/routes/access-logs.js +11 -17
  79. package/dist/routes/access-logs.js.map +1 -1
  80. package/dist/routes/auth-device.d.ts +49 -0
  81. package/dist/routes/auth-device.d.ts.map +1 -0
  82. package/dist/routes/auth-device.js +581 -0
  83. package/dist/routes/auth-device.js.map +1 -0
  84. package/dist/routes/data.d.ts +42 -1
  85. package/dist/routes/data.d.ts.map +1 -1
  86. package/dist/routes/data.js +36 -201
  87. package/dist/routes/data.js.map +1 -1
  88. package/dist/routes/grants.d.ts +9 -2
  89. package/dist/routes/grants.d.ts.map +1 -1
  90. package/dist/routes/grants.js +18 -196
  91. package/dist/routes/grants.js.map +1 -1
  92. package/dist/routes/health.d.ts +7 -1
  93. package/dist/routes/health.d.ts.map +1 -1
  94. package/dist/routes/health.js +39 -2
  95. package/dist/routes/health.js.map +1 -1
  96. package/dist/routes/mcp.d.ts +93 -6
  97. package/dist/routes/mcp.d.ts.map +1 -1
  98. package/dist/routes/mcp.js +526 -53
  99. package/dist/routes/mcp.js.map +1 -1
  100. package/dist/routes/oauth-token.d.ts +56 -0
  101. package/dist/routes/oauth-token.d.ts.map +1 -0
  102. package/dist/routes/oauth-token.js +49 -0
  103. package/dist/routes/oauth-token.js.map +1 -0
  104. package/dist/routes/sync.d.ts +7 -0
  105. package/dist/routes/sync.d.ts.map +1 -1
  106. package/dist/routes/sync.js +12 -39
  107. package/dist/routes/sync.js.map +1 -1
  108. package/dist/routes/ui-config.d.ts.map +1 -1
  109. package/dist/routes/ui-config.js +17 -82
  110. package/dist/routes/ui-config.js.map +1 -1
  111. package/dist/routes/ui-registration.d.ts +9 -0
  112. package/dist/routes/ui-registration.d.ts.map +1 -0
  113. package/dist/routes/ui-registration.js +217 -0
  114. package/dist/routes/ui-registration.js.map +1 -0
  115. package/dist/routes/ui.d.ts +1 -0
  116. package/dist/routes/ui.d.ts.map +1 -1
  117. package/dist/routes/ui.js +46 -4
  118. package/dist/routes/ui.js.map +1 -1
  119. package/dist/storage/hierarchy.d.ts +29 -0
  120. package/dist/storage/hierarchy.d.ts.map +1 -0
  121. package/dist/storage/hierarchy.js +241 -0
  122. package/dist/storage/hierarchy.js.map +1 -0
  123. package/dist/storage/index-manager.d.ts +53 -0
  124. package/dist/storage/index-manager.d.ts.map +1 -0
  125. package/dist/storage/index-manager.js +167 -0
  126. package/dist/storage/index-manager.js.map +1 -0
  127. package/dist/storage/index-schema.d.ts +5 -0
  128. package/dist/storage/index-schema.d.ts.map +1 -0
  129. package/dist/storage/index-schema.js +62 -0
  130. package/dist/storage/index-schema.js.map +1 -0
  131. package/dist/storage/node-data-storage.d.ts +9 -0
  132. package/dist/storage/node-data-storage.d.ts.map +1 -0
  133. package/dist/storage/node-data-storage.js +84 -0
  134. package/dist/storage/node-data-storage.js.map +1 -0
  135. package/dist/sync-cursor.d.ts +15 -0
  136. package/dist/sync-cursor.d.ts.map +1 -0
  137. package/dist/sync-cursor.js +110 -0
  138. package/dist/sync-cursor.js.map +1 -0
  139. package/dist/token-store.d.ts +22 -0
  140. package/dist/token-store.d.ts.map +1 -0
  141. package/dist/token-store.js +120 -0
  142. package/dist/token-store.js.map +1 -0
  143. package/dist/tunnel/auth.d.ts +4 -0
  144. package/dist/tunnel/auth.d.ts.map +1 -1
  145. package/dist/tunnel/auth.js +2 -1
  146. package/dist/tunnel/auth.js.map +1 -1
  147. package/dist/tunnel/config.d.ts +1 -0
  148. package/dist/tunnel/config.d.ts.map +1 -1
  149. package/dist/tunnel/config.js +1 -1
  150. package/dist/tunnel/config.js.map +1 -1
  151. package/dist/tunnel/manager.d.ts +21 -1
  152. package/dist/tunnel/manager.d.ts.map +1 -1
  153. package/dist/tunnel/manager.js +78 -23
  154. package/dist/tunnel/manager.js.map +1 -1
  155. package/dist/tunnel/verify.d.ts +1 -1
  156. package/dist/tunnel/verify.d.ts.map +1 -1
  157. package/dist/tunnel/verify.js +8 -2
  158. package/dist/tunnel/verify.js.map +1 -1
  159. package/dist/ui/browser_tls_rustls_bg.wasm +0 -0
  160. package/dist/ui/index.html +2192 -0
  161. package/dist/ui/ps-lite-debug.d.ts +93 -0
  162. package/dist/ui/ps-lite-debug.d.ts.map +1 -0
  163. package/dist/ui/ps-lite-debug.js +129416 -0
  164. package/dist/ui/ps-lite-debug.js.map +1 -0
  165. package/package.json +20 -8
  166. package/dist/middleware/grant-check.d.ts +0 -12
  167. package/dist/middleware/grant-check.d.ts.map +0 -1
  168. package/dist/middleware/grant-check.js +0 -90
  169. package/dist/middleware/grant-check.js.map +0 -1
  170. package/dist/oauth/provider.d.ts +0 -55
  171. package/dist/oauth/provider.d.ts.map +0 -1
  172. package/dist/oauth/provider.js +0 -160
  173. package/dist/oauth/provider.js.map +0 -1
  174. package/dist/oauth/routes.d.ts +0 -10
  175. package/dist/oauth/routes.d.ts.map +0 -1
  176. package/dist/oauth/routes.js +0 -206
  177. package/dist/oauth/routes.js.map +0 -1
package/dist/bootstrap.js CHANGED
@@ -2,21 +2,46 @@ import { mkdir } from "node:fs/promises";
2
2
  import { createRequire } from "node:module";
3
3
  import { randomUUID } from "node:crypto";
4
4
  import { join } from "node:path";
5
+ import { privateKeyToAccount } from "viem/accounts";
5
6
  const require = createRequire(import.meta.url);
6
7
  const pkg = require("../package.json");
7
- import { DEFAULT_ROOT_PATH, resolveRootPath, } from "@opendatalabs/personal-server-ts-core/config";
8
- import { createLogger, } from "@opendatalabs/personal-server-ts-core/logger";
9
- import { initializeDatabase, createIndexManager, } from "@opendatalabs/personal-server-ts-core/storage/index";
10
- import { createGatewayClient } from "@opendatalabs/personal-server-ts-core/gateway";
11
- import { createAccessLogWriter } from "@opendatalabs/personal-server-ts-core/logging/access-log";
12
- import { createAccessLogReader } from "@opendatalabs/personal-server-ts-core/logging/access-reader";
13
- import { deriveMasterKey, recoverServerOwner, loadOrCreateServerAccount, } from "@opendatalabs/personal-server-ts-core/keys";
14
- import { createServerSigner, createRequestSigner, } from "@opendatalabs/personal-server-ts-core/signing";
15
- import { createSyncCursor, createSyncManager, } from "@opendatalabs/personal-server-ts-core/sync";
16
- import { createVanaStorageAdapter } from "@opendatalabs/personal-server-ts-core/storage/adapters";
8
+ import { DEFAULT_ROOT_PATH, resolveRootPath } from "./config/index.js";
9
+ import { createLogger } from "./logger/index.js";
10
+ import { initializeDatabase } from "./storage/index-schema.js";
11
+ import { createIndexManager, } from "./storage/index-manager.js";
12
+ import { createGatewayClient } from "@opendatalabs/vana-sdk/node";
13
+ import { createAccessLogWriter } from "./logging/access-log.js";
14
+ import { createAccessLogReader } from "./logging/access-reader.js";
15
+ import { deriveMasterKey, recoverServerOwner, } from "@opendatalabs/vana-sdk/node";
16
+ import { loadOrCreateServerAccount } from "./keys/server-account.js";
17
+ import { createServerSigner } from "@opendatalabs/personal-server-ts-core/signing";
18
+ import { createSyncCursor } from "./sync-cursor.js";
19
+ import { createSyncManager, } from "@opendatalabs/personal-server-ts-core/sync";
20
+ import { createVanaSyncStorageAdapter } from "@opendatalabs/personal-server-ts-core/storage/adapters";
17
21
  import { createApp } from "./app.js";
18
22
  import { generateDevToken } from "./dev-token.js";
23
+ import { migrateLocalState } from "./migrations/local-state.js";
24
+ import { createTokenStore } from "./token-store.js";
19
25
  import { TunnelManager, ensureFrpcBinary } from "./tunnel/index.js";
26
+ import { createNodeDataStorage } from "./storage/node-data-storage.js";
27
+ const DEFAULT_LOCAL_APPROVAL_PORT = 34127;
28
+ function resolveLocalApprovalPort(serverPort) {
29
+ const raw = process.env.LOCAL_AUTH_PORT;
30
+ if (raw !== undefined) {
31
+ const parsed = Number(raw);
32
+ if (Number.isInteger(parsed) &&
33
+ parsed >= 1 &&
34
+ parsed <= 65535 &&
35
+ parsed !== serverPort) {
36
+ return parsed;
37
+ }
38
+ }
39
+ const adjacentPort = serverPort + 1;
40
+ if (adjacentPort <= 65535) {
41
+ return adjacentPort;
42
+ }
43
+ return DEFAULT_LOCAL_APPROVAL_PORT;
44
+ }
20
45
  export async function createServer(config, options) {
21
46
  const logger = createLogger(config.logging);
22
47
  const startedAt = new Date();
@@ -24,22 +49,53 @@ export async function createServer(config, options) {
24
49
  const dataDir = options?.dataDir ?? join(storageRoot, "data");
25
50
  const indexPath = join(storageRoot, "index.db");
26
51
  const configPath = join(storageRoot, "config.json");
52
+ const syncCursorPath = join(storageRoot, "sync-cursor.json");
53
+ const tokensPath = join(storageRoot, "tokens.json");
27
54
  await mkdir(storageRoot, { recursive: true });
28
55
  await mkdir(dataDir, { recursive: true });
29
56
  const db = initializeDatabase(indexPath);
57
+ await migrateLocalState({
58
+ storageRoot,
59
+ dataDir,
60
+ configPath,
61
+ syncCursorPath,
62
+ tokensPath,
63
+ });
30
64
  const indexManager = createIndexManager(db);
31
65
  const hierarchyOptions = { dataDir };
32
- const gatewayClient = createGatewayClient(config.gateway.url);
66
+ const dataStorage = createNodeDataStorage({ indexManager, hierarchyOptions });
67
+ const gatewayClient = options?.gatewayClient ?? createGatewayClient(config.gateway.url);
68
+ // X402 payment enforcement on data reads. When config.payment.enabled is
69
+ // true, GET /v1/data/:scope requires builders to supply a signed X-PAYMENT
70
+ // header on every read; the server forwards to gateway.payForOperation.
71
+ // See packages/core/src/payment/x402.ts. Off-by-default for development
72
+ // and test setups where signing payment per read is friction.
73
+ if (config.payment.enabled) {
74
+ logger.info("X402 payment enforcement enabled on data reads");
75
+ }
33
76
  // Derive server owner from VANA_MASTER_KEY_SIGNATURE env var
34
- const masterKeySignature = process.env.VANA_MASTER_KEY_SIGNATURE;
77
+ const masterKeySignature = options?.ownerSignature ??
78
+ process.env.VANA_MASTER_KEY_SIGNATURE;
79
+ const ownerPrivateKey = process.env.VANA_OWNER_PRIVATE_KEY;
80
+ const ownerTunnelSigner = ownerPrivateKey
81
+ ? privateKeyToAccount(ownerPrivateKey.startsWith("0x")
82
+ ? ownerPrivateKey
83
+ : `0x${ownerPrivateKey}`)
84
+ : null;
35
85
  let serverOwner;
36
86
  let serverAccount;
37
87
  let serverSigner;
38
88
  let identity;
39
89
  if (masterKeySignature) {
40
- serverOwner = await recoverServerOwner(masterKeySignature);
90
+ const recoveredServerOwner = await recoverServerOwner(masterKeySignature);
91
+ serverOwner = recoveredServerOwner;
41
92
  deriveMasterKey(masterKeySignature); // validate signature format
42
93
  logger.info({ owner: serverOwner }, "Server owner derived from master key");
94
+ if (ownerTunnelSigner &&
95
+ ownerTunnelSigner.address.toLowerCase() !==
96
+ recoveredServerOwner.toLowerCase()) {
97
+ throw new Error("VANA_OWNER_PRIVATE_KEY does not match VANA_MASTER_KEY_SIGNATURE owner");
98
+ }
43
99
  // Load or create server keypair from disk
44
100
  const keyPath = join(storageRoot, "key.json");
45
101
  serverAccount = loadOrCreateServerAccount(keyPath);
@@ -58,6 +114,30 @@ export async function createServer(config, options) {
58
114
  else {
59
115
  logger.warn("VANA_MASTER_KEY_SIGNATURE not set — owner-restricted endpoints will return 500");
60
116
  }
117
+ // Resolve PS_ACCESS_TOKEN for cloud control-plane / bootstrap auth.
118
+ // This is not the per-login CLI session token returned to users.
119
+ let accessToken = process.env.PS_ACCESS_TOKEN;
120
+ if (!accessToken && process.env.CLOUD_MODE === "true") {
121
+ try {
122
+ const metadataRes = await fetch("http://metadata.google.internal/computeMetadata/v1/instance/attributes/ps-access-token", {
123
+ headers: { "Metadata-Flavor": "Google" },
124
+ signal: AbortSignal.timeout(2000),
125
+ });
126
+ if (metadataRes.ok) {
127
+ const token = (await metadataRes.text()).trim();
128
+ if (token.length > 0) {
129
+ accessToken = token;
130
+ logger.info("PS control-plane token loaded from instance metadata");
131
+ }
132
+ }
133
+ }
134
+ catch {
135
+ logger.debug("Could not read PS control-plane token from instance metadata");
136
+ }
137
+ }
138
+ if (accessToken) {
139
+ logger.info("PS_ACCESS_TOKEN configured — control-plane bearer auth enabled");
140
+ }
61
141
  // Download frpc binary eagerly (auth-independent) so it's ready when the user signs in
62
142
  let frpcBinaryPath = "";
63
143
  if (config.tunnel.enabled) {
@@ -78,19 +158,16 @@ export async function createServer(config, options) {
78
158
  serverAccount &&
79
159
  serverSigner) {
80
160
  const masterKey = deriveMasterKey(masterKeySignature);
81
- const vanaConfig = config.storage.config.vana ?? {
82
- apiUrl: "https://storage.vana.com",
83
- };
84
- const requestSigner = createRequestSigner(serverAccount);
85
- const storageAdapter = createVanaStorageAdapter({
86
- apiUrl: vanaConfig.apiUrl,
87
- ownerAddress: serverOwner,
88
- signer: requestSigner,
161
+ const storageAdapter = createVanaSyncStorageAdapter({
162
+ config,
163
+ serverOwner,
164
+ serverAccount,
165
+ });
166
+ const cursor = createSyncCursor(syncCursorPath, {
167
+ legacyConfigPath: configPath,
89
168
  });
90
- const cursor = createSyncCursor(configPath);
91
169
  const uploadDeps = {
92
- indexManager,
93
- hierarchyOptions,
170
+ storage: dataStorage,
94
171
  storageAdapter,
95
172
  gateway: gatewayClient,
96
173
  signer: serverSigner,
@@ -99,8 +176,7 @@ export async function createServer(config, options) {
99
176
  logger,
100
177
  };
101
178
  const downloadDeps = {
102
- indexManager,
103
- hierarchyOptions,
179
+ storage: dataStorage,
104
180
  storageAdapter,
105
181
  gateway: gatewayClient,
106
182
  cursor,
@@ -108,7 +184,29 @@ export async function createServer(config, options) {
108
184
  serverOwner,
109
185
  logger,
110
186
  };
111
- syncManager = createSyncManager(uploadDeps, downloadDeps);
187
+ syncManager = createSyncManager(uploadDeps, downloadDeps, {
188
+ async canSync() {
189
+ try {
190
+ const serverInfo = await gatewayClient.getServer(serverAccount.address);
191
+ identity.serverId = serverInfo?.id ?? null;
192
+ if (serverInfo?.id)
193
+ return { ok: true };
194
+ return {
195
+ ok: false,
196
+ reason: "unregistered",
197
+ message: "Register this Personal Server before syncing.",
198
+ };
199
+ }
200
+ catch (err) {
201
+ logger.warn({ err }, "Could not verify server registration for sync");
202
+ return {
203
+ ok: false,
204
+ reason: "registration_check_failed",
205
+ message: "Could not verify server registration before syncing.",
206
+ };
207
+ }
208
+ },
209
+ });
112
210
  syncManager.start();
113
211
  logger.info("Sync engine started");
114
212
  }
@@ -121,10 +219,34 @@ export async function createServer(config, options) {
121
219
  const accessLogReader = createAccessLogReader(logsDir);
122
220
  // Generate ephemeral dev token when devUi is enabled
123
221
  const devToken = config.devUi.enabled ? generateDevToken() : undefined;
222
+ // Token store for /auth/device flow (self-hosted CLI auth)
223
+ const tokenStore = createTokenStore(tokensPath, logger);
224
+ const cloudMode = process.env.CLOUD_MODE === "true";
225
+ const localApprovalPort = cloudMode
226
+ ? undefined
227
+ : resolveLocalApprovalPort(config.server.port);
124
228
  // Mutable origin — starts with config value, updated when tunnel connects
125
229
  let effectiveOrigin = config.server.origin;
230
+ let effectiveLocalApprovalOrigin;
126
231
  // Mutable tunnelManager — set when tunnel starts in background
127
232
  let tunnelManager;
233
+ // Registration can land after boot (desktop signing exchange or the
234
+ // /ui/api registration route); the tunnel connect is gated on it, so the
235
+ // route needs a way to trigger the deferred connect. Assigned inside
236
+ // startBackgroundServices once the tunnel is reserved.
237
+ let notifyServerRegistered = () => { };
238
+ let registrationPollTimer = null;
239
+ // Set by cleanup(). A poll iteration that is mid-flight when cleanup runs
240
+ // holds no timer handle, so clearing the timer alone cannot stop it — and
241
+ // a reserved-but-never-connected TunnelManager would happily spawn frpc
242
+ // from an orphaned poll after shutdown. Every deferred path checks this.
243
+ let backgroundClosed = false;
244
+ const clearRegistrationPoll = () => {
245
+ if (registrationPollTimer) {
246
+ clearTimeout(registrationPollTimer);
247
+ registrationPollTimer = null;
248
+ }
249
+ };
128
250
  const app = createApp({
129
251
  logger,
130
252
  version: pkg.version,
@@ -132,18 +254,33 @@ export async function createServer(config, options) {
132
254
  indexManager,
133
255
  hierarchyOptions,
134
256
  serverOrigin: () => effectiveOrigin,
257
+ localApprovalOrigin: () => effectiveLocalApprovalOrigin,
135
258
  serverOwner,
136
259
  identity,
137
260
  gateway: gatewayClient,
261
+ gatewayConfig: config.gateway,
262
+ paymentEnabled: config.payment.enabled,
263
+ gatewayUrl: config.gateway.url,
264
+ config,
138
265
  accessLogWriter,
139
266
  accessLogReader,
267
+ readFulfillmentReporter: options?.readFulfillmentReporter,
268
+ dataStorage,
269
+ cloudMode,
140
270
  devToken,
271
+ ownerSignature: masterKeySignature,
272
+ ownerPrivateKey,
273
+ accessToken,
274
+ tokenStore,
141
275
  configPath,
142
276
  syncManager,
143
277
  serverSigner,
144
278
  getTunnelStatus: () => tunnelManager?.getStatus() ?? null,
279
+ onServerRegistered: (serverId) => notifyServerRegistered(serverId),
145
280
  });
146
281
  const cleanup = async () => {
282
+ backgroundClosed = true;
283
+ clearRegistrationPoll();
147
284
  if (tunnelManager) {
148
285
  await tunnelManager.stop();
149
286
  }
@@ -165,6 +302,12 @@ export async function createServer(config, options) {
165
302
  syncManager,
166
303
  tunnelManager,
167
304
  tunnelUrl: undefined,
305
+ isServerRegistered: () => Boolean(identity?.serverId),
306
+ localApprovalPort,
307
+ getLocalApprovalOrigin: () => effectiveLocalApprovalOrigin,
308
+ setLocalApprovalOrigin: (origin) => {
309
+ effectiveLocalApprovalOrigin = origin;
310
+ },
168
311
  devToken,
169
312
  startBackgroundServices: async () => {
170
313
  // --- Gateway registration check (slow: HTTP call) ---
@@ -194,26 +337,116 @@ export async function createServer(config, options) {
194
337
  tunnelManager = new TunnelManager(storageRoot);
195
338
  context.tunnelManager = tunnelManager;
196
339
  const runId = randomUUID();
340
+ let tunnelConnectStarted = false;
341
+ const connectTunnel = async () => {
342
+ const manager = tunnelManager;
343
+ if (!manager || tunnelConnectStarted || backgroundClosed) {
344
+ return;
345
+ }
346
+ tunnelConnectStarted = true;
347
+ try {
348
+ const url = await manager.connect();
349
+ const tunnelStatus = manager.getStatus();
350
+ if (tunnelStatus.status === "connected") {
351
+ logger.info({ tunnelUrl: url }, "Tunnel established");
352
+ }
353
+ else {
354
+ logger.warn({ tunnelUrl: url, warning: tunnelStatus.warning }, "Tunnel URL reserved; waiting for tunnel connection");
355
+ }
356
+ }
357
+ catch (err) {
358
+ logger.warn({ err }, "Tunnel failed to connect - server running in local-only mode");
359
+ tunnelManager = undefined;
360
+ context.tunnelManager = undefined;
361
+ // Local-only mode must keep the local audience/URL: leaving the
362
+ // public URL as effectiveOrigin would reject local Web3Signed
363
+ // callers against an origin that will never route.
364
+ effectiveOrigin = config.server.origin;
365
+ context.tunnelUrl = undefined;
366
+ }
367
+ };
368
+ // Poll fallback for registrations the route callback can't see
369
+ // (e.g. desktop registers with the gateway directly and the sidecar
370
+ // only observes it via a gateway lookup).
371
+ const scheduleRegistrationPoll = () => {
372
+ const pollStartedAt = Date.now();
373
+ const poll = async () => {
374
+ registrationPollTimer = null;
375
+ if (backgroundClosed) {
376
+ return;
377
+ }
378
+ try {
379
+ const serverInfo = await gatewayClient.getServer(serverAccount.address);
380
+ if (serverInfo?.id) {
381
+ if (identity) {
382
+ identity.serverId = serverInfo.id;
383
+ }
384
+ logger.info("Server registration detected — starting tunnel");
385
+ await connectTunnel();
386
+ return;
387
+ }
388
+ }
389
+ catch {
390
+ // Gateway unreachable — keep polling.
391
+ }
392
+ if (backgroundClosed) {
393
+ return;
394
+ }
395
+ const interval = Date.now() - pollStartedAt < 2 * 60_000 ? 5_000 : 30_000;
396
+ registrationPollTimer = setTimeout(() => void poll(), interval);
397
+ registrationPollTimer.unref?.();
398
+ };
399
+ registrationPollTimer = setTimeout(() => void poll(), 5_000);
400
+ registrationPollTimer.unref?.();
401
+ };
402
+ notifyServerRegistered = (serverId) => {
403
+ if (backgroundClosed) {
404
+ return;
405
+ }
406
+ if (serverId) {
407
+ if (identity) {
408
+ identity.serverId = serverId;
409
+ }
410
+ // Only a confirmed serverId stops the poll: on a null result the
411
+ // poll keeps running so identity/health converge once the
412
+ // gateway lookup sees the registration.
413
+ clearRegistrationPoll();
414
+ }
415
+ void connectTunnel();
416
+ };
197
417
  try {
198
- const url = await tunnelManager.start({
418
+ // Reserve the public URL without dialing the relay: the URL is
419
+ // what registration needs, and dialing before the registration
420
+ // lands poisons the relay's delegation cache (BUI-611).
421
+ const url = tunnelManager.reserve({
199
422
  walletAddress: serverAccount.address,
200
423
  ownerAddress: serverOwner,
201
424
  serverKeypair: serverAccount,
425
+ tunnelSigner: ownerTunnelSigner
426
+ ? {
427
+ signMessage: (message) => ownerTunnelSigner.signMessage({ message }),
428
+ }
429
+ : undefined,
202
430
  runId,
203
431
  serverAddr: config.tunnel.serverAddr,
204
432
  serverPort: config.tunnel.serverPort,
205
433
  localPort: config.server.port,
206
434
  }, frpcBinaryPath);
207
- logger.info({ tunnelUrl: url }, "Tunnel established");
208
435
  context.tunnelUrl = url;
436
+ // The public URL is the audience clients sign against, so adopt it
437
+ // as the effective origin as soon as it's known (matches the
438
+ // unity-surfaces #583 sidecar patch).
209
439
  effectiveOrigin = url;
210
- if (!identity?.serverId) {
211
- logger.warn("Tunnel started but server is not registered with gateway — tunnel will not route traffic. Run: npm run register-server");
212
- tunnelManager.setVerified(false, "Server not registered with gateway");
440
+ if (identity?.serverId) {
441
+ await connectTunnel();
442
+ }
443
+ else {
444
+ logger.info({ tunnelUrl: url }, "Tunnel start deferred until server registration — register to enable routing");
445
+ scheduleRegistrationPoll();
213
446
  }
214
447
  }
215
448
  catch (err) {
216
- logger.warn({ err }, "Tunnel failed to connect - server running in local-only mode");
449
+ logger.warn({ err }, "Tunnel failed to start - server running in local-only mode");
217
450
  tunnelManager = undefined;
218
451
  context.tunnelManager = undefined;
219
452
  }
@@ -1 +1 @@
1
- {"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,17 @@
1
+ import type { ServerConfig } from "@opendatalabs/personal-server-ts-core/schemas";
2
+ import { type PersonalServerHandle, type PersonalServerStatus } from "@opendatalabs/personal-server-ts-core/client";
3
+ import type { GatewayClient } from "@opendatalabs/vana-sdk/node";
4
+ import { type CreateServerOptions } from "./bootstrap.js";
5
+ import { type LoadConfigOptions } from "./config/index.js";
6
+ export interface StartPersonalServerNodeOptions extends Pick<CreateServerOptions, "rootPath" | "dataDir" | "ownerSignature" | "readFulfillmentReporter">, LoadConfigOptions {
7
+ config?: ServerConfig;
8
+ configDefaults?: Partial<ServerConfig>;
9
+ port?: number;
10
+ hostname?: string;
11
+ localApproval?: boolean;
12
+ startBackgroundServices?: boolean;
13
+ gatewayClient?: GatewayClient;
14
+ onStatus?: (status: PersonalServerStatus) => void;
15
+ }
16
+ export declare function startPersonalServer(options?: StartPersonalServerNodeOptions): Promise<PersonalServerHandle>;
17
+ //# sourceMappingURL=client.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAeL,KAAK,oBAAoB,EAgBzB,KAAK,oBAAoB,EAG1B,MAAM,8CAA8C,CAAC;AAGtD,OAAO,KAAK,EACV,aAAa,EAEd,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAgB,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAc,KAAK,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAKvE,MAAM,WAAW,8BACf,SACE,IAAI,CACF,mBAAmB,EACnB,UAAU,GAAG,SAAS,GAAG,gBAAgB,GAAG,yBAAyB,CACtE,EACD,iBAAiB;IACnB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;CACnD;AAED,wBAAsB,mBAAmB,CACvC,OAAO,GAAE,8BAAmC,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAqX/B"}