quickwin 1.2.1 → 2.0.0

package/test/test_wolfssl_read.js

@@ -104,8 +104,9 @@ export const suite = {
                     if (d instanceof ArrayBuffer) {
                         sawArray = true;
                         total += d.byteLength;
-                        if (total >= EXPECTED)
-                            break;
+                        // Keep draining after the body is complete: the point of
+                        // this suite is the no-data/EOF contract, so a full body
+                        // must not short-circuit the read that would observe null.
                     }
                 }
                 if (total >= EXPECTED)

package/test/test_wolfssl_read.ts

@@ -99,7 +99,9 @@ export const suite = {
                     if (d instanceof ArrayBuffer) {
                         sawArray = true
                         total += d.byteLength
-                        if (total >= EXPECTED) break
+                        // Keep draining after the body is complete: the point of
+                        // this suite is the no-data/EOF contract, so a full body
+                        // must not short-circuit the read that would observe null.
                     }
                 }
                 if (total >= EXPECTED) finish()

package/test/test_worker_net.js

@@ -27,25 +27,43 @@ export const suite = {
         catch (e) {
             t.checkTrue('worker creation failed: ' + e, false);
         }
+        // Retry across jsdelivr's official CDN hosts: a dropped connection
+        // on a slow CI network must not be reported as a TLS regression.
         t.section('npm-package');
         let worker3;
-        try {
-            const { data: r3 } = await new Promise((resolve, reject) => {
-                worker3 = new os.Worker('https://cdn.jsdelivr.net/npm/quickwin/test/worker_module.js');
-                const timer = os.setTimeout(() => reject(new Error('timeout')), 15000);
-                worker3.onmessage = (e) => {
-                    os.clearTimeout(timer);
-                    resolve({ worker: worker3, data: e.data });
-                };
-                worker3.postMessage({ type: 'start' });
-            });
-            t.check('npm worker message type', 'result', r3.type);
-            t.check('npm worker imported value', 42, r3.value);
-            worker3.postMessage({ type: 'done' });
-            worker3.onmessage = null;
-        }
-        catch (e) {
-            t.checkTrue('npm worker failed: ' + e, false);
+        const NPM_HOSTS = ['cdn.jsdelivr.net', 'fastly.jsdelivr.net', 'gcore.jsdelivr.net'];
+        let workerOk = false;
+        for (const host of NPM_HOSTS) {
+            for (let attempt = 0; attempt < 3 && !workerOk; attempt++) {
+                try {
+                    const { data: r3 } = await new Promise((resolve, reject) => {
+                        worker3 = new os.Worker('https://' + host + '/npm/quickwin/test/worker_module.js');
+                        const timer = os.setTimeout(() => reject(new Error('timeout')), 15000);
+                        worker3.onmessage = (e) => {
+                            os.clearTimeout(timer);
+                            resolve({ worker: worker3, data: e.data });
+                        };
+                        worker3.postMessage({ type: 'start' });
+                    });
+                    t.check('npm worker message type', 'result', r3.type);
+                    t.check('npm worker imported value', 42, r3.value);
+                    worker3.postMessage({ type: 'done' });
+                    worker3.onmessage = null;
+                    workerOk = true;
+                }
+                catch (e) {
+                    if (worker3) {
+                        worker3.onmessage = null;
+                        worker3 = null;
+                    }
+                    if (attempt === 2 && host === NPM_HOSTS[NPM_HOSTS.length - 1])
+                        t.checkTrue('npm worker failed: ' + e, false);
+                    else
+                        os.sleep(500);
+                }
+            }
+            if (workerOk)
+                break;
         }
     }
 };

package/test/test_worker_net.ts

@@ -31,24 +31,36 @@ export const suite = {
             t.checkTrue('worker creation failed: ' + e, false)
         }
 
+        // Retry across jsdelivr's official CDN hosts: a dropped connection
+        // on a slow CI network must not be reported as a TLS regression.
         t.section('npm-package')
         let worker3: any
