sh3-core 0.20.3 → 0.21.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api.d.ts +2 -2
- package/dist/api.js +1 -1
- package/dist/app/store/StoreView.svelte +26 -35
- package/dist/app/store/storeShard.svelte.js +35 -49
- package/dist/app/store/verbs.js +24 -55
- package/dist/build.js +13 -7
- package/dist/env/client.d.ts +6 -10
- package/dist/env/client.js +11 -21
- package/dist/env/index.d.ts +2 -1
- package/dist/env/index.js +1 -1
- package/dist/registry/archive.d.ts +12 -0
- package/dist/registry/archive.js +80 -0
- package/dist/registry/archive.test.d.ts +1 -0
- package/dist/registry/archive.test.js +84 -0
- package/dist/registry/client.d.ts +9 -29
- package/dist/registry/client.js +14 -60
- package/dist/registry/client.test.js +31 -21
- package/dist/registry/index.d.ts +2 -2
- package/dist/registry/index.js +1 -1
- package/dist/registry/installer.d.ts +4 -4
- package/dist/registry/installer.js +74 -45
- package/dist/registry/schema.js +4 -27
- package/dist/registry/schema.test.d.ts +1 -0
- package/dist/registry/schema.test.js +41 -0
- package/dist/registry/types.d.ts +16 -41
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +3 -2
package/dist/api.d.ts
CHANGED
|
@@ -40,9 +40,9 @@ export type { ColorPickOptions, ColorContribution, ColorApi, } from './color/api
|
|
|
40
40
|
export { COLOR_PICKER_POINT } from './color/api';
|
|
41
41
|
export { registeredShards, activeShards, erroredShards } from './shards/activate.svelte';
|
|
42
42
|
export type { ShardErrorEntry } from './shards/activate.svelte';
|
|
43
|
-
export type { RegistryIndex, PackageEntry, PackageVersion, RequiredDependency, InstalledPackage, InstallResult, PackageMeta, } from './registry/types';
|
|
43
|
+
export type { RegistryIndex, PackageEntry, PackageVersion, RequiredDependency, InstalledPackage, InstallResult, PackageMeta, RemoteInstallRequest, } from './registry/types';
|
|
44
44
|
export type { ResolvedPackage } from './registry/client';
|
|
45
|
-
export { fetchRegistries,
|
|
45
|
+
export { fetchRegistries, fetchArchive, buildPackageMeta } from './registry/client';
|
|
46
46
|
export { validateRegistryIndex } from './registry/schema';
|
|
47
47
|
export { PERMISSION_KEYS_MINT, ScopeEscalationError, ConsentDeniedError, type ShardContextKeys, type ApiKeyPublic, type MintOpts, } from './keys/types';
|
|
48
48
|
export { registerConsentListener, resolveConsent, type ConsentRequest } from './keys/consent.svelte';
|
package/dist/api.js
CHANGED
|
@@ -43,7 +43,7 @@ export { COLOR_PICKER_POINT } from './color/api';
|
|
|
43
43
|
// addition: diagnostic used to reach `activate.svelte` directly via $lib;
|
|
44
44
|
// the package boundary requires routing through the public surface.
|
|
45
45
|
export { registeredShards, activeShards, erroredShards } from './shards/activate.svelte';
|
|
46
|
-
export { fetchRegistries,
|
|
46
|
+
export { fetchRegistries, fetchArchive, buildPackageMeta } from './registry/client';
|
|
47
47
|
export { validateRegistryIndex } from './registry/schema';
|
|
48
48
|
// Key mint/revoke types — client shards that declare `keys:mint` get ctx.keys.
|
|
49
49
|
export { PERMISSION_KEYS_MINT, ScopeEscalationError, ConsentDeniedError, } from './keys/types';
|
|
@@ -7,11 +7,12 @@
|
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
import { storeContext } from './storeShard.svelte';
|
|
10
|
-
import {
|
|
10
|
+
import { fetchArchive, buildPackageMeta } from '../../registry/client';
|
|
11
|
+
import { readFileFromArchive, readManifestFromArchive } from '../../registry/archive';
|
|
11
12
|
import { installPackage } from '../../registry/installer';
|
|
12
13
|
import { loadBundleModule, type LoadedBundle } from '../../registry/loader';
|
|
13
14
|
import { extractBundlePermissions } from '../../registry/permission-descriptions';
|
|
14
|
-
import {
|
|
15
|
+
import { requestServerInstall } from '../../env/client';
|
|
15
16
|
import { checkBundleFetch } from '../../registry/checkFetch';
|
|
16
17
|
import { contract } from '../../contract';
|
|
17
18
|
import type { ResolvedPackage } from '../../registry/client';
|
|
@@ -36,9 +37,8 @@
|
|
|
36
37
|
pkg: ResolvedPackage;
|
|
37
38
|
permissions: string[];
|
|
38
39
|
loaded: LoadedBundle;
|
|
39
|
-
|
|
40
|
+
archiveBytes: Uint8Array;
|
|
40
41
|
meta: ReturnType<typeof buildPackageMeta>;
|
|
41
|
-
serverBundle: ArrayBuffer | undefined;
|
|
42
42
|
warnings: string[];
|
|
43
43
|
}>(null);
|
|
44
44
|
|
|
@@ -171,26 +171,20 @@
|
|
|
171
171
|
installError = null;
|
|
172
172
|
|
|
173
173
|
try {
|
|
174
|
-
// 1. Fetch and integrity-verify the
|
|
175
|
-
const
|
|
174
|
+
// 1. Fetch and integrity-verify the archive from the registry.
|
|
175
|
+
const archiveBytes = await fetchArchive(pkg.latest, pkg.sourceRegistry);
|
|
176
176
|
const meta = buildPackageMeta(pkg, pkg.latest);
|
|
177
177
|
|
|
178
|
-
// 2.
|
|
179
|
-
|
|
180
|
-
const loaded = await loadBundleModule(
|
|
181
|
-
const permissions = extractBundlePermissions(loaded);
|
|
178
|
+
// 2. Extract client.js, load the module to get permissions for the modal.
|
|
179
|
+
const clientJs = readFileFromArchive(archiveBytes, 'client.js');
|
|
180
|
+
const loaded = clientJs ? await loadBundleModule(clientJs) : null;
|
|
181
|
+
const permissions = loaded ? extractBundlePermissions(loaded) : [];
|
|
182
182
|
|
|
183
|
-
// 3.
|
|
184
|
-
let serverBundle: ArrayBuffer | undefined;
|
|
185
|
-
if (pkg.latest.serverBundleUrl) {
|
|
186
|
-
serverBundle = await fetchServerBundle(pkg.latest, pkg.sourceRegistry);
|
|
187
|
-
}
|
|
188
|
-
|
|
189
|
-
// 4. Show the confirmation modal. The actual install happens in
|
|
183
|
+
// 3. Show the confirmation modal. The actual install happens in
|
|
190
184
|
// confirmInstall() once the user clicks Install.
|
|
191
|
-
const bundleText = new TextDecoder().decode(new Uint8Array(
|
|
185
|
+
const bundleText = clientJs ? new TextDecoder().decode(new Uint8Array(clientJs)) : '';
|
|
192
186
|
const warnings = checkBundleFetch(bundleText);
|
|
193
|
-
installModal = { pkg, permissions, loaded
|
|
187
|
+
installModal = { pkg, permissions, loaded: loaded!, archiveBytes, meta, warnings };
|
|
194
188
|
} catch (err) {
|
|
195
189
|
installError = err instanceof Error ? err.message : String(err);
|
|
196
190
|
const next = new Set(installingIds);
|
|
@@ -204,29 +198,26 @@
|
|
|
204
198
|
if (!ctxModal) return;
|
|
205
199
|
installModal = null;
|
|
206
200
|
|
|
207
|
-
const { pkg, loaded,
|
|
201
|
+
const { pkg, loaded, archiveBytes, meta } = ctxModal;
|
|
208
202
|
const id = pkg.entry.id;
|
|
209
203
|
|
|
210
204
|
try {
|
|
211
|
-
const
|
|
212
|
-
id: meta.id,
|
|
213
|
-
type: meta.type,
|
|
214
|
-
label: pkg.entry.label,
|
|
215
|
-
version: meta.version,
|
|
216
|
-
contractVersion: meta.contractVersion,
|
|
217
|
-
sourceRegistry: meta.sourceRegistry,
|
|
218
|
-
requiredShards: pkg.latest.requires?.map((r) => r.id) ?? [],
|
|
219
|
-
installedAt: new Date().toISOString(),
|
|
220
|
-
};
|
|
221
|
-
const serverResult = await serverInstallPackage(manifest, bundle, serverBundle);
|
|
205
|
+
const serverResult = await requestServerInstall(pkg.sourceRegistry, pkg.entry.id, meta.version);
|
|
222
206
|
if (!serverResult.ok) {
|
|
223
|
-
|
|
207
|
+
let errMsg = serverResult.error ?? 'Server install failed';
|
|
208
|
+
if (serverResult.code === 'missing-shards' && serverResult.missing) {
|
|
209
|
+
errMsg = `missing required shard(s): ${serverResult.missing.map((m: { id: string }) => m.id).join(', ')}`;
|
|
210
|
+
}
|
|
211
|
+
installError = errMsg;
|
|
224
212
|
return;
|
|
225
213
|
}
|
|
226
214
|
|
|
227
|
-
const
|
|
228
|
-
if (
|
|
229
|
-
|
|
215
|
+
const clientJs = readFileFromArchive(archiveBytes, 'client.js');
|
|
216
|
+
if (clientJs) {
|
|
217
|
+
const result = await installPackage(clientJs, meta, { loaded });
|
|
218
|
+
if (!result.success) {
|
|
219
|
+
console.warn(`[sh3-store] Server install ok but local hot-load failed: ${result.error}`);
|
|
220
|
+
}
|
|
230
221
|
}
|
|
231
222
|
|
|
232
223
|
await ctx.refreshInstalled();
|
|
@@ -17,13 +17,14 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import { mount, unmount } from 'svelte';
|
|
19
19
|
import StoreView from './StoreView.svelte';
|
|
20
|
-
import { fetchRegistries,
|
|
20
|
+
import { fetchRegistries, fetchArchive, buildPackageMeta } from '../../registry/client';
|
|
21
21
|
import { installPackage, listInstalledPackages } from '../../registry/installer';
|
|
22
22
|
import { uninstallPackage as installerUninstallPackage } from '../../registry/installer';
|
|
23
23
|
import { loadBundle, loadMeta, savePackage } from '../../registry/storage';
|
|
24
24
|
import { loadBundleModule } from '../../registry/loader';
|
|
25
25
|
import { extractBundlePermissions } from '../../registry/permission-descriptions';
|
|
26
|
-
import {
|
|
26
|
+
import { readFileFromArchive } from '../../registry/archive';
|
|
27
|
+
import { requestServerInstall, fetchServerPackages, serverUninstallPackage } from '../../env/client';
|
|
27
28
|
import { VERSION } from '../../version';
|
|
28
29
|
import { installVerb, uninstallVerb, appinfoVerb, updateVerb } from './verbs';
|
|
29
30
|
import { isNewerVersion } from './version';
|
|
@@ -147,7 +148,7 @@ export const storeShard = {
|
|
|
147
148
|
await ctx.envUpdate({ registries });
|
|
148
149
|
}
|
|
149
150
|
async function updatePackage(id, confirmPermissionChange, version) {
|
|
150
|
-
var _a, _b
|
|
151
|
+
var _a, _b;
|
|
151
152
|
// Source the catalog entry. Without an explicit version we use the
|
|
152
153
|
// updatable map (which encodes the "newer than installed" check); with a
|
|
153
154
|
// version we look up the package in the full catalog so downgrades and
|
|
@@ -165,77 +166,62 @@ export const storeShard = {
|
|
|
165
166
|
if (!installedRecord)
|
|
166
167
|
return;
|
|
167
168
|
const picked = pickVersion(catalogEntry, version);
|
|
168
|
-
// 1. Fetch
|
|
169
|
-
const
|
|
170
|
-
let serverBundle;
|
|
171
|
-
if (picked.serverBundleUrl) {
|
|
172
|
-
serverBundle = await fetchServerBundle(picked, catalogEntry.sourceRegistry);
|
|
173
|
-
}
|
|
169
|
+
// 1. Fetch archive (verified against SRI).
|
|
170
|
+
const archiveBytes = await fetchArchive(picked, catalogEntry.sourceRegistry);
|
|
174
171
|
const meta = buildPackageMeta(catalogEntry, picked);
|
|
175
|
-
// 2.
|
|
176
|
-
const
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
172
|
+
// 2. Extract client.js for permission check and local install.
|
|
173
|
+
const clientJs = readFileFromArchive(archiveBytes, 'client.js');
|
|
174
|
+
// 3. Load module for permission extraction (if client bundle present).
|
|
175
|
+
let loaded;
|
|
176
|
+
let newPerms = [];
|
|
177
|
+
if (clientJs) {
|
|
178
|
+
loaded = await loadBundleModule(clientJs);
|
|
179
|
+
newPerms = extractBundlePermissions(loaded);
|
|
180
|
+
}
|
|
181
|
+
// 4. Look up the locally persisted old permissions.
|
|
181
182
|
let oldPerms = [];
|
|
182
183
|
try {
|
|
183
184
|
const localMeta = await loadMeta(id);
|
|
184
185
|
if (localMeta === null || localMeta === void 0 ? void 0 : localMeta.permissions)
|
|
185
186
|
oldPerms = localMeta.permissions;
|
|
186
187
|
}
|
|
187
|
-
catch (
|
|
188
|
-
// No local record
|
|
189
|
-
// empty. The diff will show all new permissions as additions.
|
|
188
|
+
catch (_c) {
|
|
189
|
+
// No local record; treat as empty.
|
|
190
190
|
}
|
|
191
|
-
//
|
|
192
|
-
// provided, await the user's decision before touching the server.
|
|
191
|
+
// 5. If the permission set changed, await the user's decision.
|
|
193
192
|
const { added, removed } = diffPermissions(oldPerms, newPerms);
|
|
194
193
|
if ((added.length > 0 || removed.length > 0) && confirmPermissionChange) {
|
|
195
194
|
const ok = await confirmPermissionChange(added, removed);
|
|
196
195
|
if (!ok)
|
|
197
196
|
return;
|
|
198
197
|
}
|
|
199
|
-
//
|
|
200
|
-
// permissions so the rollback write still satisfies the InstalledPackage
|
|
201
|
-
// contract (installedRecord came from the server-sourced list which
|
|
202
|
-
// lacks permissions).
|
|
198
|
+
// 6. Snapshot current state for rollback.
|
|
203
199
|
const oldBundle = await loadBundle(id);
|
|
204
200
|
const oldRecord = Object.assign(Object.assign({}, installedRecord), { permissions: oldPerms });
|
|
205
|
-
//
|
|
206
|
-
const
|
|
207
|
-
id: meta.id,
|
|
208
|
-
type: meta.type,
|
|
209
|
-
label: catalogEntry.entry.label,
|
|
210
|
-
version: meta.version,
|
|
211
|
-
contractVersion: meta.contractVersion,
|
|
212
|
-
sourceRegistry: meta.sourceRegistry,
|
|
213
|
-
installedAt: new Date().toISOString(),
|
|
214
|
-
requiredShards: (_b = (_a = picked.requires) === null || _a === void 0 ? void 0 : _a.map((r) => r.id)) !== null && _b !== void 0 ? _b : [],
|
|
215
|
-
};
|
|
216
|
-
const serverResult = await serverInstallPackage(manifest, bundle, serverBundle);
|
|
201
|
+
// 7. Tell server to install autonomously from the registry.
|
|
202
|
+
const serverResult = await requestServerInstall(catalogEntry.sourceRegistry, id, picked.version);
|
|
217
203
|
if (!serverResult.ok) {
|
|
218
|
-
let message = (
|
|
204
|
+
let message = (_a = serverResult.error) !== null && _a !== void 0 ? _a : 'Server update failed';
|
|
219
205
|
if (serverResult.code === 'missing-shards' && serverResult.missing) {
|
|
220
206
|
const ids = serverResult.missing.map((m) => m.id).join(', ');
|
|
221
207
|
message = `missing required shard(s): ${ids}`;
|
|
222
208
|
}
|
|
223
209
|
throw new Error(message);
|
|
224
210
|
}
|
|
225
|
-
//
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
211
|
+
// 8. Install locally from the already-fetched archive.
|
|
212
|
+
if (clientJs) {
|
|
213
|
+
const result = await installPackage(clientJs, meta, { loaded });
|
|
214
|
+
if (!result.success) {
|
|
215
|
+
if (oldBundle) {
|
|
216
|
+
try {
|
|
217
|
+
await savePackage(id, oldBundle, oldRecord);
|
|
218
|
+
}
|
|
219
|
+
catch (rollbackErr) {
|
|
220
|
+
console.warn(`[sh3-store] Rollback failed for "${id}":`, rollbackErr instanceof Error ? rollbackErr.message : rollbackErr);
|
|
221
|
+
}
|
|
236
222
|
}
|
|
223
|
+
throw new Error((_b = result.error) !== null && _b !== void 0 ? _b : 'Local install failed during update');
|
|
237
224
|
}
|
|
238
|
-
throw new Error((_d = result.error) !== null && _d !== void 0 ? _d : 'Local install failed during update');
|
|
239
225
|
}
|
|
240
226
|
await refreshInstalled();
|
|
241
227
|
}
|
package/dist/app/store/verbs.js
CHANGED
|
@@ -5,9 +5,10 @@
|
|
|
5
5
|
* Auto-prefixed to sh3-store:install, sh3-store:uninstall, sh3-store:appinfo.
|
|
6
6
|
*/
|
|
7
7
|
import { storeContext } from './storeShard.svelte';
|
|
8
|
-
import {
|
|
8
|
+
import { fetchArchive, buildPackageMeta } from '../../registry/client';
|
|
9
|
+
import { readManifestFromArchive, readFileFromArchive } from '../../registry/archive';
|
|
10
|
+
import { requestServerInstall } from '../../env/client';
|
|
9
11
|
import { installPackage } from '../../registry/installer';
|
|
10
|
-
import { serverInstallPackage } from '../../env/client';
|
|
11
12
|
function findInCatalog(id) {
|
|
12
13
|
return storeContext.state.ephemeral.catalog.find((p) => p.entry.id === id);
|
|
13
14
|
}
|
|
@@ -19,7 +20,7 @@ export const installVerb = {
|
|
|
19
20
|
summary: 'Install a package by id from the catalog.',
|
|
20
21
|
programmatic: true,
|
|
21
22
|
async run(ctx, args) {
|
|
22
|
-
var _a
|
|
23
|
+
var _a;
|
|
23
24
|
const id = args[0];
|
|
24
25
|
if (!id) {
|
|
25
26
|
ctx.scrollback.push({
|
|
@@ -50,68 +51,36 @@ export const installVerb = {
|
|
|
50
51
|
});
|
|
51
52
|
return;
|
|
52
53
|
}
|
|
53
|
-
ctx.scrollback.push({
|
|
54
|
-
kind: 'status',
|
|
55
|
-
text: `installing ${id} v${pkg.latest.version}...`,
|
|
56
|
-
level: 'info',
|
|
57
|
-
ts: Date.now(),
|
|
58
|
-
});
|
|
54
|
+
ctx.scrollback.push({ kind: 'status', text: `installing ${id} v${pkg.latest.version}...`, level: 'info', ts: Date.now() });
|
|
59
55
|
try {
|
|
60
|
-
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
const manifest = {
|
|
67
|
-
id: meta.id,
|
|
68
|
-
type: meta.type,
|
|
69
|
-
label: pkg.entry.label,
|
|
70
|
-
version: meta.version,
|
|
71
|
-
contractVersion: meta.contractVersion,
|
|
72
|
-
sourceRegistry: meta.sourceRegistry,
|
|
73
|
-
installedAt: new Date().toISOString(),
|
|
74
|
-
requiredShards: (_b = (_a = pkg.latest.requires) === null || _a === void 0 ? void 0 : _a.map((r) => r.id)) !== null && _b !== void 0 ? _b : [],
|
|
75
|
-
};
|
|
76
|
-
const serverResult = await serverInstallPackage(manifest, bundle, serverBundle);
|
|
56
|
+
// 1. Download archive for permission modal (future) and client local install
|
|
57
|
+
const archiveBytes = await fetchArchive(pkg.latest, pkg.sourceRegistry);
|
|
58
|
+
// 2. Extract manifest (permission modal reads from it)
|
|
59
|
+
readManifestFromArchive(archiveBytes);
|
|
60
|
+
// 3. Tell server to install autonomously
|
|
61
|
+
const serverResult = await requestServerInstall(pkg.sourceRegistry, id, pkg.latest.version);
|
|
77
62
|
if (!serverResult.ok) {
|
|
78
|
-
let text = `install failed: ${(
|
|
63
|
+
let text = `install failed: ${(_a = serverResult.error) !== null && _a !== void 0 ? _a : 'server error'}`;
|
|
79
64
|
if (serverResult.code === 'missing-shards' && serverResult.missing) {
|
|
80
|
-
|
|
81
|
-
text = `install failed: missing required shard(s): ${ids}`;
|
|
65
|
+
text = `install failed: missing required shard(s): ${serverResult.missing.map((m) => m.id).join(', ')}`;
|
|
82
66
|
}
|
|
83
|
-
ctx.scrollback.push({
|
|
84
|
-
kind: 'status',
|
|
85
|
-
text,
|
|
86
|
-
level: 'error',
|
|
87
|
-
ts: Date.now(),
|
|
88
|
-
});
|
|
67
|
+
ctx.scrollback.push({ kind: 'status', text, level: 'error', ts: Date.now() });
|
|
89
68
|
return;
|
|
90
69
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
ts: Date.now()
|
|
98
|
-
}
|
|
70
|
+
// 4. Extract client.js from already-fetched archive and install locally
|
|
71
|
+
const clientJs = readFileFromArchive(archiveBytes, 'client.js');
|
|
72
|
+
if (clientJs) {
|
|
73
|
+
const meta = buildPackageMeta(pkg, pkg.latest);
|
|
74
|
+
const result = await installPackage(clientJs, meta);
|
|
75
|
+
if (!result.success) {
|
|
76
|
+
ctx.scrollback.push({ kind: 'status', text: `server ok but local hot-load failed: ${result.error}`, level: 'warn', ts: Date.now() });
|
|
77
|
+
}
|
|
99
78
|
}
|
|
100
79
|
await storeContext.refreshInstalled();
|
|
101
|
-
ctx.scrollback.push({
|
|
102
|
-
kind: 'status',
|
|
103
|
-
text: `installed ${id} v${pkg.latest.version}`,
|
|
104
|
-
level: 'info',
|
|
105
|
-
ts: Date.now(),
|
|
106
|
-
});
|
|
80
|
+
ctx.scrollback.push({ kind: 'status', text: `installed ${id} v${pkg.latest.version}`, level: 'info', ts: Date.now() });
|
|
107
81
|
}
|
|
108
82
|
catch (err) {
|
|
109
|
-
ctx.scrollback.push({
|
|
110
|
-
kind: 'status',
|
|
111
|
-
text: `install failed: ${err instanceof Error ? err.message : String(err)}`,
|
|
112
|
-
level: 'error',
|
|
113
|
-
ts: Date.now(),
|
|
114
|
-
});
|
|
83
|
+
ctx.scrollback.push({ kind: 'status', text: `install failed: ${err instanceof Error ? err.message : String(err)}`, level: 'error', ts: Date.now() });
|
|
115
84
|
}
|
|
116
85
|
},
|
|
117
86
|
};
|
package/dist/build.js
CHANGED
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
import { readFileSync, writeFileSync, unlinkSync, readdirSync, copyFileSync, existsSync } from 'node:fs';
|
|
20
20
|
import { execSync } from 'node:child_process';
|
|
21
21
|
import { join } from 'node:path';
|
|
22
|
+
import { createArchive } from './registry/archive.js';
|
|
22
23
|
/**
|
|
23
24
|
* Vite plugin that inlines extracted CSS into the JS bundle.
|
|
24
25
|
*
|
|
@@ -311,14 +312,19 @@ export function sh3Artifact(options = {}) {
|
|
|
311
312
|
if (!finalAuthor) {
|
|
312
313
|
throw new Error('[sh3-artifact] Missing "author". Add it to package.json or pass it via sh3Artifact({ manifest: { author } }).');
|
|
313
314
|
}
|
|
314
|
-
const manifest = Object.assign(Object.assign(Object.assign(Object.assign({ id: id || 'unknown', type, label: label || id || 'unknown', version: artifactVersion, contractVersion: 1
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
const
|
|
315
|
+
const manifest = Object.assign(Object.assign(Object.assign(Object.assign({ id: id || 'unknown', type, label: label || id || 'unknown', version: artifactVersion, contractVersion: 1 }, (hasServer ? { server: 'server.js' } : {})), { description: finalDescription, author: finalAuthor }), ((type === 'app' || type === 'combo') ? { requiredShards } : {})), overrides);
|
|
316
|
+
// Read the emitted JS files as bytes for the archive
|
|
317
|
+
const clientBytes = readFileSync(join(outDir, 'client.js'));
|
|
318
|
+
const serverBytes = hasServer ? readFileSync(join(outDir, 'server.js')) : undefined;
|
|
319
|
+
// Create the .sh3pkg archive
|
|
320
|
+
const archive = createArchive(Object.assign({ manifest, client: new Uint8Array(clientBytes.buffer, clientBytes.byteOffset, clientBytes.byteLength) }, (serverBytes ? { server: new Uint8Array(serverBytes.buffer, serverBytes.byteOffset, serverBytes.byteLength) } : {})));
|
|
321
|
+
const archiveName = `${manifest.id}-${manifest.version}.sh3pkg`;
|
|
322
|
+
writeFileSync(join(outDir, archiveName), archive);
|
|
323
|
+
// Remove the loose files — the archive is the deliverable
|
|
324
|
+
unlinkSync(join(outDir, 'client.js'));
|
|
318
325
|
if (hasServer)
|
|
319
|
-
|
|
320
|
-
console.log(`[sh3-artifact] ${manifest.id}@${manifest.version} (${manifest.type}) → ${outDir}`);
|
|
321
|
-
console.log(`[sh3-artifact] files: ${files.join(', ')}`);
|
|
326
|
+
unlinkSync(join(outDir, 'server.js'));
|
|
327
|
+
console.log(`[sh3-artifact] ${manifest.id}@${manifest.version} (${manifest.type}) → ${outDir}/${archiveName}`);
|
|
322
328
|
},
|
|
323
329
|
};
|
|
324
330
|
}
|
package/dist/env/client.d.ts
CHANGED
|
@@ -27,18 +27,14 @@ export interface ServerInstallResult {
|
|
|
27
27
|
}>;
|
|
28
28
|
}
|
|
29
29
|
/**
|
|
30
|
-
*
|
|
31
|
-
* The
|
|
32
|
-
* (and the server bundle, if present and serverIntegrity was declared).
|
|
30
|
+
* Request the server to install a package autonomously.
|
|
31
|
+
* The server fetches and validates the archive from the registry itself.
|
|
33
32
|
*
|
|
34
|
-
* @param
|
|
35
|
-
* @param
|
|
36
|
-
* @param
|
|
37
|
-
* provided, the server writes it to `server.js` and hot-mounts the
|
|
38
|
-
* shard's routes. If the mount fails, the entire install is rolled
|
|
39
|
-
* back server-side.
|
|
33
|
+
* @param registryUrl - URL of the registry.json that lists the package.
|
|
34
|
+
* @param packageId - The package id to install.
|
|
35
|
+
* @param version - The exact version string to install.
|
|
40
36
|
*/
|
|
41
|
-
export declare function
|
|
37
|
+
export declare function requestServerInstall(registryUrl: string, packageId: string, version: string): Promise<ServerInstallResult>;
|
|
42
38
|
/**
|
|
43
39
|
* Uninstall a package from the server.
|
|
44
40
|
*/
|
package/dist/env/client.js
CHANGED
|
@@ -45,35 +45,25 @@ export async function putEnvState(shardId, state) {
|
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
/**
|
|
48
|
-
*
|
|
49
|
-
* The
|
|
50
|
-
* (and the server bundle, if present and serverIntegrity was declared).
|
|
48
|
+
* Request the server to install a package autonomously.
|
|
49
|
+
* The server fetches and validates the archive from the registry itself.
|
|
51
50
|
*
|
|
52
|
-
* @param
|
|
53
|
-
* @param
|
|
54
|
-
* @param
|
|
55
|
-
* provided, the server writes it to `server.js` and hot-mounts the
|
|
56
|
-
* shard's routes. If the mount fails, the entire install is rolled
|
|
57
|
-
* back server-side.
|
|
51
|
+
* @param registryUrl - URL of the registry.json that lists the package.
|
|
52
|
+
* @param packageId - The package id to install.
|
|
53
|
+
* @param version - The exact version string to install.
|
|
58
54
|
*/
|
|
59
|
-
export async function
|
|
55
|
+
export async function requestServerInstall(registryUrl, packageId, version) {
|
|
60
56
|
var _a;
|
|
61
57
|
if (!isAdmin())
|
|
62
58
|
throw new Error('Cannot install: not elevated to admin');
|
|
63
59
|
const auth = getAuthHeader();
|
|
64
|
-
const
|
|
65
|
-
form.append('manifest', new Blob([JSON.stringify(manifest)], { type: 'application/json' }), 'manifest.json');
|
|
66
|
-
form.append('client', new Blob([clientBundle], { type: 'application/javascript' }), 'client.js');
|
|
67
|
-
if (serverBundle !== undefined) {
|
|
68
|
-
form.append('server', new Blob([serverBundle], { type: 'application/javascript' }), 'server.js');
|
|
69
|
-
}
|
|
70
|
-
const headers = {};
|
|
60
|
+
const headers = { 'Content-Type': 'application/json' };
|
|
71
61
|
if (auth)
|
|
72
62
|
headers['Authorization'] = auth;
|
|
73
63
|
const res = await apiFetch(`${getEnvServerUrl()}/api/packages/install`, {
|
|
74
64
|
method: 'POST',
|
|
75
65
|
headers,
|
|
76
|
-
body:
|
|
66
|
+
body: JSON.stringify({ registryUrl, packageId, version }),
|
|
77
67
|
credentials: 'omit',
|
|
78
68
|
});
|
|
79
69
|
if (!res.ok) {
|
|
@@ -84,9 +74,9 @@ export async function serverInstallPackage(manifest, clientBundle, serverBundle)
|
|
|
84
74
|
catch ( /* non-JSON */_b) { /* non-JSON */ }
|
|
85
75
|
return {
|
|
86
76
|
ok: false,
|
|
87
|
-
error: typeof body
|
|
88
|
-
code: typeof body
|
|
89
|
-
missing: Array.isArray(body
|
|
77
|
+
error: typeof body['error'] === 'string' ? body['error'] : `HTTP ${res.status}`,
|
|
78
|
+
code: typeof body['code'] === 'string' ? body['code'] : undefined,
|
|
79
|
+
missing: Array.isArray(body['missing']) ? body['missing'] : undefined,
|
|
90
80
|
};
|
|
91
81
|
}
|
|
92
82
|
const body = await res.json();
|
package/dist/env/index.d.ts
CHANGED
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export type { EnvState } from './types';
|
|
2
|
-
export { __setEnvServerUrl, getEnvServerUrl, fetchEnvState, putEnvState,
|
|
2
|
+
export { __setEnvServerUrl, getEnvServerUrl, fetchEnvState, putEnvState, requestServerInstall, serverUninstallPackage, fetchServerPackages, } from './client';
|
|
3
|
+
export type { ServerInstallResult } from './client';
|
package/dist/env/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export { __setEnvServerUrl, getEnvServerUrl, fetchEnvState, putEnvState,
|
|
1
|
+
export { __setEnvServerUrl, getEnvServerUrl, fetchEnvState, putEnvState, requestServerInstall, serverUninstallPackage, fetchServerPackages, } from './client';
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { ArtifactManifest } from '../artifact.js';
|
|
2
|
+
export declare class ArchiveValidationError extends Error {
|
|
3
|
+
constructor(message: string);
|
|
4
|
+
}
|
|
5
|
+
export declare function validateArchive(bytes: Uint8Array): void;
|
|
6
|
+
export declare function readManifestFromArchive(bytes: Uint8Array): ArtifactManifest;
|
|
7
|
+
export declare function readFileFromArchive(bytes: Uint8Array, filename: string): ArrayBuffer | null;
|
|
8
|
+
export declare function createArchive(entries: {
|
|
9
|
+
manifest: ArtifactManifest;
|
|
10
|
+
client?: Uint8Array;
|
|
11
|
+
server?: Uint8Array;
|
|
12
|
+
}): Uint8Array;
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import { unzipSync, zipSync, strToU8 } from 'fflate';
|
|
2
|
+
export class ArchiveValidationError extends Error {
|
|
3
|
+
constructor(message) {
|
|
4
|
+
super(message);
|
|
5
|
+
this.name = 'ArchiveValidationError';
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
export function validateArchive(bytes) {
|
|
9
|
+
let files;
|
|
10
|
+
try {
|
|
11
|
+
files = unzipSync(bytes);
|
|
12
|
+
}
|
|
13
|
+
catch (_a) {
|
|
14
|
+
throw new ArchiveValidationError('Invalid ZIP archive');
|
|
15
|
+
}
|
|
16
|
+
if (!files['manifest.json']) {
|
|
17
|
+
throw new ArchiveValidationError('Archive missing manifest.json');
|
|
18
|
+
}
|
|
19
|
+
if (!('client.js' in files) && !('server.js' in files)) {
|
|
20
|
+
throw new ArchiveValidationError('Archive must contain at least one of client.js or server.js');
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
export function readManifestFromArchive(bytes) {
|
|
24
|
+
let files;
|
|
25
|
+
try {
|
|
26
|
+
files = unzipSync(bytes);
|
|
27
|
+
}
|
|
28
|
+
catch (_a) {
|
|
29
|
+
throw new ArchiveValidationError('Invalid ZIP archive');
|
|
30
|
+
}
|
|
31
|
+
const raw = files['manifest.json'];
|
|
32
|
+
if (!raw)
|
|
33
|
+
throw new ArchiveValidationError('Archive missing manifest.json');
|
|
34
|
+
let manifest;
|
|
35
|
+
try {
|
|
36
|
+
manifest = JSON.parse(new TextDecoder().decode(raw));
|
|
37
|
+
}
|
|
38
|
+
catch (_b) {
|
|
39
|
+
throw new ArchiveValidationError('manifest.json is not valid JSON');
|
|
40
|
+
}
|
|
41
|
+
assertManifestShape(manifest);
|
|
42
|
+
return manifest;
|
|
43
|
+
}
|
|
44
|
+
function assertManifestShape(m) {
|
|
45
|
+
if (!m || typeof m !== 'object' || Array.isArray(m)) {
|
|
46
|
+
throw new ArchiveValidationError('manifest.json must be a JSON object');
|
|
47
|
+
}
|
|
48
|
+
const obj = m;
|
|
49
|
+
for (const field of ['id', 'type', 'version', 'contractVersion']) {
|
|
50
|
+
if (obj[field] == null) {
|
|
51
|
+
throw new ArchiveValidationError(`manifest.json missing required field: ${field}`);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
export function readFileFromArchive(bytes, filename) {
|
|
56
|
+
let files;
|
|
57
|
+
try {
|
|
58
|
+
files = unzipSync(bytes);
|
|
59
|
+
}
|
|
60
|
+
catch (_a) {
|
|
61
|
+
return null;
|
|
62
|
+
}
|
|
63
|
+
const data = files[filename];
|
|
64
|
+
if (!data)
|
|
65
|
+
return null;
|
|
66
|
+
return data.slice().buffer;
|
|
67
|
+
}
|
|
68
|
+
export function createArchive(entries) {
|
|
69
|
+
if (!entries.client && !entries.server) {
|
|
70
|
+
throw new ArchiveValidationError('Archive must contain at least one of client or server');
|
|
71
|
+
}
|
|
72
|
+
const files = {
|
|
73
|
+
'manifest.json': strToU8(JSON.stringify(entries.manifest, null, 2)),
|
|
74
|
+
};
|
|
75
|
+
if (entries.client)
|
|
76
|
+
files['client.js'] = entries.client;
|
|
77
|
+
if (entries.server)
|
|
78
|
+
files['server.js'] = entries.server;
|
|
79
|
+
return zipSync(files);
|
|
80
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|