@niscorp/moss 0.3.0 → 0.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +160 -0
- package/DESIGN.md +92 -21
- package/DOCS.md +190 -40
- package/README.md +7 -2
- package/dist/{chunk-J72N3EMJ.js → chunk-4T6KAXBP.js} +45 -27
- package/dist/chunk-4T6KAXBP.js.map +1 -0
- package/dist/{chunk-3CJCJKKY.js → chunk-AUZMT3GL.js} +742 -654
- package/dist/chunk-AUZMT3GL.js.map +1 -0
- package/dist/{chunk-ZOEUEMDX.js → chunk-HOZID4EM.js} +131 -16
- package/dist/chunk-HOZID4EM.js.map +1 -0
- package/dist/chunk-NE2EXMTO.js +103 -0
- package/dist/chunk-NE2EXMTO.js.map +1 -0
- package/dist/client/node.cjs +1 -1
- package/dist/client/node.cjs.map +1 -1
- package/dist/client/node.js +1 -1
- package/dist/client/node.js.map +1 -1
- package/dist/client.cjs +60 -26
- package/dist/client.cjs.map +1 -1
- package/dist/client.d.cts +6 -1
- package/dist/client.d.ts +6 -1
- package/dist/client.js +2 -2
- package/dist/{document-Jhfii6kd.d.cts → document-DhWxieUc.d.cts} +24 -4
- package/dist/{document-Jhfii6kd.d.ts → document-DhWxieUc.d.ts} +24 -4
- package/dist/index.cjs +780 -572
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +19 -3
- package/dist/index.d.ts +19 -3
- package/dist/index.js +2 -2
- package/dist/node.cjs +373 -219
- package/dist/node.cjs.map +1 -1
- package/dist/node.d.cts +2 -1
- package/dist/node.d.ts +2 -1
- package/dist/node.js +3 -3
- package/dist/terminal/index.cjs +60 -26
- package/dist/terminal/index.cjs.map +1 -1
- package/dist/terminal/index.js +2 -2
- package/dist/vite.cjs +103 -28
- package/dist/vite.cjs.map +1 -1
- package/dist/vite.d.cts +1 -1
- package/dist/vite.d.ts +1 -1
- package/dist/vite.js +14 -9
- package/dist/vite.js.map +1 -1
- package/package.json +15 -14
- package/dist/chunk-3CJCJKKY.js.map +0 -1
- package/dist/chunk-DPFWL7BS.js +0 -64
- package/dist/chunk-DPFWL7BS.js.map +0 -1
- package/dist/chunk-J72N3EMJ.js.map +0 -1
- package/dist/chunk-ZOEUEMDX.js.map +0 -1
package/dist/node.d.cts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IncomingMessage } from 'node:http';
|
|
2
2
|
import { Duplex } from 'node:stream';
|
|
3
|
-
import {
|
|
3
|
+
import { l as DocumentConfig, _ as SocketAccept, A as MossServer, a as NiscApp, N as NiscRuntime } from './document-DhWxieUc.cjs';
|
|
4
4
|
import '@niscorp/nova/document';
|
|
5
5
|
import '@niscorp/nova';
|
|
6
6
|
import '@niscorp/vex';
|
|
@@ -16,6 +16,7 @@ type Upgradeable = {
|
|
|
16
16
|
};
|
|
17
17
|
declare const attachSocket: (httpServer: Upgradeable, accept: SocketAccept, path?: string, options?: {
|
|
18
18
|
compression?: boolean | Record<string, unknown>;
|
|
19
|
+
maxMessageBytes?: number;
|
|
19
20
|
}) => void;
|
|
20
21
|
type SiteConfig = Pick<DocumentConfig, 'draw' | 'htmlAttributes' | 'site' | 'tokenKey' | 'waitMs'> & {
|
|
21
22
|
dist: string;
|
package/dist/node.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IncomingMessage } from 'node:http';
|
|
2
2
|
import { Duplex } from 'node:stream';
|
|
3
|
-
import {
|
|
3
|
+
import { l as DocumentConfig, _ as SocketAccept, A as MossServer, a as NiscApp, N as NiscRuntime } from './document-DhWxieUc.js';
|
|
4
4
|
import '@niscorp/nova/document';
|
|
5
5
|
import '@niscorp/nova';
|
|
6
6
|
import '@niscorp/vex';
|
|
@@ -16,6 +16,7 @@ type Upgradeable = {
|
|
|
16
16
|
};
|
|
17
17
|
declare const attachSocket: (httpServer: Upgradeable, accept: SocketAccept, path?: string, options?: {
|
|
18
18
|
compression?: boolean | Record<string, unknown>;
|
|
19
|
+
maxMessageBytes?: number;
|
|
19
20
|
}) => void;
|
|
20
21
|
type SiteConfig = Pick<DocumentConfig, 'draw' | 'htmlAttributes' | 'site' | 'tokenKey' | 'waitMs'> & {
|
|
21
22
|
dist: string;
|
package/dist/node.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export { MOSS_PATHS, attachSocket, mountSite, serve } from './chunk-
|
|
2
|
-
import './chunk-
|
|
3
|
-
import './chunk-
|
|
1
|
+
export { MOSS_PATHS, attachSocket, mountSite, serve } from './chunk-NE2EXMTO.js';
|
|
2
|
+
import './chunk-AUZMT3GL.js';
|
|
3
|
+
import './chunk-HOZID4EM.js';
|
|
4
4
|
//# sourceMappingURL=node.js.map
|
|
5
5
|
//# sourceMappingURL=node.js.map
|
package/dist/terminal/index.cjs
CHANGED
|
@@ -4,8 +4,24 @@ require('@niscorp/nova');
|
|
|
4
4
|
var document$1 = require('@niscorp/nova/document');
|
|
5
5
|
|
|
6
6
|
// src/socket.ts
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
|
|
8
|
+
// src/session-cookie.ts
|
|
9
|
+
var DEFAULT_TOKEN_KEY = "nisc.token";
|
|
10
|
+
var nameOf = (key, port) => `${key}${port === "" ? "" : `.${port}`}`;
|
|
11
|
+
var heldCookieName = (key = DEFAULT_TOKEN_KEY, port = "") => encodeURIComponent(`${nameOf(key, port)}.held`);
|
|
12
|
+
|
|
13
|
+
// src/socket.ts
|
|
14
|
+
var PROTOCOL = 2;
|
|
15
|
+
var PROTOCOL_MIN = 2;
|
|
16
|
+
var SUBPROTOCOL = "nisc";
|
|
17
|
+
var TOKEN_OFFER = "nisc.token.";
|
|
18
|
+
var SEALED_OFFER = "nisc.sealed.";
|
|
19
|
+
var offerToken = (token, sealed = null) => {
|
|
20
|
+
const offer = sealed === null ? [SUBPROTOCOL] : [SUBPROTOCOL, `${SEALED_OFFER}${sealed}`];
|
|
21
|
+
if (token === null) return offer;
|
|
22
|
+
const bytes = String.fromCharCode(...new TextEncoder().encode(token));
|
|
23
|
+
return [...offer, `${TOKEN_OFFER}${btoa(bytes).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "")}`];
|
|
24
|
+
};
|
|
9
25
|
var CLOSE_INVALID_TOKEN = 4401;
|
|
10
26
|
var CLOSE_SIGNED_OUT = 4403;
|
|
11
27
|
var CLOSE_PROTOCOL_MISMATCH = 4426;
|
|
@@ -39,21 +55,11 @@ var frameHash = (text) => {
|
|
|
39
55
|
var EMPTY = { frame: [], trees: /* @__PURE__ */ new Map() };
|
|
40
56
|
var browserEnv = (config = {}) => {
|
|
41
57
|
const tokenKey = config.tokenKey ?? "nisc.token";
|
|
42
|
-
const mirror = (token) => {
|
|
43
|
-
if (config.cookie !== true) return;
|
|
44
|
-
try {
|
|
45
|
-
const secure = window.location.protocol === "https:" ? "; Secure" : "";
|
|
46
|
-
document.cookie = token === null ? `${encodeURIComponent(tokenKey)}=; Path=/; Max-Age=0; SameSite=Lax${secure}` : `${encodeURIComponent(tokenKey)}=${encodeURIComponent(token)}; Path=/; SameSite=Lax${secure}`;
|
|
47
|
-
} catch {
|
|
48
|
-
}
|
|
49
|
-
};
|
|
50
58
|
return {
|
|
51
59
|
tokens: {
|
|
52
60
|
load: () => {
|
|
53
61
|
try {
|
|
54
|
-
|
|
55
|
-
mirror(token);
|
|
56
|
-
return token;
|
|
62
|
+
return window.localStorage.getItem(tokenKey);
|
|
57
63
|
} catch {
|
|
58
64
|
return null;
|
|
59
65
|
}
|
|
@@ -63,17 +69,27 @@ var browserEnv = (config = {}) => {
|
|
|
63
69
|
window.localStorage.setItem(tokenKey, token);
|
|
64
70
|
} catch {
|
|
65
71
|
}
|
|
66
|
-
mirror(token);
|
|
67
72
|
},
|
|
68
73
|
clear: () => {
|
|
69
74
|
try {
|
|
70
75
|
window.localStorage.removeItem(tokenKey);
|
|
71
76
|
} catch {
|
|
72
77
|
}
|
|
73
|
-
|
|
74
|
-
|
|
78
|
+
try {
|
|
79
|
+
document.cookie = `${encodeURIComponent(tokenKey)}=; Path=/; Max-Age=0; SameSite=Lax${window.location.protocol === "https:" ? "; Secure" : ""}`;
|
|
80
|
+
} catch {
|
|
81
|
+
}
|
|
82
|
+
},
|
|
83
|
+
held: () => {
|
|
84
|
+
try {
|
|
85
|
+
return document.cookie.split("; ").includes(`${heldCookieName(tokenKey, window.location.port)}=1`);
|
|
86
|
+
} catch {
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
89
|
+
},
|
|
90
|
+
...config.tokenKey !== void 0 ? { key: tokenKey } : {}
|
|
75
91
|
},
|
|
76
|
-
socket: (url) => new WebSocket(url),
|
|
92
|
+
socket: ({ url, offered }) => new WebSocket(url, offered),
|
|
77
93
|
defaultUrl: () => {
|
|
78
94
|
const scheme = window.location.protocol === "https:" ? "wss" : "ws";
|
|
79
95
|
return `${scheme}://${window.location.host}/socket`;
|
|
@@ -83,12 +99,15 @@ var browserEnv = (config = {}) => {
|
|
|
83
99
|
var createWire = (config = {}) => {
|
|
84
100
|
const env = config.env ?? browserEnv();
|
|
85
101
|
let token = env.tokens.load();
|
|
86
|
-
const initial = config.initial !== void 0 && config.initial.principal === (token !== null) ? config.initial : void 0;
|
|
102
|
+
const initial = config.initial !== void 0 && config.initial.principal === (token !== null || env.tokens.held?.() === true) ? config.initial : void 0;
|
|
87
103
|
let snapshot = initial === void 0 ? EMPTY : { frame: initial.frame, trees: new Map(Object.entries(initial.trees)) };
|
|
88
104
|
let seed = initial?.seed;
|
|
89
105
|
const path = config.path ?? config.initial?.path;
|
|
90
106
|
let status = "connecting";
|
|
91
107
|
let incompatible = false;
|
|
108
|
+
let leaving = false;
|
|
109
|
+
let sealed = null;
|
|
110
|
+
let unsealed = false;
|
|
92
111
|
let socket = null;
|
|
93
112
|
let retry;
|
|
94
113
|
let attempts = 0;
|
|
@@ -113,14 +132,15 @@ var createWire = (config = {}) => {
|
|
|
113
132
|
if (disposed) return;
|
|
114
133
|
setStatus("connecting");
|
|
115
134
|
bases.clear();
|
|
116
|
-
const params = [];
|
|
117
|
-
if (
|
|
118
|
-
params.push(
|
|
135
|
+
const params = [`protocol=${PROTOCOL}`];
|
|
136
|
+
if (env.tokens.key !== void 0) params.push(`key=${encodeURIComponent(env.tokens.key)}`);
|
|
137
|
+
if (leaving) params.push("leave=1");
|
|
138
|
+
if (env.tokens.held !== void 0 && !unsealed) params.push("sealed=1");
|
|
119
139
|
if (config.delta === true) params.push("delta=1");
|
|
120
140
|
if (seed !== void 0) params.push(`seed=${encodeURIComponent(seed)}`);
|
|
121
141
|
seed = void 0;
|
|
122
142
|
if (path !== void 0) params.push(`path=${encodeURIComponent(path)}`);
|
|
123
|
-
const ws = env.socket(`${url()}
|
|
143
|
+
const ws = env.socket({ url: `${url()}?${params.join("&")}`, offered: offerToken(token, sealed) });
|
|
124
144
|
socket = ws;
|
|
125
145
|
ws.onopen = () => {
|
|
126
146
|
attempts = 0;
|
|
@@ -156,13 +176,25 @@ var createWire = (config = {}) => {
|
|
|
156
176
|
publishSnapshot({ ...snapshot, frame: data.tree });
|
|
157
177
|
} else if (data.type === "session" && typeof data.token === "string") {
|
|
158
178
|
become(data.token);
|
|
179
|
+
} else if (data.type === "session" && typeof data.sealed === "string") {
|
|
180
|
+
become(null, data.sealed);
|
|
159
181
|
} else if (data.type === "error") {
|
|
182
|
+
if (data.code === "seal_not_kept") unsealed = true;
|
|
160
183
|
console.warn(`[moss/wire] server error${data.code !== void 0 ? ` (${data.code})` : ""}: ${data.message ?? ""}`);
|
|
161
184
|
} else if (data.type === "hello" && (data.protocol ?? 1) < PROTOCOL_MIN) {
|
|
162
185
|
console.error(`[moss/wire] the server speaks protocol ${data.protocol ?? 1}; this terminal needs ${PROTOCOL_MIN}\u2013${PROTOCOL}. The server has not been updated yet.`);
|
|
163
186
|
incompatible = true;
|
|
164
187
|
ws.close();
|
|
165
|
-
} else if (data.type
|
|
188
|
+
} else if (data.type === "hello") {
|
|
189
|
+
leaving = false;
|
|
190
|
+
sealed = null;
|
|
191
|
+
if (token !== null && env.tokens.held !== void 0) {
|
|
192
|
+
if (env.tokens.held()) {
|
|
193
|
+
env.tokens.clear();
|
|
194
|
+
token = null;
|
|
195
|
+
} else env.tokens.save(token);
|
|
196
|
+
}
|
|
197
|
+
} else if (data.type !== "catalog") {
|
|
166
198
|
console.warn(`[moss/wire] unhandled server message: ${data.type}`);
|
|
167
199
|
}
|
|
168
200
|
};
|
|
@@ -174,6 +206,7 @@ var createWire = (config = {}) => {
|
|
|
174
206
|
}
|
|
175
207
|
setStatus("closed");
|
|
176
208
|
if (e.code === CLOSE_SIGNED_OUT || e.code === CLOSE_INVALID_TOKEN) {
|
|
209
|
+
leaving = e.code === CLOSE_SIGNED_OUT;
|
|
177
210
|
become(null);
|
|
178
211
|
return;
|
|
179
212
|
}
|
|
@@ -187,9 +220,10 @@ var createWire = (config = {}) => {
|
|
|
187
220
|
const delay = ceiling / 2 + Math.random() * (ceiling / 2);
|
|
188
221
|
retry = setTimeout(connect, delay);
|
|
189
222
|
};
|
|
190
|
-
const become = (next) => {
|
|
191
|
-
|
|
192
|
-
else env.tokens.
|
|
223
|
+
const become = (next, handedSealed = null) => {
|
|
224
|
+
sealed = handedSealed;
|
|
225
|
+
if (handedSealed !== null) ; else if (next === null) env.tokens.clear();
|
|
226
|
+
else if (env.tokens.held === void 0) env.tokens.save(next);
|
|
193
227
|
token = next;
|
|
194
228
|
clearTimeout(retry);
|
|
195
229
|
attempts = 0;
|