-        try {
-            const { data: r3 } = await new Promise<any>((resolve, reject) => {
-                worker3 = new os.Worker('https://cdn.jsdelivr.net/npm/quickwin/test/worker_module.js')
-                const timer = os.setTimeout(() => reject(new Error('timeout')), 15000)
-                worker3.onmessage = (e: any) => {
-                    os.clearTimeout(timer)
-                    resolve({ worker: worker3, data: e.data })
+        const NPM_HOSTS = ['cdn.jsdelivr.net', 'fastly.jsdelivr.net', 'gcore.jsdelivr.net']
+        let workerOk = false
+        for (const host of NPM_HOSTS) {
+            for (let attempt = 0; attempt < 3 && !workerOk; attempt++) {
+                try {
+                    const { data: r3 } = await new Promise<any>((resolve, reject) => {
+                        worker3 = new os.Worker('https://' + host + '/npm/quickwin/test/worker_module.js')
+                        const timer = os.setTimeout(() => reject(new Error('timeout')), 15000)
+                        worker3.onmessage = (e: any) => {
+                            os.clearTimeout(timer)
+                            resolve({ worker: worker3, data: e.data })
+                        }
+                        worker3.postMessage({ type: 'start' })
+                    })
+                    t.check('npm worker message type', 'result', r3.type)
+                    t.check('npm worker imported value', 42, r3.value)
+                    worker3.postMessage({ type: 'done' })
+                    worker3.onmessage = null
+                    workerOk = true
+                } catch (e) {
+                    if (worker3) { worker3.onmessage = null; worker3 = null }
+                    if (attempt === 2 && host === NPM_HOSTS[NPM_HOSTS.length - 1]) t.checkTrue('npm worker failed: ' + e, false)
+                    else os.sleep(500)
                 }
-                worker3.postMessage({ type: 'start' })
-            })
-            t.check('npm worker message type', 'result', r3.type)
-            t.check('npm worker imported value', 42, r3.value)
-            worker3.postMessage({ type: 'done' })
-            worker3.onmessage = null
-        } catch (e) {
-            t.checkTrue('npm worker failed: ' + e, false)
+            }
+            if (workerOk) break
         }
     }
 }

package/tsconfig.json

@@ -15,7 +15,7 @@
     "esModuleInterop": true,
     // "skipLibCheck": true,
     "allowJs": false,
-    "lib": ["ES2020"],
+    "lib": ["ES2025"],
     "types": ["./quickwin.d.ts"],
     "rootDir": ".",
     "outDir": "_build",

package/examples/exec_server.ts

@@ -1,80 +0,0 @@
-import { createServer } from '../lib/http-server.js'
-import * as os from 'os'
-
-// WORKER_DATA_URL 由 esbuild --define 在 build.ts 中注入（base64 data: URL）
-declare const WORKER_DATA_URL: string
-
-const EXEC_TIMEOUT_MS = 60_000
-
-interface ExecResult {
-    out: Uint8Array
-    code: number
-    error: string | null
-}
-
-function runInWorker(cmd: string): Promise<ExecResult> {
-    return new Promise((resolve, reject) => {
-        const worker = new os.Worker(WORKER_DATA_URL)
-        const id = 1
-        let settled = false
-        let timer: ReturnType<typeof os.setTimeout>
-
-        const finish = (fn: () => void) => {
-            if (settled) return
-            settled = true
-            os.clearTimeout(timer)
-            worker.onmessage = null
-            fn()
-        }
-
-        timer = os.setTimeout(() => {
-            finish(() => reject(new Error('exec timeout')))
-        }, EXEC_TIMEOUT_MS)
-
-        worker.onmessage = (e) => {
-            const msg = e.data as { type: string; id: number; out?: Uint8Array; code?: number; error?: string | null }
-            if (msg.type !== 'result' || msg.id !== id) return
-            finish(() => resolve({ out: msg.out ?? new Uint8Array(0), code: msg.code ?? -1, error: msg.error ?? null }))
-        }
-
-        try {
-            worker.postMessage({ type: 'run', id, cmd })
-        } catch (ex) {
-            finish(() => reject(ex instanceof Error ? ex : new Error(String(ex))))
-        }
-    })
-}
-
-const server = createServer(async (req) => {
-    const path = new URL(req.url).pathname
-    if (req.method === 'GET' && (path === '/' || path === '/health')) {
-        return new Response('ok', { headers: { 'Content-Type': 'text/plain' } })
-    }
-    if (req.method === 'POST' && path === '/exec') {
-        const body = await req.json() as { cmd: string }
-        try {
-            const { out, code, error } = await runInWorker(body.cmd)
-            if (error) {
-                return new Response(JSON.stringify({ error }), {
-                    status: 500,
-                    headers: { 'Content-Type': 'application/json' }
-                })
-            }
-            return new Response(out, {
-                headers: {
-                    'Content-Type': 'application/octet-stream',
-                    'X-Exit-Code': String(code),
-                }
-            })
-        } catch (ex) {
-            return new Response(JSON.stringify({ error: String(ex) }), {
-                status: 504,
-                headers: { 'Content-Type': 'application/json' }
-            })
-        }
-    }
-    return new Response('Not Found', { status: 404 })
-})
-
-const rc = server.listen(8080, '0.0.0.0')
-console.log('listen rc=' + rc + ' addr=' + JSON.stringify(server.address()))