@delance/runtime 2024.11.102 → 2024.12.100-patch1

package/dist/langserver.cjs

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require('./v2024.11.102-80444b4b6e4d9964f44a8bc3156df87d335331daa6057a2bfc04f7263e93a9a6/server.bundle.js');
+require('./v2024.12.100-patch1-a040b24fa18f6de20de211e78d8a6467a3f88fb34493439e74909b437292ec98/server.bundle.js');

package/install.mjs

@@ -1,24 +1,24 @@
 #!/usr/bin/env node
 
-import assert, {AssertionError} from 'node:assert';
-import {subtle} from 'node:crypto';
+// @ts-check
+import assert from 'node:assert';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import process from 'node:process';
 import delance from '@delance/builder';
 import {BlobReader, BlobWriter, TextWriter, ZipReader} from '@zip.js/zip.js';
-import pMap from 'p-map';
-import pRetry, {AbortError} from 'p-retry';
+import map from 'p-map';
 
-import pkg from './package.json' with {type: 'json'};
+import {getPkg, pkg} from './utils.mjs';
 
-/**
- * @param {string} string
- */
-function reverse(string) {
-	return [...string].reverse().join('');
-}
+async function writeEntry() {
+	return fs.writeFile(
+		'dist/langserver.cjs',
+		`#!/usr/bin/env node
 
+require('./v${pkg.version}-${pkg.delance.sha256}/server.bundle.js');`,
+	);
+}
 const output = path.resolve(`dist/v${pkg.version}-${pkg.delance.sha256}`);
 
 await fs.mkdir(output, {recursive: true});
@@ -31,107 +31,17 @@ try {
 }
 
 if (processed) {
+	await writeEntry();
 	process.exit();
 }
 
-/** @type {Blob?} */
-let vsix = null;
-
-if (process.env.DELANCE_VSIX) {
-	try {
-		vsix = new Blob([await fs.readFile(process.env.DELANCE_VSIX)]);
-		const hash = Array.from(
-			new Uint8Array(
-				await subtle.digest('SHA-256', await vsix.arrayBuffer()),
-			),
-		)
-			.map((b) => b.toString(16).padStart(2, '0'))
-			.join('');
-
-		assert.equal(hash, pkg.delance.sha256, 'sha256 mismatch');
-	} catch (e) {
-		if (/** @type {Error & {syscall: string}} */ (e)?.syscall === 'open') {
-			console.error(e);
-		} else {
-			throw e;
-		}
-	}
-}
-
-if (!vsix) {
-	const baseURL = new URL(reverse('/moc.oidutslausiv.ecalptekram//:sptth'));
-	const publisher = reverse('nohtyp-sm');
-	const extension = reverse('ecnalyp-edocsv');
-
-	const items = new URL(`/items?itemName=${publisher}.${extension}`, baseURL);
-	const download = new URL(
-		`/_apis/public/gallery/publishers/${publisher}/vsextensions/${extension}/${pkg.version}/vspackage`,
-		baseURL,
-	);
-
-	/** @type {RequestInit} */
-	const init = {
-		headers: {
-			'user-agent': 'Mozilla/5.0 (Delance) Gecko/20100101 Firefox/120.0',
-		},
-		credentials: 'include',
-	};
-
-	const {headers} = await fetch(items, init);
-	const cookie = headers
-		.getSetCookie()
-		.map((c) => c.split(';', 2)[0])
-		.join('; ');
-
-	vsix = await pRetry(async () => {
-		const response = await fetch(download, {
-			headers: {
-				cookie,
-			},
-			redirect: 'follow',
-			referrer: items.href,
-		});
-
-		if (response.status === 429) {
-			const delay = response.headers.get('retry-after');
-			if (delay) {
-				throw new Error('Rate limited');
-			}
-		}
-
-		if (!response.ok) {
-			throw new AbortError(response.statusText);
-		}
-
-		const vsix = await response.blob();
-
-		const hash = Array.from(
-			new Uint8Array(
-				await subtle.digest('SHA-256', await vsix.arrayBuffer()),
-			),
-		)
-			.map((b) => b.toString(16).padStart(2, '0'))
-			.join('');
-
-		try {
-			assert.equal(hash, pkg.delance.sha256, 'sha256 mismatch');
-		} catch (error) {
-			if (error instanceof AssertionError) {
-				throw new AbortError(error);
-			}
-			throw error;
-		}
-
-		return vsix;
-	});
-}
-
-const zip = new ZipReader(new BlobReader(vsix));
+/** @type {ZipReader<BlobReader>} */
+const zip = new ZipReader(new BlobReader(await getPkg()));
 
 const prefix = path.normalize('extension/dist/');
 
