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

test/declared-alphabet.test.ts

@@ -5,10 +5,10 @@ import { client } from '../src/client/client.ts';
 import { closeAfter } from './teardown.ts';
 import { consts } from '../src/codec/constants.ts';
 import { decodeMessage } from '../src/message.ts';
-import { dlrFromPdu } from '../src/protocol/receipt.ts';
+import { dlrFromPdu } from '../src/protocol/dlr.ts';
 import { encodingByDataCoding, encodings } from '../src/codec/encodings.ts';
 import { objToPdu, pduToObj } from '../src/codec/pdu.ts';
-import { paramNumber } from '../src/codec/field-types.ts';
+import { paramNumber } from '../src/codec/types.ts';
 import { server } from '../src/server/server.ts';
 import type { PduObject } from '../src/codec/pdu.ts';
 

test/dlr.test.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import test, { describe } from 'node:test';
 import { consts } from '../src/codec/constants.ts';
-import { dlrFromPdu, parseReceipt, receiptCodes } from '../src/protocol/receipt.ts';
+import { dlrFromPdu, parseReceipt, receiptCodes } from '../src/protocol/dlr.ts';
 import { encodeMessage } from '../src/message.ts';
 import { objToPdu, pduToObj } from '../src/codec/pdu.ts';
 import type { PduObject, TlvInputs } from '../src/codec/pdu.ts';

test/dummy-smsc.ts

@@ -1,8 +1,8 @@
 import assert from 'node:assert/strict';
 import net from 'node:net';
-import type { Session } from '../src/session.ts';
+import type { Session } from '../src/session/session.ts';
 import type { TestContext } from 'node:test';
-import { PduFramer } from '../src/codec/framer.ts';
+import { PduFramer } from '../src/codec/pdu-framer.ts';
 import { client } from '../src/client/client.ts';
 import { closeAfter, closeListenerAfter } from './teardown.ts';
 import { consts } from '../src/codec/constants.ts';

test/interop.test.ts

@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import test, { describe } from 'node:test';
 import reference from 'smpp';
 import type { ReferenceSession } from 'smpp';
-import type { Sms } from '../src/sms.ts';
+import type { Sms } from '../src/session/sms.ts';
 import { client } from '../src/client/client.ts';
 import { closeAfter } from './teardown.ts';
 import { concatInfo } from '../src/protocol/udh.ts';

test/message-class.test.ts

@@ -2,14 +2,14 @@ import assert from 'node:assert/strict';
 import test, { describe } from 'node:test';
 import type { PduObjectInput } from '../src/codec/pdu.ts';
 import type { SendSmsDeps } from '../src/messages/submit.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 type { TestContext } from 'node:test';
 import { bindToSmsc, dummySmsc } from './dummy-smsc.ts';
 import { client } from '../src/client/client.ts';
 import { closeAfter } from './teardown.ts';
 import { messageClassOf } from '../src/codec/encodings.ts';
-import { paramNumber } from '../src/codec/field-types.ts';
+import { paramNumber } from '../src/codec/types.ts';
 import { pduToObj } from '../src/codec/pdu.ts';
 import { server } from '../src/server/server.ts';
 import { silentLog } from '../src/log.ts';

test/messaging-mode.test.ts

@@ -2,12 +2,12 @@ import assert from 'node:assert/strict';
 import test, { describe } from 'node:test';
 import type { PduObjectInput } from '../src/codec/pdu.ts';
 import type { SendSmsDeps } from '../src/messages/submit.ts';
-import type { Session } from '../src/session.ts';
+import type { Session } from '../src/session/session.ts';
 import type { SubmitMessagingMode } from '../src/codec/constants.ts';
 import type { TestContext } from 'node:test';
 import { bindToSmsc, dummySmsc } from './dummy-smsc.ts';
 import { consts, submitMessagingModes } from '../src/codec/constants.ts';
-import { paramNumber } from '../src/codec/field-types.ts';
+import { paramNumber } from '../src/codec/types.ts';
 import { pduToObj } from '../src/codec/pdu.ts';
 import { silentLog } from '../src/log.ts';
 import { submitSms } from '../src/messages/submit.ts';

test/operator-receipts.test.ts

@@ -1,11 +1,11 @@
 import assert from 'node:assert/strict';
 import test, { describe } from 'node:test';
