Name files for what they export, and move the session files into session/

interop-tests/cloudhopper.test.ts

@@ -1,8 +1,8 @@
 import assert from 'node:assert/strict';
 import { readFileSync } from 'node:fs';
 import test, { after, describe } from 'node:test';
-import type { Session } from '../src/session.ts';
-import type { Sms } from '../src/sms.ts';
+import type { Session } from '../src/session/session.ts';
+import type { Sms } from '../src/session/sms.ts';
 import type { SmppServer } from '../src/server/server.ts';
 import { server } from '../src/server/server.ts';
 

interop-tests/dumbclient.test.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import test, { after, describe } from 'node:test';
-import type { Session } from '../src/session.ts';
-import type { Sms } from '../src/sms.ts';
+import type { Session } from '../src/session/session.ts';
+import type { Sms } from '../src/session/sms.ts';
 import type { LogMethod, SmppLog } from '../src/log.ts';
 import { server } from '../src/server/server.ts';
 
@@ -270,7 +270,7 @@ describe('S6 - idle peer, no enquire_link at all', () => {
 		assert.ok(bound, 'dumb-idle never submitted its one message');
 
 		// idleTimeout is 40s from the last byte the peer sent (its submit_sm), never from our own
-		// writes (session/keepalive.ts resets only on inbound data). This test may start running well
+		// writes (session/link-timers.ts resets only on inbound data). This test may start running well
 		// past that mark on its own (S9 above can take a minute) - statsFor(...).closed is set from
 		// a 'close' listener attached at session-creation time, so a close from before this test
 		// even started is still seen; budget is slack for a session that is still open, not a clock.

interop-tests/jasmin.test.ts

@@ -1,15 +1,15 @@
 import assert from 'node:assert/strict';
 import http from 'node:http';
 import test, { after, describe } from 'node:test';
-import type { Dlr } from '../src/protocol/receipt.ts';
+import type { Dlr } from '../src/protocol/dlr.ts';
 import type { EncodingName } from '../src/codec/encodings.ts';
 import type { PduObject } from '../src/codec/pdu.ts';
-import type { Session } from '../src/session.ts';
-import type { Sms } from '../src/sms.ts';
+import type { Session } from '../src/session/session.ts';
+import type { Sms } from '../src/session/sms.ts';
 import { ConcatReference } from '../src/protocol/udh.ts';
 import { client } from '../src/client/client.ts';
 import { closeAfter } from '../test/teardown.ts';
-import { paramText } from '../src/codec/field-types.ts';
+import { paramText } from '../src/codec/types.ts';
 import { server } from '../src/server/server.ts';
 import { encodeMessage, splitMessage } from '../src/message.ts';
 import { submitSmParams } from '../src/messages/submit.ts';

interop-tests/jsmpp.test.ts

@@ -1,8 +1,8 @@
 import assert from 'node:assert/strict';
 import net from 'node:net';
 import test, { after, describe } from 'node:test';
-import type { Session } from '../src/session.ts';
-import type { Sms } from '../src/sms.ts';
+import type { Session } from '../src/session/session.ts';
+import type { Sms } from '../src/session/sms.ts';
 import { PduRefusedError } from '../src/index.ts';
 import { bareTlvHeader, pduBytes } from '../test/raw-pdus.ts';
 import { server } from '../src/server/server.ts';

interop-tests/kannel.test.ts

@@ -2,13 +2,13 @@ import assert from 'node:assert/strict';
 import http from 'node:http';
 import test, { after, describe } from 'node:test';
 import type { MessageState } from '../src/codec/constants.ts';
-import type { Dlr } from '../src/protocol/receipt.ts';
-import type { Session } from '../src/session.ts';
-import type { Sms } from '../src/sms.ts';
+import type { Dlr } from '../src/protocol/dlr.ts';
+import type { Session } from '../src/session/session.ts';
+import type { Sms } from '../src/session/sms.ts';
 import { ConcatReference } from '../src/protocol/udh.ts';
 import { consts } from '../src/codec/constants.ts';
 import { detect, encodings } from '../src/codec/encodings.ts';
-import { paramText } from '../src/codec/field-types.ts';
+import { paramText } from '../src/codec/types.ts';
 import { server } from '../src/server/server.ts';
 import { splitMessage } from '../src/message.ts';
 import { submitSmParams } from '../src/messages/submit.ts';

interop-tests/php.test.ts

@@ -1,8 +1,8 @@
 import assert from 'node:assert/strict';
 import test, { after, describe } from 'node:test';
-import type { Session } from '../src/session.ts';
-import type { Sms } from '../src/sms.ts';
-import { paramText } from '../src/codec/field-types.ts';
+import type { Session } from '../src/session/session.ts';
+import type { Sms } from '../src/session/sms.ts';
+import { paramText } from '../src/codec/types.ts';
 import { isCommand, server } from '../src/index.ts';
 
 const DRIVER = process.env.PHP_DRIVER ?? 'php:8080';

interop-tests/python.test.ts

@@ -1,9 +1,9 @@
 import assert from 'node:assert/strict';
 import test, { after, describe } from 'node:test';
-import type { Session } from '../src/session.ts';
-import type { Sms } from '../src/sms.ts';
+import type { Session } from '../src/session/session.ts';
+import type { Sms } from '../src/session/sms.ts';
 import { encodings } from '../src/codec/encodings.ts';
-import { paramText } from '../src/codec/field-types.ts';
+import { paramText } from '../src/codec/types.ts';
 import { isCommand, server } from '../src/index.ts';
 
 const DRIVER = process.env.PYTHON_DRIVER ?? 'python:8080';

interop-tests/smppload.test.ts

@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import test, { after, describe } from 'node:test';
-import type { Session } from '../src/session.ts';
+import type { Session } from '../src/session/session.ts';
 import { server } from '../src/server/server.ts';
 
 const SMPP_PORT = Number(process.env.SMPP_PORT ?? '2775');

interop-tests/smppsim.test.ts

@@ -1,15 +1,15 @@
 import assert from 'node:assert/strict';
 import test, { describe } from 'node:test';
-import type { Dlr } from '../src/protocol/receipt.ts';
+import type { Dlr } from '../src/protocol/dlr.ts';
 import type { EncodingName } from '../src/codec/encodings.ts';
-import type { MessageDlr } from '../src/messages/receipt-merge.ts';
+import type { MessageDlr } from '../src/messages/dlr-merger.ts';
 import type { PduObject } from '../src/codec/pdu.ts';
-import type { Session } from '../src/session.ts';
-import type { Sms } from '../src/sms.ts';
+import type { Session } from '../src/session/session.ts';
+import type { Sms } from '../src/session/sms.ts';
 import { client } from '../src/client/client.ts';
 import { closeAfter } from '../test/teardown.ts';
 import { consts } from '../src/codec/constants.ts';
-import { paramText } from '../src/codec/field-types.ts';
+import { paramText } from '../src/codec/types.ts';
 import { server } from '../src/server/server.ts';
 
 const PEER_HOST = process.env.PEER_HOST ?? 'smppsim';

interop-tests/smscsim.test.ts

@@ -1,8 +1,8 @@
 import assert from 'node:assert/strict';
 import test, { describe } from 'node:test';
-import type { Dlr } from '../src/protocol/receipt.ts';
-import type { Session } from '../src/session.ts';
-import type { Sms } from '../src/sms.ts';
+import type { Dlr } from '../src/protocol/dlr.ts';
+import type { Session } from '../src/session/session.ts';
+import type { Sms } from '../src/session/sms.ts';
 import { client } from '../src/client/client.ts';
 import { closeAfter } from '../test/teardown.ts';