asyar-sdk 4.14.1 → 4.16.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/README.md +3 -72
- package/dist/ExtensionBridge.d.ts +19 -5
- package/dist/ExtensionBridge.d.ts.map +1 -1
- package/dist/ExtensionBridge.js +42 -5
- package/dist/ExtensionBridge.js.map +1 -1
- package/dist/ExtensionBridge.shortcuts.test.d.ts +2 -0
- package/dist/ExtensionBridge.shortcuts.test.d.ts.map +1 -0
- package/dist/ExtensionBridge.shortcuts.test.js +128 -0
- package/dist/ExtensionBridge.shortcuts.test.js.map +1 -0
- package/dist/cli/commands/attach.js +4 -13
- package/dist/cli/commands/attach.js.map +1 -1
- package/dist/cli/commands/build.js +29 -41
- package/dist/cli/commands/build.js.map +1 -1
- package/dist/cli/commands/detach.js +1 -1
- package/dist/cli/commands/detach.js.map +1 -1
- package/dist/cli/commands/dev.js +12 -21
- package/dist/cli/commands/dev.js.map +1 -1
- package/dist/cli/commands/doctor.js +9 -19
- package/dist/cli/commands/doctor.js.map +1 -1
- package/dist/cli/commands/link.js +63 -78
- package/dist/cli/commands/link.js.map +1 -1
- package/dist/cli/commands/publish.js +29 -39
- package/dist/cli/commands/publish.js.map +1 -1
- package/dist/cli/commands/validate.js +2 -11
- package/dist/cli/commands/validate.js.map +1 -1
- package/dist/cli/lib/auth.js +149 -170
- package/dist/cli/lib/auth.js.map +1 -1
- package/dist/cli/lib/config.js +3 -4
- package/dist/cli/lib/config.js.map +1 -1
- package/dist/cli/lib/extensionRepo.js +4 -4
- package/dist/cli/lib/extensionRepo.js.map +1 -1
- package/dist/cli/lib/gatedPermissions.d.ts +1 -1
- package/dist/cli/lib/gatedPermissions.d.ts.map +1 -1
- package/dist/cli/lib/gatedPermissions.js +2 -0
- package/dist/cli/lib/gatedPermissions.js.map +1 -1
- package/dist/cli/lib/github.js +72 -86
- package/dist/cli/lib/github.js.map +1 -1
- package/dist/cli/lib/manifest.d.ts +2 -1
- package/dist/cli/lib/manifest.d.ts.map +1 -1
- package/dist/cli/lib/manifest.js +167 -17
- package/dist/cli/lib/manifest.js.map +1 -1
- package/dist/cli/lib/platform.js +3 -4
- package/dist/cli/lib/platform.js.map +1 -1
- package/dist/cli/lib/store.js +53 -64
- package/dist/cli/lib/store.js.map +1 -1
- package/dist/cli/lib/workerCompat.js +1 -1
- package/dist/cli/lib/workerCompat.js.map +1 -1
- package/dist/cli/lib/zip.js +1 -2
- package/dist/cli/lib/zip.js.map +1 -1
- package/dist/contracts.d.ts +1 -1
- package/dist/contracts.d.ts.map +1 -1
- package/dist/contracts.js.map +1 -1
- package/dist/generated/files.d.ts +31 -0
- package/dist/generated/files.d.ts.map +1 -0
- package/dist/generated/files.js +2 -0
- package/dist/generated/files.js.map +1 -0
- package/dist/lib/shortcutChord.d.ts +2 -0
- package/dist/lib/shortcutChord.d.ts.map +1 -0
- package/dist/lib/shortcutChord.js +78 -0
- package/dist/lib/shortcutChord.js.map +1 -0
- package/dist/lib/shortcutChord.test.d.ts +2 -0
- package/dist/lib/shortcutChord.test.d.ts.map +1 -0
- package/dist/lib/shortcutChord.test.js +54 -0
- package/dist/lib/shortcutChord.test.js.map +1 -0
- package/dist/services/FilesServiceProxy.d.ts +3 -1
- package/dist/services/FilesServiceProxy.d.ts.map +1 -1
- package/dist/services/FilesServiceProxy.js +10 -0
- package/dist/services/FilesServiceProxy.js.map +1 -1
- package/dist/services/FilesServiceProxy.test.js +32 -5
- package/dist/services/FilesServiceProxy.test.js.map +1 -1
- package/dist/services/IFilesService.d.ts +7 -6
- package/dist/services/IFilesService.d.ts.map +1 -1
- package/dist/services/IStatusBarService.d.ts +12 -0
- package/dist/services/IStatusBarService.d.ts.map +1 -1
- package/dist/services/NetworkServiceProxy.d.ts +5 -1
- package/dist/services/NetworkServiceProxy.d.ts.map +1 -1
- package/dist/services/NetworkServiceProxy.js +33 -3
- package/dist/services/NetworkServiceProxy.js.map +1 -1
- package/dist/services/NetworkServiceProxy.test.js +73 -0
- package/dist/services/NetworkServiceProxy.test.js.map +1 -1
- package/dist/services/StatusBarServiceProxy.d.ts +1 -0
- package/dist/services/StatusBarServiceProxy.d.ts.map +1 -1
- package/dist/services/StatusBarServiceProxy.js +11 -11
- package/dist/services/StatusBarServiceProxy.js.map +1 -1
- package/dist/services/StatusBarServiceProxy.test.js +70 -6
- package/dist/services/StatusBarServiceProxy.test.js.map +1 -1
- package/dist/services/statusBarValidation.d.ts +2 -0
- package/dist/services/statusBarValidation.d.ts.map +1 -1
- package/dist/services/statusBarValidation.js +13 -0
- package/dist/services/statusBarValidation.js.map +1 -1
- package/dist/types/ActionType.d.ts +8 -1
- package/dist/types/ActionType.d.ts.map +1 -1
- package/dist/types/ActionType.js.map +1 -1
- package/dist/types/ExtensionType.d.ts +8 -3
- package/dist/types/ExtensionType.d.ts.map +1 -1
- package/dist/types/NetworkType.d.ts +27 -0
- package/dist/types/NetworkType.d.ts.map +1 -1
- package/dist/worker.js +3 -3
- package/dist/worker.js.map +1 -1
- package/package.json +2 -2
package/dist/cli/lib/github.js
CHANGED
|
@@ -1,105 +1,91 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.GitHubClient = void 0;
|
|
13
4
|
class GitHubClient {
|
|
5
|
+
token;
|
|
14
6
|
constructor(token) {
|
|
15
7
|
this.token = token;
|
|
16
8
|
}
|
|
17
|
-
request(
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
9
|
+
async request(path, options = {}) {
|
|
10
|
+
let response;
|
|
11
|
+
try {
|
|
12
|
+
response = await fetch(`https://api.github.com${path}`, {
|
|
13
|
+
...options,
|
|
14
|
+
headers: {
|
|
15
|
+
Authorization: `Bearer ${this.token}`,
|
|
16
|
+
Accept: 'application/vnd.github+json',
|
|
17
|
+
'X-GitHub-Api-Version': '2022-11-28',
|
|
18
|
+
'Content-Type': 'application/json',
|
|
19
|
+
...options.headers,
|
|
20
|
+
},
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
catch (err) {
|
|
24
|
+
throw new Error(`Could not connect to GitHub API. Please check your internet connection.`);
|
|
25
|
+
}
|
|
26
|
+
if (!response.ok) {
|
|
27
|
+
const err = await response.json().catch(() => ({}));
|
|
28
|
+
throw new Error(`GitHub API ${response.status}: ${err.message ?? response.statusText}`);
|
|
29
|
+
}
|
|
30
|
+
return response.json();
|
|
33
31
|
}
|
|
34
|
-
getAuthenticatedUser() {
|
|
35
|
-
return
|
|
36
|
-
return this.request('/user');
|
|
37
|
-
});
|
|
32
|
+
async getAuthenticatedUser() {
|
|
33
|
+
return this.request('/user');
|
|
38
34
|
}
|
|
39
|
-
createRepo(opts) {
|
|
40
|
-
return
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}),
|
|
49
|
-
});
|
|
35
|
+
async createRepo(opts) {
|
|
36
|
+
return this.request('/user/repos', {
|
|
37
|
+
method: 'POST',
|
|
38
|
+
body: JSON.stringify({
|
|
39
|
+
name: opts.name,
|
|
40
|
+
description: opts.description,
|
|
41
|
+
private: opts.isPrivate,
|
|
42
|
+
auto_init: false,
|
|
43
|
+
}),
|
|
50
44
|
});
|
|
51
45
|
}
|
|
52
|
-
getRepo(owner, repo) {
|
|
53
|
-
return
|
|
54
|
-
|
|
55
|
-
|
|
46
|
+
async getRepo(owner, repo) {
|
|
47
|
+
return this.request(`/repos/${owner}/${repo}`);
|
|
48
|
+
}
|
|
49
|
+
async getRelease(owner, repo, tag) {
|
|
50
|
+
try {
|
|
51
|
+
return await this.request(`/repos/${owner}/${repo}/releases/tags/${tag}`);
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
return null;
|
|
55
|
+
}
|
|
56
56
|
}
|
|
57
|
-
|
|
58
|
-
return
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
57
|
+
async createRelease(owner, repo, opts) {
|
|
58
|
+
return this.request(`/repos/${owner}/${repo}/releases`, {
|
|
59
|
+
method: 'POST',
|
|
60
|
+
body: JSON.stringify({
|
|
61
|
+
tag_name: opts.tag,
|
|
62
|
+
name: opts.name,
|
|
63
|
+
body: opts.body,
|
|
64
|
+
draft: false,
|
|
65
|
+
prerelease: false,
|
|
66
|
+
}),
|
|
65
67
|
});
|
|
66
68
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
69
|
+
async uploadReleaseAsset(uploadUrl, fileBuffer, fileName) {
|
|
70
|
+
const url = uploadUrl.replace('{?name,label}', `?name=${fileName}`);
|
|
71
|
+
let response;
|
|
72
|
+
try {
|
|
73
|
+
response = await fetch(url, {
|
|
70
74
|
method: 'POST',
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
prerelease: false,
|
|
77
|
-
}),
|
|
75
|
+
headers: {
|
|
76
|
+
Authorization: `Bearer ${this.token}`,
|
|
77
|
+
'Content-Type': 'application/zip',
|
|
78
|
+
},
|
|
79
|
+
body: fileBuffer,
|
|
78
80
|
});
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
method: 'POST',
|
|
88
|
-
headers: {
|
|
89
|
-
Authorization: `Bearer ${this.token}`,
|
|
90
|
-
'Content-Type': 'application/zip',
|
|
91
|
-
},
|
|
92
|
-
body: fileBuffer,
|
|
93
|
-
});
|
|
94
|
-
}
|
|
95
|
-
catch (err) {
|
|
96
|
-
throw new Error(`Could not connect to GitHub to upload release asset. Please check your internet connection.`);
|
|
97
|
-
}
|
|
98
|
-
if (!response.ok) {
|
|
99
|
-
throw new Error(`Failed to upload release asset: ${response.status} ${response.statusText}`);
|
|
100
|
-
}
|
|
101
|
-
return response.json();
|
|
102
|
-
});
|
|
81
|
+
}
|
|
82
|
+
catch (err) {
|
|
83
|
+
throw new Error(`Could not connect to GitHub to upload release asset. Please check your internet connection.`);
|
|
84
|
+
}
|
|
85
|
+
if (!response.ok) {
|
|
86
|
+
throw new Error(`Failed to upload release asset: ${response.status} ${response.statusText}`);
|
|
87
|
+
}
|
|
88
|
+
return response.json();
|
|
103
89
|
}
|
|
104
90
|
}
|
|
105
91
|
exports.GitHubClient = GitHubClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../cli/lib/github.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../cli/lib/github.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export interface AsyarManifest {
|
|
|
6
6
|
description: string;
|
|
7
7
|
author: string;
|
|
8
8
|
permissions?: string[];
|
|
9
|
+
permissionArgs?: Record<string, unknown>;
|
|
9
10
|
commands: ManifestCommand[];
|
|
10
11
|
minAppVersion?: string;
|
|
11
12
|
asyarSdk?: string;
|
|
@@ -144,7 +145,7 @@ export interface ValidationError {
|
|
|
144
145
|
field: string;
|
|
145
146
|
message: string;
|
|
146
147
|
}
|
|
147
|
-
export declare const VALID_PERMISSIONS: readonly ["clipboard:read", "clipboard:write", "clipboard-history:read", "clipboard-history:capture", "clipboard-history:manage", "store:read", "store:write", "notifications:send", "fs:read", "fs:write", "fs:watch", "shell:spawn", "shell:open-url", "shell:open-path", "network", "selection:read", "storage:read", "storage:write", "oauth:use", "extension:invoke", "cache:read", "cache:write", "window:manage", "screen:pick-color", "screen:capture", "calculator:evaluate", "application:read", "entitlements:read", "power:inhibit", "systemEvents:read", "app:frontmost-watch", "timers:schedule", "timers:cancel", "timers:list", "preferences:read", "preferences:write", "feedback:announce", "tools:register", "snippets:contribute", "runs:track", "browser:tabs.read", "browser:tabs.write", "browser:bookmarks.read", "browser:history.read", "browser:page.read", "browser:page.write", "process:read", "process:kill", "files:search", "files:read", "notes:read", "notes:write", "mcp", "ai"];
|
|
148
|
+
export declare const VALID_PERMISSIONS: readonly ["clipboard:read", "clipboard:write", "clipboard-history:read", "clipboard-history:capture", "clipboard-history:manage", "store:read", "store:write", "notifications:send", "fs:read", "fs:write", "fs:watch", "shell:spawn", "shell:open-url", "shell:open-path", "network", "network:lan", "network:secrets", "selection:read", "storage:read", "storage:write", "oauth:use", "extension:invoke", "cache:read", "cache:write", "window:manage", "screen:pick-color", "screen:capture", "calculator:evaluate", "application:read", "entitlements:read", "power:inhibit", "systemEvents:read", "app:frontmost-watch", "timers:schedule", "timers:cancel", "timers:list", "preferences:read", "preferences:write", "feedback:announce", "tools:register", "snippets:contribute", "runs:track", "browser:tabs.read", "browser:tabs.write", "browser:bookmarks.read", "browser:history.read", "browser:page.read", "browser:page.write", "process:read", "process:kill", "files:search", "files:read", "notes:read", "notes:write", "mcp", "ai"];
|
|
148
149
|
export declare const VALID_PLATFORMS: readonly ["macos", "windows", "linux"];
|
|
149
150
|
/**
|
|
150
151
|
* Generated from asyar-launcher's runtimes/catalog.fallback.json — see
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../cli/lib/manifest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../cli/lib/manifest.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/lib/manifest.js
CHANGED
|
@@ -34,6 +34,7 @@ exports.validatePreferences = validatePreferences;
|
|
|
34
34
|
const fs = __importStar(require("node:fs"));
|
|
35
35
|
const path = __importStar(require("node:path"));
|
|
36
36
|
const semver = __importStar(require("semver"));
|
|
37
|
+
const node_net_1 = require("node:net");
|
|
37
38
|
const knownRuntimes_1 = require("./knownRuntimes");
|
|
38
39
|
const VALID_PREFERENCE_TYPES = [
|
|
39
40
|
'textfield',
|
|
@@ -67,6 +68,8 @@ exports.VALID_PERMISSIONS = [
|
|
|
67
68
|
'shell:open-url',
|
|
68
69
|
'shell:open-path',
|
|
69
70
|
'network',
|
|
71
|
+
'network:lan',
|
|
72
|
+
'network:secrets',
|
|
70
73
|
'selection:read',
|
|
71
74
|
'storage:read',
|
|
72
75
|
'storage:write',
|
|
@@ -122,12 +125,128 @@ function readManifest(cwd) {
|
|
|
122
125
|
try {
|
|
123
126
|
return JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
|
|
124
127
|
}
|
|
125
|
-
catch
|
|
128
|
+
catch {
|
|
126
129
|
throw new Error('manifest.json is not valid JSON');
|
|
127
130
|
}
|
|
128
131
|
}
|
|
132
|
+
function parseIpv4(value) {
|
|
133
|
+
const parts = value.split('.');
|
|
134
|
+
if (parts.length !== 4)
|
|
135
|
+
return null;
|
|
136
|
+
const octets = parts.map((part) => (/^(0|[1-9]\d{0,2})$/.test(part) ? Number(part) : -1));
|
|
137
|
+
if (octets.some((part) => part < 0 || part > 255))
|
|
138
|
+
return null;
|
|
139
|
+
return octets.reduce((result, part) => (result << 8n) | BigInt(part), 0n);
|
|
140
|
+
}
|
|
141
|
+
function parseIpv6(value) {
|
|
142
|
+
if (value.includes('.') || value.includes('%') || value.split('::').length > 2)
|
|
143
|
+
return null;
|
|
144
|
+
const [leftRaw, rightRaw] = value.split('::');
|
|
145
|
+
const left = leftRaw ? leftRaw.split(':') : [];
|
|
146
|
+
const right = rightRaw ? rightRaw.split(':') : [];
|
|
147
|
+
if (!value.includes('::') && left.length !== 8)
|
|
148
|
+
return null;
|
|
149
|
+
if (value.includes('::') && left.length + right.length >= 8)
|
|
150
|
+
return null;
|
|
151
|
+
const groups = [...left, ...Array(8 - left.length - right.length).fill('0'), ...right];
|
|
152
|
+
if (groups.length !== 8 || groups.some((group) => !/^[0-9a-fA-F]{1,4}$/.test(group))) {
|
|
153
|
+
return null;
|
|
154
|
+
}
|
|
155
|
+
return groups.reduce((result, group) => (result << 16n) | BigInt(`0x${group}`), 0n);
|
|
156
|
+
}
|
|
157
|
+
function parsedIp(value) {
|
|
158
|
+
const version = (0, node_net_1.isIP)(value);
|
|
159
|
+
if (version === 4)
|
|
160
|
+
return { bits: 32, number: parseIpv4(value) };
|
|
161
|
+
if (version === 6)
|
|
162
|
+
return { bits: 128, number: parseIpv6(value) };
|
|
163
|
+
return null;
|
|
164
|
+
}
|
|
165
|
+
function inCidr(value, network, bits, prefix) {
|
|
166
|
+
const mask = prefix === 0 ? 0n : ((1n << BigInt(bits)) - 1n) << BigInt(bits - prefix);
|
|
167
|
+
return (value & mask) === (network & mask);
|
|
168
|
+
}
|
|
169
|
+
function unsafeOrNonLanIp(ip) {
|
|
170
|
+
if (ip.bits === 32) {
|
|
171
|
+
const isPrivate = inCidr(ip.number, 0x0a000000n, 32, 8) ||
|
|
172
|
+
inCidr(ip.number, 0xac100000n, 32, 12) ||
|
|
173
|
+
inCidr(ip.number, 0xc0a80000n, 32, 16) ||
|
|
174
|
+
inCidr(ip.number, 0x64400000n, 32, 10);
|
|
175
|
+
const unsafe = inCidr(ip.number, 0x7f000000n, 32, 8) ||
|
|
176
|
+
inCidr(ip.number, 0xa9fe0000n, 32, 16) ||
|
|
177
|
+
inCidr(ip.number, 0xe0000000n, 32, 4) ||
|
|
178
|
+
ip.number === 0x646464c8n;
|
|
179
|
+
return !isPrivate || unsafe;
|
|
180
|
+
}
|
|
181
|
+
const uniqueLocal = inCidr(ip.number, 0xfc00n << 112n, 128, 7);
|
|
182
|
+
const unsafe = ip.number === 1n ||
|
|
183
|
+
inCidr(ip.number, 0xfe80n << 112n, 128, 10) ||
|
|
184
|
+
inCidr(ip.number, 0xff00n << 112n, 128, 8) ||
|
|
185
|
+
ip.number === parseIpv6('fd00:ec2::254');
|
|
186
|
+
return !uniqueLocal || unsafe;
|
|
187
|
+
}
|
|
188
|
+
function validateLanEndpoint(endpoint) {
|
|
189
|
+
let target;
|
|
190
|
+
let portText;
|
|
191
|
+
if (endpoint.startsWith('[')) {
|
|
192
|
+
const close = endpoint.indexOf(']');
|
|
193
|
+
if (close < 0 || endpoint[close + 1] !== ':')
|
|
194
|
+
return 'must use [address/prefix]:port';
|
|
195
|
+
target = endpoint.slice(1, close);
|
|
196
|
+
portText = endpoint.slice(close + 2);
|
|
197
|
+
}
|
|
198
|
+
else {
|
|
199
|
+
const colon = endpoint.lastIndexOf(':');
|
|
200
|
+
if (colon < 1)
|
|
201
|
+
return 'must include a port';
|
|
202
|
+
target = endpoint.slice(0, colon);
|
|
203
|
+
portText = endpoint.slice(colon + 1);
|
|
204
|
+
}
|
|
205
|
+
if (!/^\d+$/.test(portText) || Number(portText) < 1 || Number(portText) > 65535) {
|
|
206
|
+
return 'has an invalid port';
|
|
207
|
+
}
|
|
208
|
+
const slash = target.indexOf('/');
|
|
209
|
+
if (slash >= 0) {
|
|
210
|
+
const address = target.slice(0, slash);
|
|
211
|
+
const prefixText = target.slice(slash + 1);
|
|
212
|
+
const ip = parsedIp(address);
|
|
213
|
+
if (!ip || !/^\d+$/.test(prefixText))
|
|
214
|
+
return 'has an invalid CIDR';
|
|
215
|
+
const prefix = Number(prefixText);
|
|
216
|
+
if (prefix > ip.bits || !inCidr(ip.number, ip.number, ip.bits, prefix)) {
|
|
217
|
+
return 'has an invalid CIDR';
|
|
218
|
+
}
|
|
219
|
+
const mask = prefix === 0 ? 0n : ((1n << BigInt(ip.bits)) - 1n) << BigInt(ip.bits - prefix);
|
|
220
|
+
if ((ip.number & mask) !== ip.number)
|
|
221
|
+
return 'CIDR must use its canonical network address';
|
|
222
|
+
if (unsafeOrNonLanIp(ip))
|
|
223
|
+
return 'must be a private LAN CIDR';
|
|
224
|
+
const unsafeProbes = ip.bits === 32
|
|
225
|
+
? [0x7f000001n, 0xa9fea9fen, 0x646464c8n, 0xeffffffan]
|
|
226
|
+
: [1n, 0xfe80n << 112n, 0xff00n << 112n, parseIpv6('fd00:ec2::254')];
|
|
227
|
+
if (unsafeProbes.some((probe) => inCidr(probe, ip.number, ip.bits, prefix))) {
|
|
228
|
+
return 'CIDR includes a blocked loopback, link-local, multicast, or metadata address';
|
|
229
|
+
}
|
|
230
|
+
return null;
|
|
231
|
+
}
|
|
232
|
+
const ip = parsedIp(target);
|
|
233
|
+
if (ip)
|
|
234
|
+
return unsafeOrNonLanIp(ip) ? 'must be a private LAN address' : null;
|
|
235
|
+
try {
|
|
236
|
+
const parsed = new URL(`http://${target}:1`);
|
|
237
|
+
if (!parsed.hostname ||
|
|
238
|
+
parsed.username ||
|
|
239
|
+
parsed.password ||
|
|
240
|
+
target.toLowerCase() === 'localhost') {
|
|
241
|
+
return 'has an invalid host';
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
catch {
|
|
245
|
+
return 'has an invalid host';
|
|
246
|
+
}
|
|
247
|
+
return null;
|
|
248
|
+
}
|
|
129
249
|
function validateManifest(manifest, cwd) {
|
|
130
|
-
var _a, _b, _c, _d;
|
|
131
250
|
const errors = [];
|
|
132
251
|
const asUnknown = manifest;
|
|
133
252
|
if (!manifest.id) {
|
|
@@ -174,6 +293,41 @@ function validateManifest(manifest, cwd) {
|
|
|
174
293
|
}
|
|
175
294
|
});
|
|
176
295
|
}
|
|
296
|
+
const lanArgs = manifest.permissionArgs?.['network:lan'];
|
|
297
|
+
const declaresLan = manifest.permissions?.includes('network:lan') ?? false;
|
|
298
|
+
if (declaresLan) {
|
|
299
|
+
if (!manifest.permissions?.includes('network')) {
|
|
300
|
+
errors.push({ field: 'permissions', message: '"network:lan" requires "network"' });
|
|
301
|
+
}
|
|
302
|
+
if (lanArgs !== undefined) {
|
|
303
|
+
// Only validate when present; absent = user manages the allowlist in Settings
|
|
304
|
+
if (!Array.isArray(lanArgs) ||
|
|
305
|
+
lanArgs.length === 0 ||
|
|
306
|
+
!lanArgs.every((entry) => typeof entry === 'string')) {
|
|
307
|
+
errors.push({
|
|
308
|
+
field: 'permissionArgs.network:lan',
|
|
309
|
+
message: 'must be a non-empty array of host-or-CIDR:port strings',
|
|
310
|
+
});
|
|
311
|
+
}
|
|
312
|
+
else {
|
|
313
|
+
for (const endpoint of lanArgs) {
|
|
314
|
+
const reason = validateLanEndpoint(endpoint);
|
|
315
|
+
if (reason) {
|
|
316
|
+
errors.push({
|
|
317
|
+
field: 'permissionArgs.network:lan',
|
|
318
|
+
message: `"${endpoint}" ${reason}`,
|
|
319
|
+
});
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
else if (lanArgs !== undefined) {
|
|
326
|
+
errors.push({
|
|
327
|
+
field: 'permissionArgs.network:lan',
|
|
328
|
+
message: 'requires "network:lan" in permissions',
|
|
329
|
+
});
|
|
330
|
+
}
|
|
177
331
|
if (manifest.runtimes) {
|
|
178
332
|
manifest.runtimes.forEach((rt) => {
|
|
179
333
|
if (!exports.VALID_RUNTIMES.includes(rt)) {
|
|
@@ -235,9 +389,9 @@ function validateManifest(manifest, cwd) {
|
|
|
235
389
|
validateCommand(cmd, i, errors);
|
|
236
390
|
});
|
|
237
391
|
}
|
|
238
|
-
const hasBackgroundCommand = (
|
|
239
|
-
const hasViewCommand = (
|
|
240
|
-
const declaresBackground = !!
|
|
392
|
+
const hasBackgroundCommand = (manifest.commands ?? []).some((c) => c.mode === 'background');
|
|
393
|
+
const hasViewCommand = (manifest.commands ?? []).some((c) => c.mode === 'view');
|
|
394
|
+
const declaresBackground = !!manifest.background?.main;
|
|
241
395
|
if ((hasBackgroundCommand || manifest.searchable === true) && !declaresBackground) {
|
|
242
396
|
errors.push({
|
|
243
397
|
field: 'background.main',
|
|
@@ -305,7 +459,7 @@ function validateManifest(manifest, cwd) {
|
|
|
305
459
|
}
|
|
306
460
|
}
|
|
307
461
|
errors.push(...validatePreferences(manifest.preferences, 'preferences'));
|
|
308
|
-
(
|
|
462
|
+
(manifest.commands ?? []).forEach((cmd, i) => {
|
|
309
463
|
errors.push(...validatePreferences(cmd.preferences, `commands[${i}].preferences`));
|
|
310
464
|
errors.push(...validateArguments(cmd.arguments, `commands[${i}].arguments`));
|
|
311
465
|
errors.push(...validateRequireAnyOf(cmd.requireAnyOf, cmd.arguments, `commands[${i}].requireAnyOf`));
|
|
@@ -314,7 +468,6 @@ function validateManifest(manifest, cwd) {
|
|
|
314
468
|
return errors;
|
|
315
469
|
}
|
|
316
470
|
function lintManifest(manifest, cwd) {
|
|
317
|
-
var _a;
|
|
318
471
|
const errors = validateManifest(manifest, cwd);
|
|
319
472
|
const warnings = [];
|
|
320
473
|
// Check README.md existence and substance
|
|
@@ -335,7 +488,7 @@ function lintManifest(manifest, cwd) {
|
|
|
335
488
|
});
|
|
336
489
|
}
|
|
337
490
|
}
|
|
338
|
-
catch
|
|
491
|
+
catch {
|
|
339
492
|
// ignore fs read error
|
|
340
493
|
}
|
|
341
494
|
}
|
|
@@ -348,9 +501,8 @@ function lintManifest(manifest, cwd) {
|
|
|
348
501
|
});
|
|
349
502
|
}
|
|
350
503
|
// Check command argument placeholders
|
|
351
|
-
(
|
|
352
|
-
|
|
353
|
-
((_a = cmd.arguments) !== null && _a !== void 0 ? _a : []).forEach((arg, ai) => {
|
|
504
|
+
(manifest.commands ?? []).forEach((cmd, i) => {
|
|
505
|
+
(cmd.arguments ?? []).forEach((arg, ai) => {
|
|
354
506
|
if (!arg.placeholder && (arg.type === 'text' || arg.type === 'number')) {
|
|
355
507
|
warnings.push({
|
|
356
508
|
field: `commands[${i}].arguments[${ai}].placeholder`,
|
|
@@ -379,7 +531,6 @@ function validateWalkthrough(tasks) {
|
|
|
379
531
|
const errors = [];
|
|
380
532
|
const seen = new Set();
|
|
381
533
|
tasks.forEach((task, i) => {
|
|
382
|
-
var _a, _b;
|
|
383
534
|
const base = `walkthrough[${i}]`;
|
|
384
535
|
if (!task.id || !task.id.trim()) {
|
|
385
536
|
errors.push({ field: `${base}.id`, message: 'required' });
|
|
@@ -411,10 +562,10 @@ function validateWalkthrough(tasks) {
|
|
|
411
562
|
});
|
|
412
563
|
return;
|
|
413
564
|
}
|
|
414
|
-
if ((rule.type === 'launch' || rule.type === 'count') && !
|
|
565
|
+
if ((rule.type === 'launch' || rule.type === 'count') && !rule.target?.trim()) {
|
|
415
566
|
errors.push({ field: `${base}.completion.target`, message: 'required' });
|
|
416
567
|
}
|
|
417
|
-
if (rule.type === 'state' && !
|
|
568
|
+
if (rule.type === 'state' && !rule.probe?.trim()) {
|
|
418
569
|
errors.push({ field: `${base}.completion.probe`, message: 'required' });
|
|
419
570
|
}
|
|
420
571
|
});
|
|
@@ -532,7 +683,6 @@ function validateCommand(cmd, i, errors) {
|
|
|
532
683
|
* `validate_require_any_of` in `extensions/mod.rs`.
|
|
533
684
|
*/
|
|
534
685
|
function validateRequireAnyOf(group, args, pathPrefix) {
|
|
535
|
-
var _a;
|
|
536
686
|
const errors = [];
|
|
537
687
|
if (group === undefined)
|
|
538
688
|
return errors;
|
|
@@ -540,7 +690,7 @@ function validateRequireAnyOf(group, args, pathPrefix) {
|
|
|
540
690
|
errors.push({ field: pathPrefix, message: 'requireAnyOf must be an array of argument names' });
|
|
541
691
|
return errors;
|
|
542
692
|
}
|
|
543
|
-
const declared = new Set((args
|
|
693
|
+
const declared = new Set((args ?? []).map((a) => a.name));
|
|
544
694
|
const seen = new Set();
|
|
545
695
|
for (const name of group) {
|
|
546
696
|
if (!declared.has(name)) {
|
|
@@ -555,7 +705,7 @@ function validateRequireAnyOf(group, args, pathPrefix) {
|
|
|
555
705
|
continue;
|
|
556
706
|
}
|
|
557
707
|
seen.add(name);
|
|
558
|
-
if ((
|
|
708
|
+
if ((args ?? []).find((a) => a.name === name)?.required) {
|
|
559
709
|
errors.push({
|
|
560
710
|
field: pathPrefix,
|
|
561
711
|
message: `requireAnyOf lists '${name}', which is already required — a required argument must always be filled, so it cannot be one of several alternatives`,
|