-import type { Dlr, Receipt } from '../src/protocol/receipt.ts';
-import type { MessageDlr } from '../src/session.ts';
+import type { Dlr, Receipt } from '../src/protocol/dlr.ts';
+import type { MessageDlr } from '../src/session/session.ts';
 import type { PduObject, TlvInputs } from '../src/codec/pdu.ts';
 import { bindToSmsc, dummySmsc } from './dummy-smsc.ts';
 import { consts } from '../src/codec/constants.ts';
-import { dlrFromPdu, parseReceipt, receiptCodes, transientStates } from '../src/protocol/receipt.ts';
+import { dlrFromPdu, parseReceipt, receiptCodes, transientStates } from '../src/protocol/dlr.ts';
 import { objToPdu, pduToObj } from '../src/codec/pdu.ts';
 
 /**

test/pdu-framer.test.ts

@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import test, { describe } from 'node:test';
-import { PduFramer } from '../src/codec/framer.ts';
+import { PduFramer } from '../src/codec/pdu-framer.ts';
 import { objToPdu } from '../src/codec/pdu.ts';
 
 function pdu(seqNr: number): Buffer {

test/pdu.test.ts

@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import test, { describe } from 'node:test';
 import { PduRefusedError, refusalAnswer } from '../src/codec/refusal.ts';
 import { isCommand, isResp, objToPdu, pduReturn, pduToObj } from '../src/codec/pdu.ts';
-import { paramText } from '../src/codec/field-types.ts';
+import { paramText } from '../src/codec/types.ts';
 import { isTlvName, tlvsById } from '../src/codec/tlvs.ts';
 
 function encode(...args: Parameters<typeof objToPdu>): Buffer {

test/readme.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 type { SmppLog } from '../src/log.ts';
 import type { SmppServer } from '../src/server/server.ts';
 import type { TestContext } from 'node:test';

test/session-extras.test.ts

@@ -2,28 +2,28 @@ import assert from 'node:assert/strict';
 import net from 'node:net';
 import test, { describe } from 'node:test';
 import type { Collected, LostGroup } from '../src/messages/reassembly.ts';
-import type { Dlr } from '../src/protocol/receipt.ts';
-import type { ErrorName } from '../src/codec/statuses.ts';
-import type { IncomingRequestsOptions } from '../src/session/requests-in.ts';
+import type { Dlr } from '../src/protocol/dlr.ts';
+import type { ErrorName } from '../src/codec/errors.ts';
+import type { IncomingRequestsOptions } from '../src/session/incoming-requests.ts';
 import type { HeldMessagesOptions, MessageHold } from '../src/session/held-messages.ts';
 import type { MessageState } from '../src/codec/constants.ts';
-import type { MessageDlr } from '../src/session.ts';
+import type { MessageDlr } from '../src/session/session.ts';
 import type { PduObject, PduObjectInput } from '../src/codec/pdu.ts';
 import type { Result } from '../src/result.ts';
 import type { SendSmsResult } from '../src/messages/submit.ts';
 import type { SmppLog } from '../src/log.ts';
-import type { Sms } from '../src/sms.ts';
+import type { Sms } from '../src/session/sms.ts';
 import type { SmppServer } from '../src/server/server.ts';
 import type { TestContext } from 'node:test';
 import { HeldMessages } from '../src/session/held-messages.ts';
-import { IncomingRequests, refusedSegmentStatus } from '../src/session/requests-in.ts';
+import { IncomingRequests, refusedSegmentStatus } from '../src/session/incoming-requests.ts';
 import { UnansweredError } from '../src/unanswered-error.ts';
-import { createSms } from '../src/sms.ts';
-import { LinkLife } from '../src/link-life.ts';
+import { createSms } from '../src/session/sms.ts';
+import { LinkLife } from '../src/session/link-life.ts';
 import { SendWindow } from '../src/session/send-window.ts';
 import { Reassembler, decodeSegments } from '../src/messages/reassembly.ts';
-import { Session } from '../src/session.ts';
-import { DlrMerger } from '../src/messages/receipt-merge.ts';
+import { Session } from '../src/session/session.ts';
+import { DlrMerger } from '../src/messages/dlr-merger.ts';
 import { PduRefusedError } from '../src/codec/refusal.ts';
 import { objToPdu } from '../src/codec/pdu.ts';
 import { checkSessionOptions, defaults } from '../src/options.ts';
@@ -32,8 +32,8 @@ import { client } from '../src/client/client.ts';
 import { closeAfter, closeListenerAfter } from './teardown.ts';
 import { concatOf } from '../src/protocol/concat.ts';
 import { consts } from '../src/codec/constants.ts';
-import { errors } from '../src/codec/statuses.ts';
-import { paramNumber, paramText } from '../src/codec/field-types.ts';
+import { errors } from '../src/codec/errors.ts';
+import { paramNumber, paramText } from '../src/codec/types.ts';
 import { server } from '../src/server/server.ts';
 import { silentLog } from '../src/log.ts';
 import { splitMessage } from '../src/message.ts';

test/session.test.ts

@@ -1,17 +1,17 @@
 import assert from 'node:assert/strict';
 import net from 'node:net';
 import test, { describe } from 'node:test';
-import type { Dlr } from '../src/protocol/receipt.ts';
+import type { Dlr } from '../src/protocol/dlr.ts';
 import type { PduObject, PduObjectInput } from '../src/codec/pdu.ts';
-import type { Sms } from '../src/sms.ts';
+import type { Sms } from '../src/session/sms.ts';
 import type { ServerOptions, SmppServer } from '../src/server/server.ts';
 import type { SmppLog } from '../src/log.ts';
 import type { TestContext } from 'node:test';
 import type { VoidResult } from '../src/result.ts';
-import { DlrMerger } from '../src/messages/receipt-merge.ts';
-import { PduFramer } from '../src/codec/framer.ts';
-import { ReconnectLoop } from '../src/reconnect-loop.ts';
-import { Session } from '../src/session.ts';
+import { DlrMerger } from '../src/messages/dlr-merger.ts';
+import { PduFramer } from '../src/codec/pdu-framer.ts';
+import { ReconnectLoop } from '../src/session/reconnect-loop.ts';
+import { Session } from '../src/session/session.ts';
 import { bindCommands } from '../src/protocol/bind.ts';
 import { checkSessionOptions } from '../src/options.ts';
 import { client } from '../src/client/client.ts';
@@ -19,7 +19,7 @@ import { closeAfter, closeListenerAfter } from './teardown.ts';
 import { consts } from '../src/codec/constants.ts';
 import { PduRefusedError } from '../src/codec/refusal.ts';
 import { isCommand, objToPdu, pduReturn, pduToObj } from '../src/codec/pdu.ts';
-import { paramText } from '../src/codec/field-types.ts';
+import { paramText } from '../src/codec/types.ts';
 import { server } from '../src/server/server.ts';
 import { bareTlvHeader, pduBytes, shortened, truncatedTlv, withUnknownCmdId } from './raw-pdus.ts';
 import { silentLog } from '../src/log.ts';

test/tls.test.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import net from 'node:net';
 import test, { describe } from 'node:test';
-import type { Sms } from '../src/sms.ts';
+import type { Sms } from '../src/session/sms.ts';
 import type { SmppServer } from '../src/server/server.ts';
 import type { TestContext } from 'node:test';
 import { Log } from '@larvit/log';

test/types.test.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import test, { describe } from 'node:test';
-import type { DestAddress, UnsuccessSme } from '../src/codec/field-types.ts';
-import { paramText, types } from '../src/codec/field-types.ts';
+import type { DestAddress, UnsuccessSme } from '../src/codec/types.ts';
+import { paramText, types } from '../src/codec/types.ts';
 import { tlvs } from '../src/codec/tlvs.ts';
 
 describe('integers', () => {

test/unsendable.test.ts

@@ -6,7 +6,7 @@ import { bindToSmsc, dummySmsc } from './dummy-smsc.ts';
 import { decodeMessage } from '../src/message.ts';
 import { messageOctets } from '../src/protocol/message-body.ts';
 import { objToPdu, pduToObj } from '../src/codec/pdu.ts';
-import { paramNumber, paramText } from '../src/codec/field-types.ts';
+import { paramNumber, paramText } from '../src/codec/types.ts';
 import { silentLog } from '../src/log.ts';
 import { submitSms } from '../src/messages/submit.ts';