@opendatalabs/personal-server-ts-server 0.0.1-canary.c357ffa → 0.0.1-canary.cf794db
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/dist/app.d.ts +10 -1
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +23 -1
- package/dist/app.js.map +1 -1
- package/dist/bootstrap.d.ts +9 -1
- package/dist/bootstrap.d.ts.map +1 -1
- package/dist/bootstrap.js +186 -31
- package/dist/bootstrap.js.map +1 -1
- package/dist/index.js +29 -3
- package/dist/index.js.map +1 -1
- package/dist/middleware/web3-auth.d.ts +9 -1
- package/dist/middleware/web3-auth.d.ts.map +1 -1
- package/dist/middleware/web3-auth.js +66 -5
- package/dist/middleware/web3-auth.js.map +1 -1
- package/dist/routes/access-logs.d.ts +4 -1
- package/dist/routes/access-logs.d.ts.map +1 -1
- package/dist/routes/access-logs.js +2 -0
- package/dist/routes/access-logs.js.map +1 -1
- package/dist/routes/data.d.ts +6 -1
- package/dist/routes/data.d.ts.map +1 -1
- package/dist/routes/data.js +10 -2
- package/dist/routes/data.js.map +1 -1
- package/dist/routes/grants.d.ts +7 -3
- package/dist/routes/grants.d.ts.map +1 -1
- package/dist/routes/grants.js +90 -2
- package/dist/routes/grants.js.map +1 -1
- package/dist/routes/health.d.ts +2 -0
- package/dist/routes/health.d.ts.map +1 -1
- package/dist/routes/health.js +2 -0
- package/dist/routes/health.js.map +1 -1
- package/dist/routes/login-v2.d.ts +32 -0
- package/dist/routes/login-v2.d.ts.map +1 -0
- package/dist/routes/login-v2.js +334 -0
- package/dist/routes/login-v2.js.map +1 -0
- package/dist/routes/sync.d.ts +8 -3
- package/dist/routes/sync.d.ts.map +1 -1
- package/dist/routes/sync.js +26 -10
- package/dist/routes/sync.js.map +1 -1
- package/dist/token-store.d.ts +19 -0
- package/dist/token-store.d.ts.map +1 -0
- package/dist/token-store.js +67 -0
- package/dist/token-store.js.map +1 -0
- package/dist/tunnel/auth.d.ts +46 -0
- package/dist/tunnel/auth.d.ts.map +1 -0
- package/dist/tunnel/auth.js +46 -0
- package/dist/tunnel/auth.js.map +1 -0
- package/dist/tunnel/binary.d.ts +57 -0
- package/dist/tunnel/binary.d.ts.map +1 -0
- package/dist/tunnel/binary.js +180 -0
- package/dist/tunnel/binary.js.map +1 -0
- package/dist/tunnel/config.d.ts +27 -0
- package/dist/tunnel/config.d.ts.map +1 -0
- package/dist/tunnel/config.js +38 -0
- package/dist/tunnel/config.js.map +1 -0
- package/dist/tunnel/index.d.ts +13 -0
- package/dist/tunnel/index.d.ts.map +1 -0
- package/dist/tunnel/index.js +9 -0
- package/dist/tunnel/index.js.map +1 -0
- package/dist/tunnel/manager.d.ts +88 -0
- package/dist/tunnel/manager.d.ts.map +1 -0
- package/dist/tunnel/manager.js +279 -0
- package/dist/tunnel/manager.js.map +1 -0
- package/dist/tunnel/verify.d.ts +28 -0
- package/dist/tunnel/verify.d.ts.map +1 -0
- package/dist/tunnel/verify.js +46 -0
- package/dist/tunnel/verify.js.map +1 -0
- package/package.json +2 -2
package/dist/app.d.ts
CHANGED
|
@@ -4,6 +4,10 @@ import type { HierarchyManagerOptions } from "@opendatalabs/personal-server-ts-c
|
|
|
4
4
|
import type { GatewayClient } from "@opendatalabs/personal-server-ts-core/gateway";
|
|
5
5
|
import type { AccessLogWriter } from "@opendatalabs/personal-server-ts-core/logging/access-log";
|
|
6
6
|
import type { AccessLogReader } from "@opendatalabs/personal-server-ts-core/logging/access-reader";
|
|
7
|
+
import { type HealthDeps } from "./routes/health.js";
|
|
8
|
+
import type { SyncManager } from "@opendatalabs/personal-server-ts-core/sync";
|
|
9
|
+
import type { ServerSigner } from "@opendatalabs/personal-server-ts-core/signing";
|
|
10
|
+
import type { TokenStore } from "./token-store.js";
|
|
7
11
|
import type { Logger } from "pino";
|
|
8
12
|
export interface IdentityInfo {
|
|
9
13
|
address: `0x${string}`;
|
|
@@ -16,14 +20,19 @@ export interface AppDeps {
|
|
|
16
20
|
startedAt: Date;
|
|
17
21
|
indexManager: IndexManager;
|
|
18
22
|
hierarchyOptions: HierarchyManagerOptions;
|
|
19
|
-
serverOrigin: string;
|
|
23
|
+
serverOrigin: string | (() => string);
|
|
20
24
|
serverOwner?: `0x${string}`;
|
|
21
25
|
identity?: IdentityInfo;
|
|
22
26
|
gateway: GatewayClient;
|
|
23
27
|
accessLogWriter: AccessLogWriter;
|
|
24
28
|
accessLogReader: AccessLogReader;
|
|
25
29
|
devToken?: string;
|
|
30
|
+
accessToken?: string;
|
|
26
31
|
configPath?: string;
|
|
32
|
+
syncManager?: SyncManager | null;
|
|
33
|
+
serverSigner?: ServerSigner;
|
|
34
|
+
tokenStore?: TokenStore;
|
|
35
|
+
getTunnelStatus?: HealthDeps["getTunnelStatus"];
|
|
27
36
|
}
|
|
28
37
|
export declare function createApp(deps: AppDeps): Hono;
|
|
29
38
|
//# sourceMappingURL=app.d.ts.map
|
package/dist/app.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qDAAqD,CAAC;AACxF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yDAAyD,CAAC;AACvG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0DAA0D,CAAC;AAChG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6DAA6D,CAAC;
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qDAAqD,CAAC;AACxF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yDAAyD,CAAC;AACvG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0DAA0D,CAAC;AAChG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6DAA6D,CAAC;AACnG,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAQlE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,KAAK,MAAM,EAAE,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,aAAa,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,eAAe,CAAC,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;CACjD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAwJ7C"}
|
package/dist/app.js
CHANGED
|
@@ -8,6 +8,7 @@ import { accessLogsRoutes } from "./routes/access-logs.js";
|
|
|
8
8
|
import { syncRoutes } from "./routes/sync.js";
|
|
9
9
|
import { uiConfigRoutes } from "./routes/ui-config.js";
|
|
10
10
|
import { uiRoute } from "./routes/ui.js";
|
|
11
|
+
import { loginV2Routes } from "./routes/login-v2.js";
|
|
11
12
|
export function createApp(deps) {
|
|
12
13
|
const app = new Hono();
|
|
13
14
|
// CORS — allow all origins for browser-based clients
|
|
@@ -25,6 +26,7 @@ export function createApp(deps) {
|
|
|
25
26
|
identity: deps.identity,
|
|
26
27
|
gateway: deps.gateway,
|
|
27
28
|
logger: deps.logger,
|
|
29
|
+
getTunnelStatus: deps.getTunnelStatus,
|
|
28
30
|
}));
|
|
29
31
|
// Mount data routes (ingest + read + delete)
|
|
30
32
|
app.route("/v1/data", dataRoutes({
|
|
@@ -36,14 +38,20 @@ export function createApp(deps) {
|
|
|
36
38
|
gateway: deps.gateway,
|
|
37
39
|
accessLogWriter: deps.accessLogWriter,
|
|
38
40
|
devToken: deps.devToken,
|
|
41
|
+
accessToken: deps.accessToken,
|
|
42
|
+
tokenStore: deps.tokenStore,
|
|
43
|
+
syncManager: deps.syncManager ?? null,
|
|
39
44
|
}));
|
|
40
|
-
// Mount grants routes (POST /verify is public, GET /
|
|
45
|
+
// Mount grants routes (POST /verify is public, GET / and POST / need owner auth)
|
|
41
46
|
app.route("/v1/grants", grantsRoutes({
|
|
42
47
|
logger: deps.logger,
|
|
43
48
|
gateway: deps.gateway,
|
|
44
49
|
serverOwner: deps.serverOwner,
|
|
45
50
|
serverOrigin: deps.serverOrigin,
|
|
46
51
|
devToken: deps.devToken,
|
|
52
|
+
accessToken: deps.accessToken,
|
|
53
|
+
tokenStore: deps.tokenStore,
|
|
54
|
+
serverSigner: deps.serverSigner,
|
|
47
55
|
}));
|
|
48
56
|
// Mount access-logs routes (all owner auth)
|
|
49
57
|
app.route("/v1/access-logs", accessLogsRoutes({
|
|
@@ -52,6 +60,8 @@ export function createApp(deps) {
|
|
|
52
60
|
serverOrigin: deps.serverOrigin,
|
|
53
61
|
serverOwner: deps.serverOwner,
|
|
54
62
|
devToken: deps.devToken,
|
|
63
|
+
accessToken: deps.accessToken,
|
|
64
|
+
tokenStore: deps.tokenStore,
|
|
55
65
|
}));
|
|
56
66
|
// Mount sync routes (all owner auth)
|
|
57
67
|
app.route("/v1/sync", syncRoutes({
|
|
@@ -59,7 +69,19 @@ export function createApp(deps) {
|
|
|
59
69
|
serverOrigin: deps.serverOrigin,
|
|
60
70
|
serverOwner: deps.serverOwner,
|
|
61
71
|
devToken: deps.devToken,
|
|
72
|
+
accessToken: deps.accessToken,
|
|
73
|
+
tokenStore: deps.tokenStore,
|
|
74
|
+
syncManager: deps.syncManager ?? null,
|
|
62
75
|
}));
|
|
76
|
+
// Mount login flow v2 routes (self-hosted CLI auth, no auth required)
|
|
77
|
+
if (deps.tokenStore) {
|
|
78
|
+
app.route("/login/v2", loginV2Routes({
|
|
79
|
+
logger: deps.logger,
|
|
80
|
+
serverOrigin: deps.serverOrigin,
|
|
81
|
+
serverOwner: deps.serverOwner,
|
|
82
|
+
tokenStore: deps.tokenStore,
|
|
83
|
+
}));
|
|
84
|
+
}
|
|
63
85
|
// Mount dev UI routes when dev token is available
|
|
64
86
|
if (deps.devToken) {
|
|
65
87
|
app.route("/ui", uiRoute({ devToken: deps.devToken }));
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAM7E,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAM7E,OAAO,EAAE,WAAW,EAAmB,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAiCrD,MAAM,UAAU,SAAS,CAAC,IAAa;IACrC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAEvB,qDAAqD;IACrD,GAAG,CAAC,GAAG,CACL,GAAG,EACH,IAAI,CAAC;QACH,MAAM,EAAE,GAAG;QACX,YAAY,EAAE,CAAC,cAAc,EAAE,eAAe,CAAC;QAC/C,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC;QACzD,MAAM,EAAE,KAAK;KACd,CAAC,CACH,CAAC;IAEF,qBAAqB;IACrB,GAAG,CAAC,KAAK,CACP,GAAG,EACH,WAAW,CAAC;QACV,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,eAAe,EAAE,IAAI,CAAC,eAAe;KACtC,CAAC,CACH,CAAC;IAEF,6CAA6C;IAC7C,GAAG,CAAC,KAAK,CACP,UAAU,EACV,UAAU,CAAC;QACT,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI;KACtC,CAAC,CACH,CAAC;IAEF,iFAAiF;IACjF,GAAG,CAAC,KAAK,CACP,YAAY,EACZ,YAAY,CAAC;QACX,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;KAChC,CAAC,CACH,CAAC;IAEF,4CAA4C;IAC5C,GAAG,CAAC,KAAK,CACP,iBAAiB,EACjB,gBAAgB,CAAC;QACf,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;KAC5B,CAAC,CACH,CAAC;IAEF,qCAAqC;IACrC,GAAG,CAAC,KAAK,CACP,UAAU,EACV,UAAU,CAAC;QACT,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI;KACtC,CAAC,CACH,CAAC;IAEF,sEAAsE;IACtE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,GAAG,CAAC,KAAK,CACP,WAAW,EACX,aAAa,CAAC;YACZ,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC,CACH,CAAC;IACJ,CAAC;IAED,kDAAkD;IAClD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAEvD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,GAAG,CAAC,KAAK,CACP,SAAS,EACT,cAAc,CAAC;gBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;aAC5B,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,uBAAuB;IACvB,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QACrB,IAAI,GAAG,YAAY,aAAa,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACvC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,CAAC,IAAuB,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAC9C,OAAO,CAAC,CAAC,IAAI,CACX;YACE,KAAK,EAAE;gBACL,IAAI,EAAE,GAAG;gBACT,SAAS,EAAE,gBAAgB;gBAC3B,OAAO,EAAE,uBAAuB;aACjC;SACF,EACD,GAAG,CACJ,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,eAAe;IACf,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE;QACjB,OAAO,CAAC,CAAC,IAAI,CACX;YACE,KAAK,EAAE;gBACL,IAAI,EAAE,GAAG;gBACT,SAAS,EAAE,WAAW;gBACtB,OAAO,EAAE,WAAW;aACrB;SACF,EACD,GAAG,CACJ,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/dist/bootstrap.d.ts
CHANGED
|
@@ -5,7 +5,9 @@ import type { GatewayClient } from "@opendatalabs/personal-server-ts-core/gatewa
|
|
|
5
5
|
import type { AccessLogReader } from "@opendatalabs/personal-server-ts-core/logging/access-reader";
|
|
6
6
|
import type { ServerAccount } from "@opendatalabs/personal-server-ts-core/keys";
|
|
7
7
|
import type { ServerSigner } from "@opendatalabs/personal-server-ts-core/signing";
|
|
8
|
+
import { type SyncManager } from "@opendatalabs/personal-server-ts-core/sync";
|
|
8
9
|
import type { Hono } from "hono";
|
|
10
|
+
import { TunnelManager } from "./tunnel/index.js";
|
|
9
11
|
export interface ServerContext {
|
|
10
12
|
app: Hono;
|
|
11
13
|
logger: Logger;
|
|
@@ -16,10 +18,16 @@ export interface ServerContext {
|
|
|
16
18
|
accessLogReader: AccessLogReader;
|
|
17
19
|
serverAccount?: ServerAccount;
|
|
18
20
|
serverSigner?: ServerSigner;
|
|
21
|
+
syncManager: SyncManager | null;
|
|
22
|
+
tunnelManager?: TunnelManager;
|
|
23
|
+
tunnelUrl?: string;
|
|
19
24
|
devToken?: string;
|
|
20
|
-
|
|
25
|
+
startBackgroundServices: () => Promise<void>;
|
|
26
|
+
cleanup: () => Promise<void>;
|
|
21
27
|
}
|
|
22
28
|
export interface CreateServerOptions {
|
|
29
|
+
rootPath?: string;
|
|
30
|
+
/** @deprecated Use rootPath instead. */
|
|
23
31
|
serverDir?: string;
|
|
24
32
|
dataDir?: string;
|
|
25
33
|
}
|
package/dist/bootstrap.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAKlF,OAAO,EAEL,KAAK,MAAM,EACZ,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,qDAAqD,CAAC;AAG7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6DAA6D,CAAC;AAMnG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAKhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAIjC,OAAO,EAAE,aAAa,EAAoB,MAAM,mBAAmB,CAAC;AAEpE,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,IAAI,CAAC;IACV,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,EAAE,IAAI,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;IACjC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uBAAuB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,YAAY,EACpB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,aAAa,CAAC,CA6SxB"}
|
package/dist/bootstrap.js
CHANGED
|
@@ -1,26 +1,36 @@
|
|
|
1
|
+
import { mkdir } from "node:fs/promises";
|
|
2
|
+
import { createRequire } from "node:module";
|
|
3
|
+
import { randomUUID } from "node:crypto";
|
|
1
4
|
import { join } from "node:path";
|
|
2
|
-
|
|
5
|
+
const require = createRequire(import.meta.url);
|
|
6
|
+
const pkg = require("../package.json");
|
|
7
|
+
import { DEFAULT_ROOT_PATH, resolveRootPath, } from "@opendatalabs/personal-server-ts-core/config";
|
|
3
8
|
import { createLogger, } from "@opendatalabs/personal-server-ts-core/logger";
|
|
4
9
|
import { initializeDatabase, createIndexManager, } from "@opendatalabs/personal-server-ts-core/storage/index";
|
|
5
10
|
import { createGatewayClient } from "@opendatalabs/personal-server-ts-core/gateway";
|
|
6
11
|
import { createAccessLogWriter } from "@opendatalabs/personal-server-ts-core/logging/access-log";
|
|
7
12
|
import { createAccessLogReader } from "@opendatalabs/personal-server-ts-core/logging/access-reader";
|
|
8
13
|
import { deriveMasterKey, recoverServerOwner, loadOrCreateServerAccount, } from "@opendatalabs/personal-server-ts-core/keys";
|
|
9
|
-
import { createServerSigner } from "@opendatalabs/personal-server-ts-core/signing";
|
|
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";
|
|
10
17
|
import { createApp } from "./app.js";
|
|
11
18
|
import { generateDevToken } from "./dev-token.js";
|
|
19
|
+
import { createTokenStore } from "./token-store.js";
|
|
20
|
+
import { TunnelManager, ensureFrpcBinary } from "./tunnel/index.js";
|
|
12
21
|
export async function createServer(config, options) {
|
|
13
22
|
const logger = createLogger(config.logging);
|
|
14
23
|
const startedAt = new Date();
|
|
15
|
-
const
|
|
16
|
-
const dataDir = options?.dataDir ??
|
|
17
|
-
const indexPath = join(
|
|
18
|
-
const configPath = join(
|
|
24
|
+
const storageRoot = resolveRootPath(options?.rootPath ?? options?.serverDir ?? DEFAULT_ROOT_PATH);
|
|
25
|
+
const dataDir = options?.dataDir ?? join(storageRoot, "data");
|
|
26
|
+
const indexPath = join(storageRoot, "index.db");
|
|
27
|
+
const configPath = join(storageRoot, "config.json");
|
|
28
|
+
await mkdir(storageRoot, { recursive: true });
|
|
29
|
+
await mkdir(dataDir, { recursive: true });
|
|
19
30
|
const db = initializeDatabase(indexPath);
|
|
20
31
|
const indexManager = createIndexManager(db);
|
|
21
32
|
const hierarchyOptions = { dataDir };
|
|
22
33
|
const gatewayClient = createGatewayClient(config.gateway.url);
|
|
23
|
-
const serverOrigin = config.server.origin;
|
|
24
34
|
// Derive server owner from VANA_MASTER_KEY_SIGNATURE env var
|
|
25
35
|
const masterKeySignature = process.env.VANA_MASTER_KEY_SIGNATURE;
|
|
26
36
|
let serverOwner;
|
|
@@ -32,64 +42,146 @@ export async function createServer(config, options) {
|
|
|
32
42
|
deriveMasterKey(masterKeySignature); // validate signature format
|
|
33
43
|
logger.info({ owner: serverOwner }, "Server owner derived from master key");
|
|
34
44
|
// Load or create server keypair from disk
|
|
35
|
-
const keyPath = join(
|
|
45
|
+
const keyPath = join(storageRoot, "key.json");
|
|
36
46
|
serverAccount = loadOrCreateServerAccount(keyPath);
|
|
37
47
|
logger.info({ owner: serverOwner, serverAddress: serverAccount.address }, "Server signing account loaded");
|
|
38
48
|
serverSigner = createServerSigner(serverAccount, {
|
|
39
49
|
chainId: config.gateway.chainId,
|
|
40
50
|
contracts: config.gateway.contracts,
|
|
41
51
|
});
|
|
42
|
-
//
|
|
43
|
-
|
|
52
|
+
// Identity starts with serverId=null; background services will populate it
|
|
53
|
+
identity = {
|
|
54
|
+
address: serverAccount.address,
|
|
55
|
+
publicKey: serverAccount.publicKey,
|
|
56
|
+
serverId: null,
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
logger.warn("VANA_MASTER_KEY_SIGNATURE not set — owner-restricted endpoints will return 500");
|
|
61
|
+
}
|
|
62
|
+
// Resolve PS_ACCESS_TOKEN for Bearer token auth (CLI / automation)
|
|
63
|
+
let accessToken = process.env.PS_ACCESS_TOKEN;
|
|
64
|
+
if (!accessToken && process.env.CLOUD_MODE === "true") {
|
|
44
65
|
try {
|
|
45
|
-
const
|
|
46
|
-
|
|
66
|
+
const metadataRes = await fetch("http://metadata.google.internal/computeMetadata/v1/instance/attributes/ps-access-token", {
|
|
67
|
+
headers: { "Metadata-Flavor": "Google" },
|
|
68
|
+
signal: AbortSignal.timeout(2000),
|
|
69
|
+
});
|
|
70
|
+
if (metadataRes.ok) {
|
|
71
|
+
const token = (await metadataRes.text()).trim();
|
|
72
|
+
if (token.length > 0) {
|
|
73
|
+
accessToken = token;
|
|
74
|
+
logger.info("PS access token loaded from instance metadata");
|
|
75
|
+
}
|
|
76
|
+
}
|
|
47
77
|
}
|
|
48
78
|
catch {
|
|
49
|
-
|
|
79
|
+
logger.debug("Could not read PS access token from instance metadata");
|
|
50
80
|
}
|
|
51
|
-
|
|
52
|
-
|
|
81
|
+
}
|
|
82
|
+
if (accessToken) {
|
|
83
|
+
logger.info("PS_ACCESS_TOKEN configured — Bearer token auth enabled");
|
|
84
|
+
}
|
|
85
|
+
// Download frpc binary eagerly (auth-independent) so it's ready when the user signs in
|
|
86
|
+
let frpcBinaryPath = "";
|
|
87
|
+
if (config.tunnel.enabled) {
|
|
88
|
+
try {
|
|
89
|
+
frpcBinaryPath = await ensureFrpcBinary(storageRoot, {
|
|
90
|
+
log: (msg) => logger.info(msg),
|
|
91
|
+
});
|
|
53
92
|
}
|
|
54
|
-
|
|
55
|
-
logger.warn({
|
|
56
|
-
serverAddress: serverAccount.address,
|
|
57
|
-
publicKey: serverAccount.publicKey,
|
|
58
|
-
}, "Server not registered. Register personal server with the gateway to enable delegation.");
|
|
93
|
+
catch (err) {
|
|
94
|
+
logger.warn({ err }, "Failed to download frpc binary - tunnel disabled");
|
|
59
95
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
96
|
+
}
|
|
97
|
+
// --- Sync engine setup ---
|
|
98
|
+
let syncManager = null;
|
|
99
|
+
if (config.sync.enabled &&
|
|
100
|
+
masterKeySignature &&
|
|
101
|
+
serverOwner &&
|
|
102
|
+
serverAccount &&
|
|
103
|
+
serverSigner) {
|
|
104
|
+
const masterKey = deriveMasterKey(masterKeySignature);
|
|
105
|
+
const vanaConfig = config.storage.config.vana ?? {
|
|
106
|
+
apiUrl: "https://storage.vana.com",
|
|
107
|
+
};
|
|
108
|
+
const requestSigner = createRequestSigner(serverAccount);
|
|
109
|
+
const storageAdapter = createVanaStorageAdapter({
|
|
110
|
+
apiUrl: vanaConfig.apiUrl,
|
|
111
|
+
ownerAddress: serverOwner,
|
|
112
|
+
signer: requestSigner,
|
|
113
|
+
});
|
|
114
|
+
const cursor = createSyncCursor(configPath);
|
|
115
|
+
const uploadDeps = {
|
|
116
|
+
indexManager,
|
|
117
|
+
hierarchyOptions,
|
|
118
|
+
storageAdapter,
|
|
119
|
+
gateway: gatewayClient,
|
|
120
|
+
signer: serverSigner,
|
|
121
|
+
masterKey,
|
|
122
|
+
serverOwner,
|
|
123
|
+
logger,
|
|
124
|
+
};
|
|
125
|
+
const downloadDeps = {
|
|
126
|
+
indexManager,
|
|
127
|
+
hierarchyOptions,
|
|
128
|
+
storageAdapter,
|
|
129
|
+
gateway: gatewayClient,
|
|
130
|
+
cursor,
|
|
131
|
+
masterKey,
|
|
132
|
+
serverOwner,
|
|
133
|
+
logger,
|
|
64
134
|
};
|
|
135
|
+
syncManager = createSyncManager(uploadDeps, downloadDeps);
|
|
136
|
+
syncManager.start();
|
|
137
|
+
logger.info("Sync engine started");
|
|
65
138
|
}
|
|
66
|
-
else {
|
|
67
|
-
logger.warn("VANA_MASTER_KEY_SIGNATURE not set —
|
|
139
|
+
else if (config.sync.enabled) {
|
|
140
|
+
logger.warn("Sync enabled in config but VANA_MASTER_KEY_SIGNATURE not set — sync disabled");
|
|
68
141
|
}
|
|
69
|
-
const logsDir = join(
|
|
142
|
+
const logsDir = join(storageRoot, "logs");
|
|
143
|
+
await mkdir(logsDir, { recursive: true });
|
|
70
144
|
const accessLogWriter = createAccessLogWriter(logsDir);
|
|
71
145
|
const accessLogReader = createAccessLogReader(logsDir);
|
|
72
146
|
// Generate ephemeral dev token when devUi is enabled
|
|
73
147
|
const devToken = config.devUi.enabled ? generateDevToken() : undefined;
|
|
148
|
+
// Token store for /login/v2 flow (self-hosted CLI auth)
|
|
149
|
+
const tokensPath = join(storageRoot, "tokens.json");
|
|
150
|
+
const tokenStore = createTokenStore(tokensPath, logger);
|
|
151
|
+
// Mutable origin — starts with config value, updated when tunnel connects
|
|
152
|
+
let effectiveOrigin = config.server.origin;
|
|
153
|
+
// Mutable tunnelManager — set when tunnel starts in background
|
|
154
|
+
let tunnelManager;
|
|
74
155
|
const app = createApp({
|
|
75
156
|
logger,
|
|
76
|
-
version:
|
|
157
|
+
version: pkg.version,
|
|
77
158
|
startedAt,
|
|
78
159
|
indexManager,
|
|
79
160
|
hierarchyOptions,
|
|
80
|
-
serverOrigin,
|
|
161
|
+
serverOrigin: () => effectiveOrigin,
|
|
81
162
|
serverOwner,
|
|
82
163
|
identity,
|
|
83
164
|
gateway: gatewayClient,
|
|
84
165
|
accessLogWriter,
|
|
85
166
|
accessLogReader,
|
|
86
167
|
devToken,
|
|
168
|
+
accessToken,
|
|
169
|
+
tokenStore,
|
|
87
170
|
configPath,
|
|
171
|
+
syncManager,
|
|
172
|
+
serverSigner,
|
|
173
|
+
getTunnelStatus: () => tunnelManager?.getStatus() ?? null,
|
|
88
174
|
});
|
|
89
|
-
const cleanup = () => {
|
|
175
|
+
const cleanup = async () => {
|
|
176
|
+
if (tunnelManager) {
|
|
177
|
+
await tunnelManager.stop();
|
|
178
|
+
}
|
|
179
|
+
if (syncManager) {
|
|
180
|
+
await syncManager.stop();
|
|
181
|
+
}
|
|
90
182
|
indexManager.close();
|
|
91
183
|
};
|
|
92
|
-
|
|
184
|
+
const context = {
|
|
93
185
|
app,
|
|
94
186
|
logger,
|
|
95
187
|
config,
|
|
@@ -99,8 +191,71 @@ export async function createServer(config, options) {
|
|
|
99
191
|
accessLogReader,
|
|
100
192
|
serverAccount,
|
|
101
193
|
serverSigner,
|
|
194
|
+
syncManager,
|
|
195
|
+
tunnelManager,
|
|
196
|
+
tunnelUrl: undefined,
|
|
102
197
|
devToken,
|
|
198
|
+
startBackgroundServices: async () => {
|
|
199
|
+
// --- Gateway registration check (slow: HTTP call) ---
|
|
200
|
+
if (serverAccount && identity) {
|
|
201
|
+
try {
|
|
202
|
+
const serverInfo = await gatewayClient.getServer(serverAccount.address);
|
|
203
|
+
identity.serverId = serverInfo?.id ?? null;
|
|
204
|
+
}
|
|
205
|
+
catch {
|
|
206
|
+
// Gateway unreachable — assume not registered
|
|
207
|
+
}
|
|
208
|
+
if (identity.serverId) {
|
|
209
|
+
logger.info("Server registered with gateway — signing delegation active");
|
|
210
|
+
}
|
|
211
|
+
else {
|
|
212
|
+
logger.warn({
|
|
213
|
+
serverAddress: serverAccount.address,
|
|
214
|
+
publicKey: serverAccount.publicKey,
|
|
215
|
+
}, "Server not registered. Register personal server with the gateway to enable delegation.");
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
// --- Tunnel setup (slow: subprocess wait) ---
|
|
219
|
+
if (config.tunnel.enabled &&
|
|
220
|
+
serverOwner &&
|
|
221
|
+
serverAccount &&
|
|
222
|
+
frpcBinaryPath) {
|
|
223
|
+
tunnelManager = new TunnelManager(storageRoot);
|
|
224
|
+
context.tunnelManager = tunnelManager;
|
|
225
|
+
const runId = randomUUID();
|
|
226
|
+
try {
|
|
227
|
+
const url = await tunnelManager.start({
|
|
228
|
+
walletAddress: serverAccount.address,
|
|
229
|
+
ownerAddress: serverOwner,
|
|
230
|
+
serverKeypair: serverAccount,
|
|
231
|
+
runId,
|
|
232
|
+
serverAddr: config.tunnel.serverAddr,
|
|
233
|
+
serverPort: config.tunnel.serverPort,
|
|
234
|
+
localPort: config.server.port,
|
|
235
|
+
}, frpcBinaryPath);
|
|
236
|
+
logger.info({ tunnelUrl: url }, "Tunnel established");
|
|
237
|
+
context.tunnelUrl = url;
|
|
238
|
+
effectiveOrigin = url;
|
|
239
|
+
if (!identity?.serverId) {
|
|
240
|
+
logger.warn("Tunnel started but server is not registered with gateway — tunnel will not route traffic. Run: npm run register-server");
|
|
241
|
+
tunnelManager.setVerified(false, "Server not registered with gateway");
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
catch (err) {
|
|
245
|
+
logger.warn({ err }, "Tunnel failed to connect - server running in local-only mode");
|
|
246
|
+
tunnelManager = undefined;
|
|
247
|
+
context.tunnelManager = undefined;
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
else if (config.tunnel.enabled && !frpcBinaryPath) {
|
|
251
|
+
logger.warn("frpc binary not available — tunnel disabled");
|
|
252
|
+
}
|
|
253
|
+
else if (config.tunnel.enabled) {
|
|
254
|
+
logger.warn("Tunnel enabled in config but VANA_MASTER_KEY_SIGNATURE not set — tunnel disabled");
|
|
255
|
+
}
|
|
256
|
+
},
|
|
103
257
|
cleanup,
|
|
104
258
|
};
|
|
259
|
+
return context;
|
|
105
260
|
}
|
|
106
261
|
//# sourceMappingURL=bootstrap.js.map
|
package/dist/bootstrap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -1,17 +1,43 @@
|
|
|
1
1
|
import { serve } from "@hono/node-server";
|
|
2
|
+
import { createRequire } from "node:module";
|
|
2
3
|
import { loadConfig } from "@opendatalabs/personal-server-ts-core/config";
|
|
3
4
|
import { createServer } from "./bootstrap.js";
|
|
5
|
+
import { verifyTunnelUrl } from "./tunnel/index.js";
|
|
6
|
+
const require = createRequire(import.meta.url);
|
|
7
|
+
const pkg = require("../package.json");
|
|
4
8
|
const DRAIN_TIMEOUT_MS = 5_000;
|
|
5
9
|
async function main() {
|
|
6
|
-
const
|
|
7
|
-
const
|
|
10
|
+
const rootPath = process.env.PERSONAL_SERVER_ROOT_PATH;
|
|
11
|
+
const config = await loadConfig({ rootPath });
|
|
12
|
+
const context = await createServer(config, { rootPath });
|
|
13
|
+
const { app, logger, devToken } = context;
|
|
8
14
|
const server = serve({ fetch: app.fetch, port: config.server.port }, (info) => {
|
|
9
|
-
logger.info({ port: info.port, version:
|
|
15
|
+
logger.info({ port: info.port, version: pkg.version }, "Server started");
|
|
10
16
|
if (devToken) {
|
|
11
17
|
logger.info({ url: `http://localhost:${info.port}/ui` }, "Dev UI available");
|
|
12
18
|
logger.info({ devToken }, "Dev token (ephemeral)");
|
|
13
19
|
}
|
|
14
20
|
});
|
|
21
|
+
// Fire-and-forget: gateway check + tunnel connect (slow operations)
|
|
22
|
+
// HTTP server is already listening so POST /v1/data/:scope works immediately
|
|
23
|
+
context.startBackgroundServices().then(() => {
|
|
24
|
+
// Verify tunnel URL is reachable now that both HTTP server and tunnel are up
|
|
25
|
+
const { tunnelManager, tunnelUrl } = context;
|
|
26
|
+
if (tunnelUrl &&
|
|
27
|
+
tunnelManager &&
|
|
28
|
+
tunnelManager.getStatus().status !== "error") {
|
|
29
|
+
logger.info({ tunnelUrl }, "Verifying tunnel URL is reachable...");
|
|
30
|
+
verifyTunnelUrl(tunnelUrl).then((result) => {
|
|
31
|
+
tunnelManager.setVerified(result.reachable, result.error);
|
|
32
|
+
if (result.reachable) {
|
|
33
|
+
logger.info({ tunnelUrl, attempts: result.attempts }, "Tunnel URL verified");
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
logger.warn({ tunnelUrl, attempts: result.attempts, error: result.error }, "Tunnel URL not reachable — server running in local-only mode");
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
});
|
|
15
41
|
function shutdown(signal) {
|
|
16
42
|
logger.info({ signal }, "Shutdown signal received, draining connections");
|
|
17
43
|
server.close(() => {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import type { MiddlewareHandler } from "hono";
|
|
2
|
+
import type { TokenStore } from "../token-store.js";
|
|
2
3
|
export interface Web3AuthMiddlewareDeps {
|
|
3
|
-
serverOrigin: string;
|
|
4
|
+
serverOrigin: string | (() => string);
|
|
4
5
|
devToken?: string;
|
|
6
|
+
accessToken?: string;
|
|
7
|
+
tokenStore?: TokenStore;
|
|
5
8
|
serverOwner?: `0x${string}`;
|
|
6
9
|
}
|
|
7
10
|
/**
|
|
@@ -11,6 +14,11 @@ export interface Web3AuthMiddlewareDeps {
|
|
|
11
14
|
* When a devToken is configured and the request carries a matching
|
|
12
15
|
* Bearer token, auth context is populated with the server owner
|
|
13
16
|
* and c.set('devBypass', true) is set to skip downstream checks.
|
|
17
|
+
*
|
|
18
|
+
* When an accessToken (PS_ACCESS_TOKEN) is configured and the request
|
|
19
|
+
* carries a matching Bearer token, auth context is populated with the
|
|
20
|
+
* server owner — treating the request as owner-authenticated.
|
|
21
|
+
* This is used by the CLI for cloud PS access.
|
|
14
22
|
*/
|
|
15
23
|
export declare function createWeb3AuthMiddleware(depsOrOrigin: Web3AuthMiddlewareDeps | string): MiddlewareHandler;
|
|
16
24
|
//# sourceMappingURL=web3-auth.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web3-auth.d.ts","sourceRoot":"","sources":["../../src/middleware/web3-auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"web3-auth.d.ts","sourceRoot":"","sources":["../../src/middleware/web3-auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAG9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,WAAW,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;CAC7B;AAYD;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,sBAAsB,GAAG,MAAM,GAC5C,iBAAiB,CA2GnB"}
|