@devvit/server 0.11.17-next-2025-06-03-f993e3a25.0 → 0.11.17-next-2025-06-04-b6703d5a9.0

package/create-server.d.ts

@@ -1,10 +1,14 @@
-import { createServer as nodeCreateServer } from 'node:http';
+import type { IncomingMessage, Server, ServerOptions, ServerResponse } from 'node:http';
 /**
  * Creates a new Devvit server. This implements the same API as Node.js's `createServer` function,
  * but we do not guarantee that this actually creates an HTTP server of any kind - it may be any
  * kind of server under the hood. However, it will behave like an HTTP server in terms of the API.
  */
-export declare const createServer: typeof nodeCreateServer;
+export declare const createServer: <Request extends typeof IncomingMessage = typeof IncomingMessage, Response extends typeof ServerResponse = typeof ServerResponse>(optionsOrRequestListener?: ServerOptions<Request, Response> | ((req: InstanceType<Request>, res: InstanceType<Response> & {
+    req: InstanceType<Request>;
+}) => any), requestListener?: (req: InstanceType<Request>, res: InstanceType<Response> & {
+    req: InstanceType<Request>;
+}) => any) => Server<Request, Response>;
 declare global {
     namespace globalThis {
         var enableWebbitBundlingHack: boolean;

package/create-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-server.d.ts","sourceRoot":"","sources":["../src/create-server.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAI7D;;;;GAIG;AACH,eAAO,MAAM,YAAY,EAAE,OAAO,gBAYjC,CAAC;AAuCF,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,UAAU,CAAC;QAEnB,IAAI,wBAAwB,EAAE,OAAO,CAAC;KACvC;CACF"}
+{"version":3,"file":"create-server.d.ts","sourceRoot":"","sources":["../src/create-server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAWxF;;;;GAIG;AACH,eAAO,MAAM,YAAY,GACvB,OAAO,SAAS,OAAO,eAAe,GAAG,OAAO,eAAe,EAC/D,QAAQ,SAAS,OAAO,cAAc,GAAG,OAAO,cAAc,EAE9D,2BACI,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,GAChC,CAAC,CACC,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,EAC1B,GAAG,EAAE,YAAY,CAAC,QAAQ,CAAC,GAAG;IAAE,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,CAAA;CAAE,KACzD,GAAG,CAAC,EACb,kBAAkB,CAChB,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,EAC1B,GAAG,EAAE,YAAY,CAAC,QAAQ,CAAC,GAAG;IAAE,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,CAAA;CAAE,KACzD,GAAG,KACP,MAAM,CAAC,OAAO,EAAE,QAAQ,CAM1B,CAAC;AA4CF,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,UAAU,CAAC;QAEnB,IAAI,wBAAwB,EAAE,OAAO,CAAC;KACvC;CACF"}

package/create-server.js

@@ -1,6 +1,11 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { createServer as nodeCreateServer } from 'node:http';
 import { runWithContext } from './context.js';
 import { RequestContext } from './request-context.js';
+import { runWithSourceMap } from './source-maps/source-maps.js';
+// This constant represents the bundle ID to match code to its source map
+// and needs to match the one the source map was initiated with from WebbitLoader.
+const WEBBIT_BUNDLE_ID = 'webbit-server';
 /**
  * Creates a new Devvit server. This implements the same API as Node.js's `createServer` function,
  * but we do not guarantee that this actually creates an HTTP server of any kind - it may be any
@@ -16,7 +21,9 @@ function _createServer(options, requestListener) {
     const server = nodeCreateServer(options, async (req, res) => {
         const context = RequestContext(req.headers);
         return runWithContext(context, async () => {
-            return requestListener?.(req, res);
+            return await runWithSourceMap(WEBBIT_BUNDLE_ID, () => {
+                return requestListener?.(req, res);
+            });
         });
     });
     // Modify the listen callback slightly, to do the Devvit-y bundling hack

package/index.d.ts

@@ -3,4 +3,5 @@ export { createServer } from './create-server.js';
 export { defineConfig } from './define-config.js';
 export { getServerPort } from './get-server-port.js';
 export { RequestContext, setRequestContext } from './request-context.js';
+export { initializeSourceMap, runWithSourceMap } from './source-maps/source-maps.js';
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC"}

package/index.js

@@ -3,3 +3,4 @@ export { createServer } from './create-server.js';
 export { defineConfig } from './define-config.js';
 export { getServerPort } from './get-server-port.js';
 export { RequestContext, setRequestContext } from './request-context.js';
+export { initializeSourceMap, runWithSourceMap } from './source-maps/source-maps.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devvit/server",
-  "version": "0.11.17-next-2025-06-03-f993e3a25.0",
+  "version": "0.11.17-next-2025-06-04-b6703d5a9.0",
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
@@ -23,13 +23,15 @@
   },
   "types": "./index.d.ts",
   "dependencies": {
-    "@devvit/protos": "0.11.17-next-2025-06-03-f993e3a25.0",
-    "@devvit/public-api": "0.11.17-next-2025-06-03-f993e3a25.0",
-    "@devvit/shared-types": "0.11.17-next-2025-06-03-f993e3a25.0"
+    "@devvit/protos": "0.11.17-next-2025-06-04-b6703d5a9.0",
+    "@devvit/public-api": "0.11.17-next-2025-06-04-b6703d5a9.0",
+    "@devvit/shared-types": "0.11.17-next-2025-06-04-b6703d5a9.0",
+    "@gunsch/source-map": "0.7.6"
   },
   "devDependencies": {
-    "@devvit/repo-tools": "0.11.17-next-2025-06-03-f993e3a25.0",
-    "@devvit/tsconfig": "0.11.17-next-2025-06-03-f993e3a25.0",
+    "@devvit/repo-tools": "0.11.17-next-2025-06-04-b6703d5a9.0",
+    "@devvit/tsconfig": "0.11.17-next-2025-06-04-b6703d5a9.0",
+    "esbuild": "0.23.0",
     "eslint": "9.11.1",
     "typescript": "5.8.3",
     "vitest": "1.6.1"
@@ -38,5 +40,5 @@
     "directory": "dist"
   },
   "source": "./src/index.ts",
-  "gitHead": "50a1674071cd8d3890c29ce34a9a0b4393d64bbf"
+  "gitHead": "c542e5d2968a5c769cfc7032f9a2f44d62a32ff6"
 }

package/source-maps/source-maps.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Initializes source map for exception handling within this process. Multiple source maps
+ * may be reigstered with unique bundle IDs.
+ * If no source map is provided, this method exits early.
+ * @param codeBundleId Identifier for the code bundle, should be 1:1 with unique source maps within this process.
+ * @param sourceMap Source map for this code bundle, undefined if no source map is available.
+ */
+export declare function initializeSourceMap(codeBundleId: string, sourceMap: string | undefined): void;
+/**
+ * Executes code with exception handling that will be unwound using the provided source map.
+ * @param codeBundleId Identifier for the code bundle, should be 1:1 with unique source maps.
+ * @param callback Function to execute that may throw an error
+ */
+export declare function runWithSourceMap<T>(codeBundleId: string, callback: () => T): Promise<T>;
+//# sourceMappingURL=source-maps.d.ts.map

package/source-maps/source-maps.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-maps.d.ts","sourceRoot":"","sources":["../../src/source-maps/source-maps.ts"],"names":[],"mappings":"AAOA;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAO7F;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAY7F"}

package/source-maps/source-maps.js

@@ -0,0 +1,72 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { SourceMapConsumer } from '@gunsch/source-map';
+const currentCodeBundle = new AsyncLocalStorage();
+const sourceMapRegistry = new Map();
+/**
+ * Initializes source map for exception handling within this process. Multiple source maps
+ * may be reigstered with unique bundle IDs.
+ * If no source map is provided, this method exits early.
+ * @param codeBundleId Identifier for the code bundle, should be 1:1 with unique source maps within this process.
+ * @param sourceMap Source map for this code bundle, undefined if no source map is available.
+ */
+export function initializeSourceMap(codeBundleId, sourceMap) {
+    if (sourceMapRegistry.has(codeBundleId)) {
+        throw new Error(`Source map for code bundle ID "${codeBundleId}" is already registered. Please use a unique ID for each source map.`);
+    }
+    sourceMapRegistry.set(codeBundleId, sourceMap || '');
+}
+/**
+ * Executes code with exception handling that will be unwound using the provided source map.
+ * @param codeBundleId Identifier for the code bundle, should be 1:1 with unique source maps.
+ * @param callback Function to execute that may throw an error
+ */
+export async function runWithSourceMap(codeBundleId, callback) {
+    return currentCodeBundle.run(codeBundleId, async () => {
+        try {
+            return await callback();
+        }
+        catch (error) {
+            // Ensure we dump this to the logs, since it's not always logged by default.
+            if (error instanceof Error && error.stack) {
+                console.error(error);
+            }
+            throw error;
+        }
+    });
+}
+// Override Node's stack trace formatter to guarantee we can unwind stack traces
+// created in any context.
+const originalPrepareStackTrace = Error.prepareStackTrace;
+Error.prepareStackTrace = function (error, stackTraces) {
+    try {
+        // Use the original stack trace formatter if we don't have a source map or don't know what
+        // code bundle we're currently operating in
+        const currentCodeBundleId = currentCodeBundle.getStore();
+        const sourceMap = currentCodeBundleId && sourceMapRegistry.get(currentCodeBundleId);
+        if (!sourceMap) {
+            return originalPrepareStackTrace ? originalPrepareStackTrace(error, stackTraces) : undefined;
+        }
+        const sourceMapConsumer = new SourceMapConsumer(sourceMap);
+        const mappedStack = stackTraces.map((site) => {
+            const fileName = site.getFileName() || '';
+            const lineNumber = site.getLineNumber() || 0;
+            const columnNumber = site.getColumnNumber() || 0;
+            if (!lineNumber) {
+                return `    at ${site.getFunctionName() || '<anonymous>'} (${fileName || '??'}:??:${columnNumber || '??'})`;
+            }
+            const originalPos = sourceMapConsumer.originalPositionFor({
+                line: lineNumber,
+                column: columnNumber,
+            });
+            if (originalPos.source) {
+                return `    at ${site.getFunctionName() || '<anonymous>'} (${originalPos.source}:${originalPos.line}:${originalPos.column})`;
+            }
+            return `    at ${site.getFunctionName() || '<anonymous>'} (${fileName}:${lineNumber}:${columnNumber})`;
+        });
+        return `${error.name}: ${error.message}\n${mappedStack.join('\n')}`;
+    }
+    catch {
+        // If there are any issues, fall back to the original stack trace formatter
+        return originalPrepareStackTrace ? originalPrepareStackTrace(error, stackTraces) : undefined;
+    }
+};

package/source-maps/source-maps.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-maps.test.d.ts","sourceRoot":"","sources":["../../src/source-maps/source-maps.test.ts"],"names":[],"mappings":""}

package/webbit-server.d.ts

@@ -1,4 +0,0 @@
-import { type WebbitServer } from '@devvit/protos/types/devvit/actor/webbit/webbit.js';
-export declare function webbitEnable(): void;
-export declare function newWebbitServer(): WebbitServer;
-//# sourceMappingURL=webbit-server.d.ts.map

package/webbit-server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"webbit-server.d.ts","sourceRoot":"","sources":["../src/webbit-server.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,YAAY,EAElB,MAAM,oDAAoD,CAAC;AAM5D,wBAAgB,YAAY,IAAI,IAAI,CAInC;AAED,wBAAgB,eAAe,IAAI,YAAY,CAsB9C"}

package/webbit-server.js

@@ -1,30 +0,0 @@
-import { HttpMethod, WebbitServerDefinition, } from '@devvit/protos/types/devvit/actor/webbit/webbit.js';
-import { Devvit } from '@devvit/public-api';
-import { extendDevvitPrototype } from '@devvit/public-api/devvit/internals/helpers/extendDevvitPrototype.js';
-import { getServerPort } from './get-server-port.js';
-export function webbitEnable() {
-    const server = newWebbitServer();
-    extendDevvitPrototype('Request', server.Request);
-    Devvit.provide(WebbitServerDefinition);
-}
-export function newWebbitServer() {
-    return {
-        async Request(req, meta) {
-            const port = getServerPort();
-            // only set the body if the method is not GET or HEAD
-            const body = [HttpMethod.GET, HttpMethod.HEAD].includes(req.method) ? null : req.body;
-            const rsp = await fetch(new URL(req.path, `http://webbit.local:${port}`), {
-                body,
-                headers: [
-                    ...Object.entries(req.headers),
-                    // devvit- headers alway have priority.
-                    ...Object.entries(meta ?? {}).map(([k, v]) => [k, v.values.join()]),
-                ],
-                method: HttpMethod[req.method],
-            });
-            const headers = {};
-            rsp.headers.forEach((v, k) => (headers[k] = v));
-            return { body: new Uint8Array(await rsp.arrayBuffer()), headers, statusCode: rsp.status };
-        },
-    };
-}