-await pMap(
-	await zip.getEntries(),
+await map(
+	zip.getEntriesGenerator(),
 	async (entry) => {
 		const filename = path.normalize(entry.filename);
 		if (!filename.startsWith(prefix)) {
@@ -176,9 +86,4 @@ await pMap(
 	{concurrency: 4},
 );
 
-await fs.writeFile(
-	'dist/langserver.cjs',
-	`#!/usr/bin/env node
-
-require('./v${pkg.version}-${pkg.delance.sha256}/server.bundle.js');`,
-);
+await writeEntry();

package/package.json

@@ -1,29 +1,36 @@
 {
   "name": "@delance/runtime",
-  "version": "2024.11.102",
+  "version": "2024.12.100-patch1",
   "description": "Runtime and entrypoint for the lance",
   "license": "0BSD",
   "bin": {
     "delance-langserver": "dist/langserver.cjs"
   },
   "delance": {
-    "sha256": "80444b4b6e4d9964f44a8bc3156df87d335331daa6057a2bfc04f7263e93a9a6"
+    "sha256": "a040b24fa18f6de20de211e78d8a6467a3f88fb34493439e74909b437292ec98"
   },
-  "files": ["langserver.cjs", "install.mjs"],
+  "files": [
+    "langserver.cjs",
+    "install.mjs",
+    "utils.mjs"
+  ],
   "scripts": {
     "postinstall": "node install.mjs",
+    "prepublishOnly": "node install.mjs",
     "lint": "biome lint ."
   },
   "dependencies": {
-    "@delance/builder": "^0.2.16",
-    "@zip.js/zip.js": "^2.7.53",
-    "p-map": "^7.0.2",
-    "p-retry": "^6.2.0"
+    "@delance/builder": "^0.3.1",
+    "@zip.js/zip.js": "^2.7.54",
+    "p-map": "^7.0.3",
+    "p-retry": "^6.2.1"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
-    "@types/node": "^20.17.6",
-    "typescript": "^5.6.3"
+    "@types/node": "^22.10.5",
+    "typescript": "^5.7.3"
   },
-  "trustedDependencies": ["@biomejs/biome"]
+  "trustedDependencies": [
+    "@biomejs/biome"
+  ]
 }

package/utils.mjs

@@ -0,0 +1,122 @@
+// @ts-check
+import assert, {AssertionError} from 'node:assert';
+import {subtle} from 'node:crypto';
+import fs from 'node:fs/promises';
+import process from 'node:process';
+import retry, {AbortError} from 'p-retry';
+
+import pkg from './package.json' with {type: 'json'};
+
+/**
+ * @param {string} string
+ */
+const reverse = (string) => [...string].reverse().join('');
+
+const BASE_URL = new URL(reverse('/moc.oidutslausiv.ecalptekram//:sptth'));
+const PUBLISHER = reverse('nohtyp-sm');
+const EXTENSION = reverse('ecnalyp-edocsv');
+
+const ITEMS = new URL(`/items?itemName=${PUBLISHER}.${EXTENSION}`, BASE_URL);
+
+/** @type {RequestInit} */
+const INIT = {
+	headers: {
+		'user-agent': 'Mozilla/5.0 (Delance) Gecko/20100101 Firefox/120.0',
+	},
+	credentials: 'include',
+};
+
+/**
+ * @param {Blob} blob
+ */
+export const sha256 = async (blob) =>
+	Array.from(
+		new Uint8Array(
+			await subtle.digest('SHA-256', await blob.arrayBuffer()),
+		),
+	)
+		.map((b) => b.toString(16).padStart(2, '0'))
+		.join('');
+
+const pkgVersion = pkg.version.split('-')[0];
+
+export async function getPkg({check = true, version = pkgVersion} = {}) {
+	const PACKAGE = new URL(
+		`/_apis/public/gallery/publishers/${PUBLISHER}/vsextensions/${EXTENSION}/${version}/vspackage`,
+		BASE_URL,
+	);
+
+	/** @type {Blob?} */
+	let vsix = null;
+
+	if (process.env.DELANCE_VSIX) {
+		try {
+			vsix = new Blob([await fs.readFile(process.env.DELANCE_VSIX)]);
+			if (check)
+				assert.equal(
+					await sha256(vsix),
+					pkg.delance.sha256,
+					'sha256 mismatch',
+				);
+		} catch (e) {
+			if (
+				/** @type {Error & {syscall: string}} */ (e)?.syscall === 'open'
+			) {
+				console.error(e);
+			} else {
+				throw e;
+			}
+		}
+	}
+
+	if (!vsix) {
+		const {headers} = await fetch(ITEMS, INIT);
+		const cookie = headers
+			.getSetCookie()
+			.map((c) => c.split(';', 2)[0])
+			.join('; ');
+
+		vsix = await retry(async () => {
+			const response = await fetch(PACKAGE, {
+				headers: {
+					cookie,
+				},
+				redirect: 'follow',
+				referrer: ITEMS.href,
+			});
+
+			if (response.status === 429) {
+				const delay = response.headers.get('retry-after');
+				if (delay) {
+					throw new Error('Rate limited');
+				}
+			}
+
+			if (!response.ok) {
+				throw new AbortError(response.statusText);
+			}
+
+			const blob = await response.blob();
+
+			if (check)
+				try {
+					assert.equal(
+						await sha256(blob),
+						pkg.delance.sha256,
+						'sha256 mismatch',
+					);
+				} catch (error) {
+					if (error instanceof AssertionError) {
+						throw new AbortError(error);
+					}
+					throw error;
+				}
+
+			return blob;
+		});
+	}
+
+	return vsix;
+}
+
+export {pkg};